Merge branch 'master' into sourcev3

ChangeLog

@@ -1,3 +1,9 @@
+2008-02-22  Raphael Hertzog  <hertzog@debian.org>
+	    Mike Frysinger <vapier@gentoo.org>
+
+	* scripts/Makefile.am: Modify PATH during make check to include
+	build directories containing dpkg and the scripts dpkg-*.
+
 2008-02-20  Raphael Hertzog  <hertzog@debian.org>
 
 	* scripts/Dpkg/Changelog.pm (parse_changelog): Fallback

debian/changelog

@@ -35,6 +35,17 @@ dpkg (1.14.17) UNRELEASED; urgency=low
     to find it. Closes: #462413
   * Fix Dpkg::Version to import _g() from Dpkg::Gettext. Thanks to Adam Heath
     for spotting this. Closes: #465651
+  * Change PATH during make check to look into build directories containing
+    dpkg and the related scripts. Thanks to Mike Frysinger. Closes: #466957
+  * Some lintian cleanup:
+    - add overrides for some useless I: tags
+    - drop unused overrides
+    - updated several manual pages to fix hyphen-used-as-minus-sign
+    - fixed manpage-has-errors-from-man in several manual pages
+  * Removed old upgrade code from dpkg's preinst and postinst which only
+    concerns upgrading from dpkg version older than the one in oldstable
+    already. And thus we get rid of old the last usage of read in those
+    scripts (fixes lintian's warning read-in-maintainer-script).
 
   [ Frank Lichtenheld ]
   * Add a warning in dpkg-buildpackage if the build-dependencies are not
@@ -52,16 +63,20 @@ dpkg (1.14.17) UNRELEASED; urgency=low
 
   [ Updated dpkg translations ]
   * Korean (Changwoo Ryu).
+  * Polish (Robert Luberda).
   * Romanian (Eddy Petrișor).
 
   [ Updated manpages translations ]
   * German (Helge Kreutzmann).
+  * Polish (Robert Luberda).
 
   [ Updated scripts translations ]
   * German (Helge Kreutzmann).
+  * Polish (Robert Luberda).
   * Swedish (Peter Karlsson).
 
   [ Updated dselect translations ]
+  * Polish (Robert Luberda).
   * Romanian (Eddy Petrișor).
 
  -- Eddy Petrișor <eddy.petrisor@gmail.com>  Sat, 09 Feb 2008 13:22:38 +0200

debian/dpkg.lintian-overrides

@@ -1,5 +1,4 @@
 dpkg: redundant-origin-field
 dpkg: redundant-bugs-field
-# Those are false positives from comments
-dpkg: install-info-not-called-with-quiet-option
-dpkg: install-info-not-called-with-section-option
+dpkg: arch-dep-package-has-big-usr-share
+dpkg: package-contains-empty-directory usr/share/dpkg/origins/

debian/dpkg.postinst

@@ -56,90 +56,6 @@ remove_info_symlink() {
     fi
 }
 
-
-# Repair damage to /usr/info caused by broken install-info
-fix_damaged_info() {
-    echo -n "
-The version of dpkg you're upgrading from had a problem with the
-install-info program used to maintain the /usr/info/dir file.  It may
-have corrupted the file, for example by placing new entries for the
-menu in it before the \`* Menu' line (thus making them ineffective) or
-by creating several identical sections.
-
-I can try to sort these problems out, but beware that this process is
-not guaranteed not to mess up a dir file which has things that look
-like menu entries in the introductory paragraphs.  The distributed dir
-files do not do this, so if you haven't edited /usr/info/dir it's
-almost certainly safe to say \"yes\" to the next question.
-
-If you say \"no\" you may wish to check and/or edit /usr/info/dir yourself.
-
-Try to check/repair /usr/info/dir automatically ? [y/n] "
-    read response
-    case "$response" in
-	[yY]*|"")
-            echo "Checking/repairing /usr/info/dir ..."
-	    cleanup-info --unsafe
-	    ;;
-	*)
-	    echo "OK, leaving it alone."
-	    ;;
-    esac
-}
-
-
-# Remove stop links from runlevels which also have start links
-# Dates back to the days when update-rc.d was part of dpkg.
-remove_duplicate_daemons() {
-    for lvl in 0 1 2 3 4 5 6; do
-	cd /etc/rc$lvl.d
-	for kill in K[0-9][0-9]*; do
-	    if [ -n "`echo \"x$kill\" | tr -d 0-9A-Za-z_-`" ]; then
-		continue
-	    fi
-
-	    start="`echo $kill | sed -e 's/^K/S/'`"
-	    if ! [ -L $start ] && [ -L $kill ] \
-		|| [ "`ls -Li $kill 2>/dev/null | awk '{print $1}'`" != \
-		"`ls -Li $start 2>/dev/null | awk '{print $1}'`" ]
-	    then
-		continue
-	    fi
-
-	    removes="$removes rc$lvl.d/$kill"
-	done
-    done
-
-    if [ -n "$removes" ]; then
-	echo -n "
-Some daemons and similar services whose scripts have links in the
-/etc/rcN.d directories have both start (S) and stop (K) links in
-some runlevels.  Thus these services get stopped and immediately
-restarted at some runlevel changes, which is probably not what
-you want.
-
-I can remove these probably-spurious K links if you like:
-  $removes
-
-If you're not sure what to do, say \"no\", and then run delete them
-by hand later.
-
-Shall I remove these links ? [y/n] "
-	read response
-	case "$response" in
-	    [yY]*|"")
-                echo "Removing duplicate K links ..."
-		cd /etc
-		rm $removes
-		;;
-	    *)
-	        echo "OK, leaving them."
-		;;
-	esac
-    fi
-}
-
-
 # Create log file and set default permissions if possible
 create_logfile() {
     logfile=/var/log/dpkg.log
@@ -154,15 +70,6 @@ case "$1" in
 	create_database
 	create_logfile
 
-	case "$2" in
-	    0.* | 1.0.* | 1.1.0 | 1.1.0[^0-9]* | '' )
-	        remove_duplicate_daemons
-		;;
-	    1.1.6 | 1.1.6elf | 1.2.[0123] | 1.2.[0123]elf)
-	        fix_damaged_info
-	        ;;
-	esac
-
 	move_info_directory
 	remove_info_symlink
 	;;

debian/dpkg.preinst

@@ -14,135 +14,6 @@
 # If postrm fails during upgrade or fails on failed upgrade:
 #	<old-preinst> abort-upgrade <new-version>
 
-
-# Confirm that users are aware that conffile changes will be lost
-confirm_conffile_stomp() {
-    tempfile=/var/lib/dpkg/bp.$$
-
-    trap 'status=$?; rm -f $tempfile; exit $status' 0
-    perl -000 -ne 'print $x if m/^Package:\s+(\S+\n)/im &&
-                               ($x=$1) ne "dpkg\n" &&
-                               m/^Status:.*(unpacked|postinst)/im' \
-        /var/lib/dpkg/status >$tempfile
-
-    if [ -s $tempfile ]; then
-	echo "
-WARNING - have you read the release notes for this upgrade ?
-
-The following packages have been unpacked but not yet configured:"
-	echo "  "`cat $tempfile`
-
-	echo -n "
-If you proceed with the dpkg upgrade with these packages in this state
-you will LOSE ANY CONFIGURATION CHANGES that have been made to their
-configuration files.  I recommend that you back out of the upgrade
-now (see below) and then configure each of these packages using:
-  dpkg --configure --force-hold <package>
-
-If you do this and it fails for some packages they are broken anyway, in
-which case you probably don't have that much to lose by going ahead
-with the upgrade.
-
-Type \"yes\" to confirm that you really want to do the upgrade in
-spite of my warning above; if you give any other response we'll back
-off the upgrade to give you a chance to fix things.
-
-Continue with upgrade despite probable loss of config data ? "
-
-	read response
-	case "$response" in
-	    [Yy][Ee][Ss])
-                echo "OK, going ahead."
-		;;
-	    *)
-	        echo "Aborting dpkg upgrade."
-		exit 1
-		;;
-	esac
-    fi
-
-    rm -f $tempfile
-}
-
-
-# Confirm that the user isn't upgrading anything else at the same time
-confirm_singleton() {
-    echo -n "
-IMPORTANT - you must install this upgrade on its own, not together in
-the same dpkg run as any other packages.  Otherwise you risk losing
-configuration information.
-
-If you say \"no\" to the question below we'll back off the upgrade now,
-and you can then do it later using:
-  dpkg --install dpkg-0.93.51.deb
-
-If you're not sure what to do, say \"no\", and then run that command
-(with the appropriate dpkg-*.deb filename) from a root shell prompt.
-
-Are you installing only the dpkg upgrade in this dpkg run ? [y/n] "
-    read response
-    case "$response" in
-	[yY]*|"")
-            echo "OK, going ahead."
-	    ;;
-	*)
-	    echo "Aborting dpkg upgrade."
-	    exit 1
-	    ;;
-    esac
-}
-
-
-# Confirm that dselect got split into it's own package
-confirm_dselect_split() {
-    if [ -x /bin/ps ]; then
-	if ! ps -C dselect >/dev/null; then
-	    return
-	fi
-    fi
-
-    if ! grep "^Package: *dselect$" /var/lib/dpkg/status >/dev/null; then
-	echo -n "
-IMPORTANT - if you are upgrading this package from within dselect you
-_MUST_ install the dselect package first.
-
-The dselect frontend has been split into a separate \`dselect' package,
-which has not yet been unpacked onto your system.  Continuing the upgrade
-will mean that dselect will temporarily be removed from your system, if
-this happens within dselect the upgrade will fail.
-
-Type \"yes\" to confirm that you really want to do the upgrade in
-spite of my warning above (because you're not running dselect, for
-example); if you give any other response we'll back off the upgrade to
-give you a change to install the dselect package first.
-
-Continue with upgrade despite separation of dselect ? "
-
-	read response
-	case "$response" in
-	    [Yy][Ee][Ss])
-                echo "OK, going ahead."
-		;;
-	    *)
-	        echo "Aborting dpkg upgrade."
-		exit 1
-		;;
-	esac
-    fi
-}
-
-
-# Remove obsolete hd method scripts
-remove_hd_method() {
-    methoddir=/usr/lib/dpkg/methods/hd
-
-    if [ -d $methoddir ]; then
-	echo "Removing obsolete $methoddir ..."
-	rm -r $methoddir
-    fi
-}
-
-
 # Handle upgrades from pre-conffile dpkg.cfg
 upgrade_dpkg_non_conffile()
 {
@@ -161,23 +32,6 @@ case "$1" in
 	;;
 
     upgrade)
-	case "$2" in
-	    # Upgrade from non-C dpkg (pre-0.93.50)
-	    0.93.[01234]* | -)
-	        echo ""
-		echo "Contemplating upgrade of dpkg from pre-0.93.50 version ..."
-
-		confirm_conffile_stomp
-		confirm_singleton
-		confirm_dselect_split
-	        remove_hd_method
-		;;
-	    
-	    # Upgrade from pre-dselect split
-	    0.93.[5678][0-9]* | 1.[023456789]* | 1.1.* | 1.10 | 1.10.[12] )
-	        confirm_dselect_split
-		;;
-	esac
 	case "$2" in
 	    # Upgrade from pre-conffile dpkg.cfg
 	    1.9.21 | 1.10.* )

debian/dselect.lintian-overrides

@@ -1,3 +1,3 @@
 dselect: redundant-origin-field
 dselect: redundant-bugs-field
-
+dselect: arch-dep-package-has-big-usr-share

debian/source.lintian-overrides

@@ -1 +1,3 @@
 dpkg source: redundant-origin-field
+dpkg source: non-standard-arch-in-source-relation kfreebsd-i386 [build-depends: libselinux1-dev (>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]]
+dpkg source: non-standard-arch-in-source-relation kfreebsd-amd64 [build-depends: libselinux1-dev (>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]]

dselect/po/ChangeLog

@@ -1,3 +1,8 @@
+2008-02-24  Robert Luberda <robert@debian.org>
+
+	* pl.po: Recoded to UTF-8.
+	* pl.po: Updated to 286t.
+
 2008-02-09  Eddy Petrișor <eddy.petrisor@gmail.com>
 
 	* ro.po: 285t

man/ChangeLog

@@ -1,3 +1,21 @@
+2008-02-24  Robert Luberda <robert@debian.org>
+
+	* pl.po: Recoded to UTF-8.
+	* pl.po: Updated to 1344t13f103u.
+
+2008-02-22  Raphael Hertzog  <hertzog@debian.org>
+
+	* dpkg-gensymbols.1: Fix some groff errors detected by lintian.
+	* dpkg-query.1: Same.
+
+2008-02-22  Raphael Hertzog  <hertzog@debian.org>
+
+	* po/po4a.cfg: Add deb-symbols.5 in the list of manual pages to
+	translate.
+	* deb-symbols.5, dpkg-architecture.1, dpkg-shlibdeps.1,
+	start-stop-daemon.8: Espace some hyphens so that they do
+	not end up as minus sign.
+
 2008-02-19  Frank Lichtenheld  <djpig@debian.org>
 
 	* dpkg-source.1: Fix documentation of

man/deb-symbols.5

@@ -37,7 +37,7 @@ etc.
 Each entry for a library can also have some fields of meta-information.
 Those fields are stored on lines starting with an asterisk. Currently,
 the only valid field is \fIBuild-Depends-Package\fR, it indicates the name
-of the "-dev" package associated to the library and is used by
+of the "\-dev" package associated to the library and is used by
 dpkg-shlibdeps to make sure that the dependency generated is at least as
 strict as the corresponding build dependency.
 .SH EXAMPLES

man/dpkg-architecture.1

@@ -258,7 +258,7 @@ dpkg\-architecture \-elinux\-alpha
 .IP
 dpkg\-architecture \-amips \-elinux\-mips
 .PP
-Check if the current architecture or an architecture provided with -a are
+Check if the current architecture or an architecture provided with \-a are
 Linux systems:
 .IP
 dpkg\-architecture \-ilinux\-any

man/dpkg-gensymbols.1

@@ -98,7 +98,7 @@ libc.so.6 libc6 #MINVER#
 The symbol access@GLIBC_2.0 will lead to a minimal dependency on libc6
 version 2.2 despite the wildcard entry *@GLIBC_2.0 which associates
 symbols versioned as GLIBC_2.0 with the minimal version 2.0.
-.p
+.P
 Note that using wildcards means that \fBdpkg\-gensymbols\fR can't check
 for symbols that might have disappeared and can't generate a diff between
 the maintainer-supplied symbols file and the generated one in the binary

man/dpkg-query.1

@@ -78,7 +78,6 @@ listed.
 
 In the format string, \(lq\fB\e\fP\(rq introduces escapes:
 
-.T
 .nf
     \fB\en\fP  newline
     \fB\er\fP  carriage return
@@ -95,7 +94,6 @@ variable references to package fields using the syntax
 printed right-aligned unless the width is negative in which case left
 alignment will be used. The following \fIfield\fRs are recognised:
 
-.T
 .nf
     \fBArchitecture\fP
     \fBBugs\fP
@@ -137,7 +135,6 @@ conversion nor error checking is done on them.
 To get the name of the dpkg maintainer and the installed version, you could
 run:
 
-.T
 .nf
   \fBdpkg\-query \-W \-f=\(aq${Package} ${Version}\\t${Maintainer}\\n\(aq dpkg\fP
 .fi

man/dpkg-shlibdeps.1

@@ -295,13 +295,13 @@ of the binary to avoid problems.
 
 Calling
 .B dpkg\-shlibdeps
-in verbose mode (-v) will provide much more information about where it
+in verbose mode (\-v) will provide much more information about where it
 tried to find the dependency information. This might be useful if you
 don't understand why it's giving you this error.
 .SH "SEE ALSO"
 .BR deb\-shlibs (5),
 .BR deb\-symbols (5),
-.BR dpkg-gensymbols (1).
+.BR dpkg\-gensymbols (1).
 .
 .SH AUTHORS
 Copyright (C) 1995-1996 Ian Jackson

man/po/po4a.cfg

@@ -58,6 +58,11 @@
            add_$lang:$(srcdir)/po/$lang.add
 
 
+[type:man] $(srcdir)/deb-symbols.5              \
+           $lang:$lang/deb-symbols.5            \
+           add_$lang:$(srcdir)/po/$lang.add
+
+
 [type:man] $(srcdir)/dpkg.1                     \
            $lang:$lang/dpkg.1                   \
            add_$lang:$(srcdir)/po/$lang.add

man/start-stop-daemon.8

@@ -262,19 +262,19 @@ Start the \fBfood\fP daemon, unless one is already running (a process named
 food, running as user food, with pid in food.pid):
 .IP
 .nf
-start-stop-daemon --start --oknodo --user food --name food --pidfile /var/run/food.pid --startas /usr/sbin/food --chuid food -- --daemon
+start\-stop\-daemon \-\-start \-\-oknodo \-\-user food \-\-name food \-\-pidfile /var/run/food.pid \-\-startas /usr/sbin/food \-\-chuid food \-\- \-\-daemon
 .fi
 .PP
 Send \fBSIGTERM\fP to \fBfood\fP and wait up to 5 seconds for it to stop:
 .IP
 .nf
-start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry 5
+start\-stop\-daemon \-\-stop \-\-oknodo \-\-user food \-\-name food \-\-pidfile /var/run/food.pid \-\-retry 5
 .fi
 .PP
 Demonstration of a custom schedule for stopping \fBfood\fP:
 .IP
 .nf
-start-stop-daemon --stop --oknodo --user food --name food --pidfile /var/run/food.pid --retry=TERM/30/KILL/5
+start\-stop\-daemon \-\-stop \-\-oknodo \-\-user food \-\-name food \-\-pidfile /var/run/food.pid \-\-retry=TERM/30/KILL/5
 .fi
 .PP
 .

po/ChangeLog

@@ -1,3 +1,8 @@
+2008-02-24  Robert Luberda <robert@debian.org>
+
+	* pl.po: Recoded to UTF-8
+	* pl.po: Updated to 921t.
+
 2008-02-09  Eddy Petrișor <eddy.petrisor@gmail.com>
 
 	* ro.po: Update to 927t.

scripts/Makefile.am

@@ -174,4 +174,4 @@ check: $(TEST_FILES) $(wildcard $(srcdir)/t/200_Dpkg_Shlibs/ld.so.conf*)
 # a bit hacky...
 	$(mkdir_p) t.tmp
 	cp -dRl $(srcdir)/t/200_Dpkg_Shlibs/ld.so.conf* t.tmp/
-	srcdir=$(srcdir) PERL5LIB=$(srcdir) DPKG_DATADIR=$(srcdir)/.. PERL_DL_NONLAZY=1 $(PERL) -I$(srcdir) "-MExtUtils::Command::MM" "-e" "test_harness($(TEST_VERBOSE), '.')" $(TEST_FILES)
+	PATH="$(top_builddir)/src:$(top_builddir)/scripts:$(PATH)" srcdir=$(srcdir) PERL5LIB=$(srcdir) DPKG_DATADIR=$(srcdir)/.. PERL_DL_NONLAZY=1 $(PERL) -I$(srcdir) "-MExtUtils::Command::MM" "-e" "test_harness($(TEST_VERBOSE), '.')" $(TEST_FILES)

scripts/po/ChangeLog

@@ -1,3 +1,8 @@
+2008-02-24  Robert Luberda <robert@debian.org>
+
+	* pl.po: Recoded to UTF-8.
+	* pl.po: Updated to 484t1f4u.
+
 2008-01-22  Helge Kreutzmann  <debian@helgefjell.de>
 
 	* de.po: Updated to 335t0f148u.