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

Conflicts:

	debian/changelog
	po/ChangeLog

ChangeLog

@@ -1,3 +1,21 @@
+2007-09-08  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-buildpackage.sh: Use fakeroot, if present, as default
+	value for the '-r' option.
+
+2007-09-06  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-genchanges.pl: Stop recognizing the obsolete Optional
+	field.
+	* scripts/dpkg-gencontrol.pl: Likewise.
+	* scripts/dpkg-source.pl: Likewise.
+
+2007-09-06  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-name.sh: Avoid escaped quotes messing with syntax
+	highlighting by using $() instead of backticks.
+	* scripts/dpkg-buildpackage.sh: Likewise.
+
 2007-09-06  Guillem Jover  <guillem@debian.org>
 
 	* scripts/dpkg-genchanges.pl ($host_arch): Do not declare as 'our'.

debian/changelog

@@ -3,13 +3,22 @@ dpkg (1.14.7) UNRELEASED; urgency=low
   [ 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
 

dselect/po/ChangeLog

@@ -6,7 +6,7 @@
 
 	* ru.po: Updated to 285t.
 
-2007-07-29  Peter Karlsson <peterk@debian.org>
+2007-07-29  Peter Karlsson  <peterk@debian.org>
 
 	* sv.po: Updated to 285t.
 

man/ChangeLog

@@ -1,3 +1,13 @@
+2007-09-08  Guillem Jover  <guillem@debian.org>
+
+	* dpkg-scanpackages.1: Document that gzipped files are also used by
+	apt.
+
+2007-09-08  A. Costa  <agcosta@gis.net>
+
+	* dpkg-deb.1: Fix typo ('seperated' -> 'separated').
+	* start-stop-daemon.8: Fix typo ('themself' -> 'themselves').
+
 2007-09-06  Guillem Jover  <guillem@debian.org>
 
 	* dpkg-scanpackages.1: Replace gzip with bzip2 as the requirement for
@@ -33,7 +43,7 @@
 
 2007-08-14  Robert Luberda  <robert@debian.org>
 
-        * po/pl.po: Update to 1002t14f269u.
+	* po/pl.po: Update to 1002t14f269u.
 
 2007-08-05  Peter Karlsson  <peterk@debian.org>
 
@@ -41,7 +51,7 @@
 
 2007-08-05  Helge Kreutzmann  <debian@helgefjell.de>
 
-        * po/de.po: Updated to 1111t6f165u.
+	* po/de.po: Updated to 1111t6f165u.
 
 2007-07-31  Peter Karlsson  <peterk@debian.org>
 

man/dpkg-deb.1

@@ -1,4 +1,4 @@
-.TH dpkg\-deb 1 "2007-07-18" "Debian Project" "dpkg suite"
+.TH dpkg\-deb 1 "2007-09-08" "Debian Project" "dpkg suite"
 .SH NAME
 dpkg\-deb \- Debian package archive (.deb) manipulation tool
 .
@@ -97,7 +97,7 @@ Provides information about a binary package archive in the format
 specified by the
 .B \-\-showformat
 argument. The default format displays the package's name and version
-on one line, seperated by a tabulator.
+on one line, separated by a tabulator.
 .TP
 .BR \-f ", " \-\-field " \fIarchive\fP [\fIcontrol-field-name\fP...]"
 Extracts control file information from a binary package archive.

man/dpkg-scanpackages.1

@@ -13,7 +13,7 @@
 .\" You should have received a copy of the GNU General Public
 .\" License along with dpkg; if not, write to the Free Software
 .\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-.TH dpkg\-scanpackages 1 "2007-09-06" "Debian Project" "dpkg utilities"
+.TH dpkg\-scanpackages 1 "2007-09-08" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-scanpackages \- create Packages index files
 .
@@ -44,7 +44,9 @@ If you want to access the generated Packages file with
 .B apt
 you will probably need to compress the file with
 .BR bzip2 (1)
-(generating a Packages.bz2 file). apt ignores uncompressed Packages
+(generating a Packages.bz2 file) or
+.BR gzip (1)
+(generatinc a Packages.gz file). apt ignores uncompressed Packages
 files except on local access (i.e.
 .B file://
 sources).

man/start-stop-daemon.8

@@ -1,4 +1,4 @@
-.TH start\-stop\-daemon 8 "2007-03-06" "Debian Project" "dpkg utilities"
+.TH start\-stop\-daemon 8 "2007-09-08" "Debian Project" "dpkg utilities"
 .SH NAME
 start\-stop\-daemon \- start and stop system daemon programs
 .
@@ -213,7 +213,7 @@ cannot check the exit status if the process fails to execute for
 .B any
 reason. This is a last resort, and is only meant for programs that either
 make no sense forking on their own, or where it's not feasible to add the
-code for them to do this themself.
+code for them to do this themselves.
 .TP
 .BR \-N ", " \-\-nicelevel " \fIint\fP"
 This alters the priority of the process before starting it.

po/ChangeLog

@@ -1,10 +1,14 @@
+<<<<<<< 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>
 
@@ -12,19 +16,19 @@
 
 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>
 
-	* de.po: Updated to 929t
+	* de.po: Updated to 929t.
 
 2007-09-02  Clytie Siddall  <clytie@riverland.net.au>
 
-	* vi.po: Updated to 929t
+	* vi.po: Updated to 929t.
 
 2007-08-26  Shiva Prasad Pokharel  <pokharelshiv@gmail.com>
 
-	* ne.po: Updated to 903t23f3u. 
+	* ne.po: Updated to 903t23f3u.
 
 2007-08-25  Peter Karlsson  <peterk@debian.org>
 
@@ -37,7 +41,7 @@
 
 2007-08-14  Robert Luberda  <robert@debian.org>
 
-        * pl.po: Updated to 921t.
+	* pl.po: Updated to 921t.
 
 2007-08-06  Yuri Kozlov  <kozlov.y@gmail.com>
 
@@ -65,11 +69,11 @@
 
 2007-06-18  Ivar Smolin  <okul@linux.ee>
 
-	* et.po: Updated to 463t458u
+	* et.po: Updated to 463t458u.
 
 2007-06-05  Ivar Smolin  <okul@linux.ee>
 
-	* et.po: Updated to 441t480u
+	* et.po: Updated to 441t480u.
 
 2007-06-01  Clytie Siddall  <clytie@riverland.net.au>
 

scripts/dpkg-buildpackage.sh

@@ -4,7 +4,7 @@ set -e
 
 version="1.10.10"; # This line modified by Makefile
 
-progname="`basename \"$0\"`"
+progname="$(basename "$0")"
 
 showversion () {
 	echo "Debian $progname version $version."
@@ -22,6 +22,8 @@ Usage: $progname [<options> ...]
 
 Options:
   -r<gain-root-command>
+                 command to gain root privileges (default is fakeroot if it
+                 exists).
   -p<sign-command>
   -d             do not check build dependencies and conflicts.
   -D             check build dependencies and conflicts.
@@ -59,6 +61,10 @@ END
 }
 
 rootcommand=''
+if command -v fakeroot >/dev/null 2>&1; then
+	rootcommand=fakeroot
+fi
+
 signcommand=""
 if [ -e "$GNUPGHOME" ] || [ -e "$HOME/.gnupg" ] && \
 		command -v gpg > /dev/null 2>&1; then
@@ -86,7 +92,7 @@ admindir=''
 
 while [ $# != 0 ]
 do
-	value="`echo x\"$1\" | sed -e 's/x--.*=//;s/^x-.//'`"
+	value="$(echo x"$1" | sed -e 's/x--.*=//;s/^x-.//')"
 	case "$1" in
 	-h|--help)
 		usage; exit 0 ;;
@@ -160,7 +166,7 @@ mustsetvar () {
 }
 
 curd="`pwd`"
-dirn="`basename \"$curd\"`"
+dirn="$(basename "$curd")"
 mustsetvar package "`dpkg-parsechangelog | sed -n 's/^Source: //p'`" "source package is"
 mustsetvar changesversion "`dpkg-parsechangelog | sed -n 's/^Version: //p'`" "source version is"
 if [ -n "$changedby" ]; then maintainer="$changedby";
@@ -173,7 +179,7 @@ if [ x$sourceonly = x ]; then
 else
 	arch=source
 fi
-mustsetvar sversion "`echo \"$changesversion\" | perl -pe 's/^\d+://'`" "source version without epoch"
+mustsetvar sversion "$(echo "$changesversion" | perl -pe 's/^\d+://')" "source version without epoch"
 pv="${package}_${sversion}"
 pva="${package}_${sversion}_${arch}"
 

scripts/dpkg-genchanges.pl

@@ -253,7 +253,7 @@ for $_ (keys %fi) {
 		}
 		push(@archvalues,$v) unless !$v || $archadded{$v}++;
 	    } elsif (m/^(Package|Essential|Pre-Depends|Depends|Provides)$/ ||
-		     m/^(Recommends|Suggests|Enhances|Optional|Conflicts|Breaks|Replaces)$/ ||
+		     m/^(Recommends|Suggests|Enhances|Conflicts|Breaks|Replaces)$/ ||
 		     m/^Tag$/i ||
 		     m/^X[BS]+-/i) {
 	    } else {

scripts/dpkg-gencontrol.pl

@@ -162,7 +162,7 @@ for $_ (keys %fi) {
         else { $_ = "C $_"; &unknown(_g('general section of control info file')); }
     } elsif (s/^C$myindex //) {
 #print STDERR "P key >$_< value >$v<\n";
-        if (m/^(Package|Description|Homepage|Tag|Essential|Optional)$/) {
+        if (m/^(Package|Description|Homepage|Tag|Essential)$/) {
             $f{$_}= $v;
         } elsif (exists($pkg_dep_fields{$_})) {
 	    # Delay the parsing until later

scripts/dpkg-name.sh

@@ -3,7 +3,7 @@
 set -e
 
 # Time-stamp: <96/05/03 13:59:41 root>
-prog="`basename \"${0}\"`"
+prog="$(basename "${0}")"
 version="1.2.3"; # This line modified by Makefile
 purpose="rename Debian packages to full package names"
 

scripts/dpkg-source.pl

@@ -285,7 +285,7 @@ if ($opmode eq 'build') {
             } elsif (s/^X[BC]*S[BC]*-//i) {
                 $f{$_}= $v;
             } elsif (m/^(Package|Essential|Pre-Depends|Depends|Provides)$/i ||
-                     m/^(Recommends|Suggests|Optional|Conflicts|Replaces)$/i ||
+                     m/^(Recommends|Suggests|Conflicts|Replaces)$/i ||
                      m/^(Breaks|Enhances|Description|Tag|Section|Priority)$/i ||
                      m/^X[BC]+-/i) {
             } else {

scripts/po/ChangeLog

@@ -1,6 +1,6 @@
-2007-08-30  Peter Karlsson <peterk@debian.org>
+2007-08-30  Peter Karlsson  <peterk@debian.org>
 
-	* LINGUAS, sv.po: Added Swedish
+	* LINGUAS, sv.po: Added Swedish.
 
 2007-08-18  Guillem Jover  <guillem@debian.org>