Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

Conflicts:

	debian/changelog
	po/ChangeLog

diff --cc debian/changelog
index 5069fd0bbaf41710bbb1be49847337d14f3d78fb,5d10d9fde0870df172c9bf6bc2d24c61790ab328..89a60b678443f9dc29ffdeecbca7a97fc57f262c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -3,15 -3,19 +3,24 @@@ dpkg (1.14.7) UNRELEASED; urgency=lo
    [ Guillem Jover ]
    * Add back $dpkglib into @INC, needed by the controllib.pl require in
      822-date. Closes: #440962
-   * Document in dpkg-scanpackages that apt now requires Packages.bz2 instead
-     of Packages.gz. Closes: #440973
+   * Document in dpkg-scanpackages that apt now requires Packages.bz2 in
+     preference to Packages.gz. Closes: #440973
+   * Stop recognizing the obsolete Optional field when building packages.
+   * Use fakeroot, if present, by default to gain root privileges in
+     dpkg-buildpackage.
+   * Fix typos in dpkg-deb.1 and start-stop-daemon.8. Closes: #441051
+     Thanks to A. Costa.
  
    [ Updated dpkg translations ]
++<<<<<<< HEAD:debian/changelog
 +  * Portuguese (Miguel Figueiredo). Closes: #441113
++=======
++>>>>>>> 317b4f1dcc46fc145ad651c1566e39422e716d9a:debian/changelog
    * German (Sven Joachim). Closes: #440537
    * Nepali (Shiva Prasad Pokharel). Closes: #437825
+   * Portuguese (Miguel Figueiredo).
    * Vietnamese (Clytie Siddall). Closes: #440502
 +  * Danish (Claus Hindsgaul). Closes: #441106
  
    [ Updated man pages translations ]
    * Swedish (Peter Karlsson).

diff --cc po/ChangeLog
index 0d5f1a3b87ad1950e25e64565b4bfe969a825599,76dea2217ff6d1dde4aabfb5977d411bb8a6c5a5..43b9aded4d0018a1cfe7da5ffcb7f6c8f47495bd
--- 1/po/ChangeLog
--- 2/po/ChangeLog
+++ b/po/ChangeLog
@@@ -1,18 -1,10 +1,22 @@@
++<<<<<<< HEAD:po/ChangeLog
 +2007-09-07  Claus Hindsgaul  <claus.hindsgaul@gmail.com>
 +
 +      * da.po: Updated to 929t
 +
 +2007-09-06  Miguel Figueiredo <elmig@debianpt.org>
++=======
+ 2007-09-06  Miguel Figueiredo  <elmig@debianpt.org>
++>>>>>>> 317b4f1dcc46fc145ad651c1566e39422e716d9a:po/ChangeLog
  
-       * pt.po: Updated to 929t
+       * pt.po: Updated to 929t.
  
 +2007-09-05  Piarres Beobide  <pi@beobide.net>
 +
 +      * eu.po: Updated to 929t
 +
  2007-09-04  Frédéric Bothamy  <frederic.bothamy@free.fr>
  
-       * fr.po: Updated to 929t
+       * fr.po: Updated to 929t.
  
  2007-09-02  Sven Joachim  <svenjoac@gmx.de>