From: Helge Kreutzmann <debian@helgefjell.de>
Date: Sun, 7 Oct 2007 14:48:09 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://kreutzm-guest@git.debian.org/git/dpkg/dpkg
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6233f972c4d6a5d015d825482f39c80aa757abdf;p=dpkg

Merge branch 'master' of git+ssh://kreutzm-guest@git.debian.org/git/dpkg/dpkg

Conflicts:

	man/ChangeLog
---

6233f972c4d6a5d015d825482f39c80aa757abdf
diff --cc man/ChangeLog
index ff941b32,fcc2e1a0..36f60d74
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@@ -1,7 -1,13 +1,17 @@@
 +2007-10-07  Helge Kreutzmann  <debian@helgefjell.de>
 +
 +	* po/de.po: Updated to 1238t0f52u.
 +
+ 2007-09-30  Frank Lichtenheld  <djpig@debian.org>
+ 
+ 	* deb-control.5: Remove obsolete sentence regarding
+ 	the role of the Priority and Section field. They
+ 	have nothing to do with the archive layout since
+ 	woody.
+ 
+ 	* dpkg-source.1: Remove superfluous [options] from
+ 	-b command description.
+ 
  2007-09-28  Peter Karlsson  <peter@softwolves.pp.se>
  
  	* po/sv.po: Updated to 1290t.
diff --cc man/po/de.po
index 7785bc57,1d50004d..7785bc57
mode 100755,100644..100644
--- a/man/po/de.po
+++ b/man/po/de.po