Merge lp:~nhandler/ubuntu/lucid/am-utils/merge-from-squeeze into lp:ubuntu/lucid/am-utils

[Nathan Handler]

Unmerged revisions

12. By Nathan Handler on 2010-01-22

* Merge from debian testing, remaining changes:
  - 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
* Updated to standards 3.8.3
* Fixed build problem with info docs (Closes: #546774)
* Fixed two lintian errors
* Use config.sub and config.guess from Debian properly (Closes: #538612)
* Updated Spanish translation (Closes: #529029)
* Added Russian debconf translation (Closes: #541747)
* pawd null pointer dereference fixed (Closes: #525844)
* Updated to standards 3.8.2
* Updated to debhelper v7
* A few lintian issues fixed
* Corrected postinst updated-rc.d use (Closes: #521392)
* Fix dependencies in init script (Closes: #543824)

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-22 02:20:27 +0000
+++ debian/changelog	2010-01-22 02:20:27 +0000
@@ -1,14 +1,11 @@
-<<<<<<< TREE
-am-utils (6.1.5-12ubuntu1) intrepid; urgency=low
+am-utils (6.1.5-15ubuntu1) lucid; urgency=low
 
-  * Merge from debian unstable, remaining changes (LP: #269998):
+  * Merge from debian testing, remaining changes:
     - 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 <[e-mail]>  Tue, 23 Sep 2008 19:51:56 -0500
-
-=======
+ -- Nathan Handler <[e-mail]>  Thu, 21 Jan 2010 20:14:24 -0600
+
 am-utils (6.1.5-15) unstable; urgency=low
 
   * Updated to standards 3.8.3
@@ -36,7 +33,15 @@
 
  -- Tim Cutts <[e-mail]>  Tue, 15 Sep 2009 14:14:05 +0200
 
->>>>>>> MERGE-SOURCE
+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 <[e-mail]>  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

=== modified file 'debian/control'
--- debian/control	2010-01-22 02:20:27 +0000
+++ debian/control	2010-01-22 02:20:27 +0000
@@ -1,16 +1,10 @@
 Source: am-utils
 Section: net
 Priority: extra
-<<<<<<< TREE
-Maintainer: Ubuntu MOTU Developers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Tim Cutts <[e-mail]>
-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
-=======
-Maintainer: Tim Cutts <[e-mail]>
 Build-Depends: debhelper (>= 7.0.0), bison, flex, texlive, texi2html (>= 1.76), texinfo, libgdbm-dev, libwrap0-dev, libhesiod-dev, libldap2-dev, autotools-dev, linux-kernel-headers, po-debconf, autoconf, automake1.9, quilt
 Build-Conflicts: autoconf2.13, automake1.4
->>>>>>> MERGE-SOURCE
 Homepage: http://www.am-utils.org/
 Standards-Version: 3.8.3