Merge branch 'master' into parsechangelog

Conflicts:

	ChangeLog
	debian/changelog
	scripts/Makefile.am

diff --cc ChangeLog
index 790f99f1207fa335f3458d1b5ca96e9be6b23621,ea2f691130c903ae4d922a8729ea4e88e9163758..f030920b2ff76f1a48da5bcb0affdca314f61cce
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,50 +1,58 @@@
 +2007-12-06  Frank Lichtenheld  <djpig@debian.org>
 +
 +      * scripts/dpkg-parsechangelog.pl: Make the
 +      -L option actually work (it's only been eleven
 +      years...)
 +
 +      * scripts/Dpkg/ErrorHandling.pm (report): export.
 +
+ 2007-12-05  Frank Lichtenheld  <djpig@debian.org>
+ 
+       * scripts/dpkg-buildpackage.pl: Add new
+       -A option (passed to dpkg-genchanges).
+       * scripts/dpkg-genchanges.pl: Add new -A
+       option that will include only arch-indep
+       packages into the upload.
+ 
+ 2007-12-05  Frank Lichtenheld  <djpig@debian.org>
+           Goswin von Brederlow  <brederlo@informatik.uni-tuebingen.de>
+           Bastian Blank  <waldi@debian.org>
+ 
+       * scripts/dpkg-genchanges.pl: Support more
+       than one arch and more than one type of
+       a package in debian/files.
+ 
+ 2007-12-04  Frank Lichtenheld  <djpig@debian.org>
+ 
+       * dpkg-deb/info.c (info_spew): Replace a
+       %ld with %lu to fix compiler warning.
+ 
+       * scripts/dpkg-genchanges.pl: Use comp_regex
+       from Dpkg to correctly exlucde the .orig.tar
+       even if it is not compressed with gzip.
+ 
+       * scripts/dpkg-source.pl: Move definition
+       of @comp_supported, %comp_supported, %comp_ext,
+       $comp_regex to...
+       * scripts/Dpkg.pm: ...here. Make them exportable
+       via the :compression tag.
+ 
+       * scripts/Dpkg/ErrorHandling.pm (usageerr):
+       Support format strings like all the other
+       error reporting functions.
+ 
+       * scripts/Makefile.am (EXTRA_DIST): Add
+       missing files from scripts/t/.
+ 
+       * debian/rules: Call dh_installchangelogs
+       and dh_installdocs for all packages instead
+       of only for dpkg.
+       * debian/dpkg-dev.docs: Symlink to dpkg.docs.
+       * debian/dselect.docs: Likewise.
+       * debian/dpkg-dev.preinst: Remove
+       /usr/share/doc/dpkg-dev symlink on upgrade.
+       * debian/dselect.preinst: Likewise.
+ 
  2007-11-29  Frank Lichtenheld  <djpig@debian.org>
  
        * scripts/controllib.pl (parsecdata): Fix

diff --cc debian/changelog
index 8f596880d0a314d4872102bcd622d8386ca91be0,66b21304d384ec4aae578483793bd3a19716c82a..5b3bed068be753510137aaeeb8c1084c3cfcfa0b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -30,9 -21,10 +30,10 @@@ dpkg (1.14.13) UNRELEASED; urgency=lo
    * Swedish (Peter Karlsson)
  
    [ Updated scripts translations ]
+   * French (Frédéric Bothamy).
    * Swedish (Peter Karlsson)
  
 - -- Frank Lichtenheld <djpig@debian.org>  Wed, 05 Dec 2007 15:05:56 +0100
 + -- Frank Lichtenheld <djpig@debian.org>  Thu, 06 Dec 2007 04:27:17 +0100
  
  dpkg (1.14.12) unstable; urgency=low
  

diff --cc scripts/Dpkg/ErrorHandling.pm
Simple merge

diff --cc scripts/Makefile.am
index 1252c275c83ac6dd22e295d40e5aaf1fd530d8dc,4a7ca23c091b1093237e694d4a578bdc7c70ecc7..0a711a565fbd6786052d98c44dadcc6cd83120f5
--- 1/scripts/Makefile.am
--- 2/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@@ -67,10 -67,8 +67,12 @@@ EXTRA_DIST = 
        t/200_Dpkg_Shlibs/objdump.libc6-2.6 \
        t/200_Dpkg_Shlibs/objdump.dbd-pg \
        t/200_Dpkg_Shlibs/objdump.ls \
 -      t/400_Dpkg_Deps.t
+       t/300_Dpkg_BuildOptions.t \
++      t/400_Dpkg_Deps.t \
 +      t/600_Dpkg_Changelog.t \
 +      t/600_Dpkg_Changelog/countme \
 +      t/600_Dpkg_Changelog/misplaced-tz \
 +      t/600_Dpkg_Changelog/shadow
  
  CLEANFILES = \
        $(bin_SCRIPTS) $(sbin_SCRIPTS) $(changelog_SCRIPTS) \