diff -u am-utils-6.1.5/debian/changelog am-utils-6.1.5/debian/changelog
--- am-utils-6.1.5/debian/changelog
+++ am-utils-6.1.5/debian/changelog
@@ -1,3 +1,12 @@
+am-utils (6.1.5-12ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #269998):
+    - Copied debian/am-utils.copyright to debian/copyright (now made via cat
+      debian/am-utils.copyright.in COPYING > debian/copyright) to pass Ubuntus
+      upload checks for missing debian/copyright
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Tue, 23 Sep 2008 19:51:56 -0500
+
 am-utils (6.1.5-12) unstable; urgency=low
 
   * Change postinst to use invoke-rc.d, so that am-utils can be safely
diff -u am-utils-6.1.5/debian/control am-utils-6.1.5/debian/control
--- am-utils-6.1.5/debian/control
+++ am-utils-6.1.5/debian/control
@@ -1,7 +1,8 @@
 Source: am-utils
 Section: net
 Priority: extra
-Maintainer: Tim Cutts <timc@chiark.greenend.org.uk>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Tim Cutts <timc@chiark.greenend.org.uk>
 Build-Depends: debhelper (>= 4.1.51), bison, flex, tetex-bin, texi2html (>= 1.76), texinfo, libgdbm-dev, libwrap0-dev, libhesiod-dev, libldap2-dev, autotools-dev, linux-kernel-headers, po-debconf, quilt
 Build-Conflicts: autoconf2.13
 Homepage: http://www.am-utils.org/
only in patch2:
unchanged:
--- am-utils-6.1.5.orig/debian/copyright
+++ am-utils-6.1.5/debian/copyright
@@ -0,0 +1,47 @@
+This package has been debianized by Philippe Troin <phil@fifi.org> from
+sources found on ftp://ftp.am-utils.org/pub/am-utils/.
+
+Debianization Copyright (C) 2000-2003 Philippe Troin <phil@fifi.org>
+and Copyright (C) 2004-2005 Tim Cutts <timc@chiark.greenend.org.uk>.
+The packaging (debianization) is licensed under the GNU General Public License
+which can be found in /usr/share/common-licenses/GPL on Debian systems.
+
+Am-utils is licensed under a BSD license:
+
+Copyright (c) 1997-2006 Erez Zadok
+Copyright (c) 1989 Jan-Simon Pendry
+Copyright (c) 1989 Imperial College of Science, Technology & Medicine
+Copyright (c) 1989 The Regents of the University of California.
+All rights reserved.
+
+This code is derived from software contributed to Berkeley by
+Jan-Simon Pendry at Imperial College, London.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgment:
+     This product includes software developed by the University of
+     California, Berkeley and its contributors, as well as the Trustees of
+     Columbia University.
+4. Neither the name of the University nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.