Browse Source

Remove trailing whitespaces

Do not fix the shlibs conffiles to avoid possible useless prompts.

Fixes CodeLayout::ProhibitTrailingWhitespace.

Warned-by: perlcritic
Guillem Jover 11 years ago
parent
commit
9b6695956a

+ 102 - 102
ChangeLog.old

@@ -3961,7 +3961,7 @@
 	* scripts/dpkg-parsechangelog.pl: Make the
 	-L option actually work (it's only been eleven
 	years...)
-	
+
 	* scripts/Dpkg/ErrorHandling.pm (report): export.
 
 2008-01-08  Raphaël Hertzog  <hertzog@debian.org>
@@ -8021,7 +8021,7 @@
 	use the second to set $newdirectory rather than creating it ourselves.
 	It's an error to specify an output directory that exists.
 	(usageversion): Document optional second argument to dpkg-source -x.
-	
+
 	* man/C/dpkg-source.1: Document optional second argument.
 
 2005-06-11  Matt Kraai  <kraai@alumni.cmu.edu>,
@@ -8088,7 +8088,7 @@
 	and either set what we think it should be or let the default security
 	context for the process be applied.
 	* debian/control (Build-Depends): Add libselinux1-dev as a build
-	dependency. 
+	dependency.
 	* debian/rules: Compile-in support for selinux and link statically.
 	* dpkg-deb/Makefile.am (dpkg_deb_LDADD): Link dpkg-deb with
 	SELINUX_LIBS.
@@ -8185,7 +8185,7 @@
 	the default permissions.
 	* debian/dpkg.postrm (remove_logfile): Remove log files when dpkg
 	is purged (not that it will happen, but it pays to be compliant).
-	
+
 	* debian/dpkg.preinst (confirm_dselect_split): Only check process
 	list for dselect if ps is installed; this should be the case during
 	upgrades anyway.
@@ -8634,7 +8634,7 @@
 	as this function does actually call return sometimes.
 	* m4/compiler.m4 (SJR_COMPILER_WARNINGS): Enable warnings for CXX
 	too, my original macro doesn't do this.
-	
+
 	* configure.ac: Use AC_GNU_SOURCE to get some of the extra goodies
 	in the GNU C library, use DPKG_C_C99 to test for C99 features.
 	* m4/compiler.m4 (DPKG_C_C99): New macro to determine whether
@@ -8868,7 +8868,7 @@
 	* src/Makefile.am (dpkg_query_SOURCES): There is no errors.h.
 
 	* Makefile.conf.in: Remove file used by old build system.
-	
+
 	* lib/mlib.c (buffer_write): Remove cast from lvalue, deprecated
 	in recent versions of gcc.
 	* m4/compiler.m4 (SJR_COMPILER_OPTIMISATIONS): Explicitly set -O0
@@ -8921,12 +8921,12 @@
 	* src/.arch-inventory: Replace with more complete regex rules.
 	* utils/.cvsignore: Remove old file.
 	* utils/.arch-inventory: Replace with more complete regex rules.
-	
+
 	* man/sv/.check.pl: Remove as it uses CVS to check whether the
 	translations are up to date, and we don't use that anymore.
 	* dselect/checkunimp.pl: Remove unused file.
 	* dselect/keys.c: Remove unused file.
-	
+
 	For at least the second time in dpkg's history, convert the build
 	system to use GNU Automake.  I'm sure some future maintainer will
 	come along and get rid of it again, but for now, Automake is the
@@ -8988,7 +8988,7 @@
 	* src/help.c: Remove version.h include and replace
 	USE_START_STOP_DAEMON with WITH_START_STOP_DAEMON.
 	* src/main.c: Remove version.h include.
-	
+
 	We're going to move to using 'autoreconf' to generate the build
 	scripts after a checkout and 'make dist' to get a clean tarball.
 	Various files will get copied automatically so there's no point
@@ -9035,7 +9035,7 @@
 	* utils/start-stop-daemon.c: Duplicate includes of <sys/cdefs.h>
 	and <stddef.h> along with attribute marker definitions to avoid
 	having to include 'dpkg.h'.
-	
+
 	* configure.in: Rename to 'configure.ac' and rewrite from the
 	ground-up with Autoconf 2.59 in mind.
 	* m4/arch.m4: New file of macros for 'configure.ac':
@@ -9079,10 +9079,10 @@
 	* version-nr: Remove, version should be changed in configure.ac
 	directly.
 	* automake: Remove older Autoconf macros.
-	
+
 	* po/ChangeLog: Add new ChangeLog to describe changes affecting
 	translations and their infrastructure.
-	
+
 	* origin: Move to 'origins/debian' so we can ship additional
 	origins in future.
 
@@ -9123,7 +9123,7 @@
 	set ADMINDIR, CONFIGDIR and LIBDIR in Makefile where needed as they
 	can contain shell paths.
 	* include: Remove directory.
-	
+
 	* AUTHORS: Add new file detailing the original authors of dpkg and
 	the maintainers through the years.
 	* COPYING: Update to include correct FSF address.
@@ -9154,7 +9154,7 @@
 	* src/dpkg.8: Move to 'man/C'.
 	* utils/md5sum.1: Move to 'man/C'.
 	* utils/start-stop-daemon.8: Move to 'man/C'.
-	
+
 	* man/en: Rename directory to 'man/C', reserving country codes for
 	manpages that have actually undergone translation.  These are the
 	"original" format, and like the strings in the code itself don't
@@ -9169,12 +9169,12 @@
 	* scripts/dpkg-scansources.1: Generate with pod2man and remove
 	damage from the top, turning it into respectable nroff.
 	* scripts/dpkg-scansources.pl: Remove POD documentation from script.
-	
+
 	Remove the SGML files containing the same content as the manpages,
 	but which were never used to generate them.  This avoids confusion,
 	and as one markup format is just as good as another, we'll settle
 	on nroff's man format.
-	
+
 	* man/en/cleanup-info.8.sgml: Remove SGML format documentation.
 	* man/en/deb-control.5.sgml: Remove SGML format documentation.
 	* man/en/deb-old.5.sgml: Remove SGML format documentation.
@@ -9464,7 +9464,7 @@ Mon Oct 11 18:11:54 CEST 2004 Miroslav Kure <kurem@upcase.inf.upol.cz>
 
   * po/cs.po: Updated
 
-Mon Oct 11 18:11:54 CEST 2004 Andre Luis Lopes <andrelop@debian.org> 
+Mon Oct 11 18:11:54 CEST 2004 Andre Luis Lopes <andrelop@debian.org>
 
   * po/pt_BR.po: Updated
 
@@ -9550,8 +9550,8 @@ Tue Jun 15 19:19:36 BST 2004 Bartosz Fenski aka fEnIo <fenio@o2.pl>
 
 Mon Jun 14 09:35:30 BST 2004 Ruben Porras <nahoo82@telefonica.net>
 
-  * man/es/dpkg-scanpackages.1, man/es/start-stop-daemon.8, 
-  man/es/dpkg-scansources.1, man/es/dpkg.8, man/es/dpkg-checkbuilddeps.1, 
+  * man/es/dpkg-scanpackages.1, man/es/start-stop-daemon.8,
+  man/es/dpkg-scansources.1, man/es/dpkg.8, man/es/dpkg-checkbuilddeps.1,
   man/es/dselect.8, man/es/dpkg-deb.1: Updated again from the BTS, for
   some reason the previous update lost the foreign characters.
 
@@ -9883,13 +9883,13 @@ Sun Apr 25 00:23:27 CEST 2004  Tollef Fog Heen  <tfheen@debian.org>
 
   * lib/dump.c: Terminate buffer in order to not display garbage when
     displaying dependency fields.
-	
+
 Sun Apr 25 00:12:27 CEST 2004  Tollef Fog Heen  <tfheen@debian.org>
 
   * main/query.c, dpkg-deb/main.c: Fix up the query format to be
     consistent with what the library expects.  Remove the pkg: prefix from
     the default showformat.
-	
+
 Sun Apr 25 00:06:27 CEST 2004  Tollef Fog Heen  <tfheen@debian.org>
 
   * scripts/dpkg-statoverride.pl: Make sure the permissions passed to
@@ -9919,7 +9919,7 @@ Fri Mar 12 19:02:21 GMT 2004 Scott James Remnant <scott@netsplit.com>
 
   This corrects the bug where every second shared or diverted conffile
   would be incorrectly deleted by dpkg.
- 
+
 Fri Mar 12 15:05:52 GMT 2004 Scott James Remnant <scott@netsplit.com>
 
   * utils/start-stop-daemon.c: Don't require an argument for -V (version).
@@ -9940,7 +9940,7 @@ Thu Mar 11 11:18:29 GMT 2004 Scott James Remnant <scott@netsplit.com>
   with PGP.  PGP itself will fail if we do this, it's needed to
   satisfy pgpgp, which quite frankly is a bug in pgpgp's emulation
   of pgp.
-  
+
 Thu Mar  8 01:10:00 CEST 2004  Tollef Fog Heen  <tfheen@debian.org>
 
   * po/pt_BR.po: Fix typo.
@@ -9954,7 +9954,7 @@ Thu Mar  8 01:00:00 CEST 2004  Tollef Fog Heen  <tfheen@debian.org>
   * man/fr/dpkg-source.1 man/fr/update-alternatives.8
   man/fr/start-stop-daemon.8 man/fr/dpkg.8 man/fr/dpkg-query.8
   man/fr/deb-control.5 man/fr/dpkg-scanpackages.8: Update French translation
-  per patches in #218713 
+  per patches in #218713
 
 Thu Mar  8 00:54:00 CEST 2004  Tollef Fog Heen  <tfheen@debian.org>
 
@@ -10006,7 +10006,7 @@ Mon Mar  8 16:49:13 GMT 2004 Christian Haggstrom <chm@c00.info>
   a SEGV.
 
 Mon Mar  8 10:14:27 GMT 2004 Colin Watson <cjwatson@debian.org>
- 
+
   * dselect/methlist.cc, dselect/pkgdisplay.cc: Set the total display width
   to the maximum of TOTAL_LIST_WIDTH and COLS, improving display on wide
   terminals.
@@ -10128,7 +10128,7 @@ Sat Oct 25 12:47:22 CDT 2003 Adam Heath <doogie@debian.org>
 Tue Sep 23 12:20:35 CDT 2003 Adam Heath <doogie@debian.org>
 
   * configure.in: Add man/es/Makefile.
-  
+
 Tue Sep 23 12:12:38 CDT 2003 Adam Heath <doogie@debian.org>
 
   * debian/changelog: Set release date for 1.10.16.
@@ -10183,7 +10183,7 @@ Sat Sep 20 17:44:40 CDT 2003 Adam Heath <doogie@debian.org>
 Fri Sep 19 20:02:19 CDT 2003 Adam Heath <doogie@debian.org>
 
   * debian/changelog: Set date/time for 1.10.15 release.
- 
+
 Fri Sep 19 19:56:48 CDT 2003 Adam Heath <doogie@debian.org>
 
   * lib/varbuf.c, configure.in: Fix va_copy detection.
@@ -10194,8 +10194,8 @@ Fri Sep 19 19:56:48 CDT 2003 Adam Heath <doogie@debian.org>
 Fri Sep 19 12:26:54 CDT 2003 Adam Heath <doogie@debian.org>
 
   * scripts/{controllib,dpkg-{source,checkbuilddeps,control}}.pl:
-    * Rewrote the parsedep stuff, so that it wasn't done during control 
-      file parsing.  Scripts that need the internal parsed format should 
+    * Rewrote the parsedep stuff, so that it wasn't done during control
+      file parsing.  Scripts that need the internal parsed format should
       call parsedep on the field's value.
     * Split the substvars parsing into a separate function.
     * No longer validate dependency fields when reading the control file.
@@ -10290,7 +10290,7 @@ Sun, 14 Sep 2003 21:16:18 -0500 Adam Heath <doogie@debian.org>
     * Store the original field's casing with 'o:' prepended in %fi.
   * scripts/dpkg-checkbuilddeps.pl:  Because of the above controllib.pl
     changes, this script is much simpler now.
-  * scripts/dpkg-gencontrol.pl:     
+  * scripts/dpkg-gencontrol.pl:
     * Use the original casing of field names when reporting unknown fields.
   * scripts/dpkg-gencontrol.pl, scripts/controllib.pl: After opening files,
     set binmode.
@@ -10662,7 +10662,7 @@ Thu Aug 22 23:01:53 CDT 2002 Adam Heath <doogie@debian.org>
     doesn't exist.
 
 Thu Aug 22 22:59:54 CDT 2002 Adam Heath <doogie@debian.org>
- 
+
   * version-nr, debian/changelog: Modified for 1.10.5.
 
 Sun Jul 14 15:10:22 CDT 2002 Adam Heath <doogie@debian.org>
@@ -10823,7 +10823,7 @@ Sun May 26 01:10:24 CDT 2002 Adam Heath <doogie@debian.org>
     * debian/rules, debian/dpkg.conffiles: dselect was split to a separate
       deb, no longer install dselect.cfg into dpkg.deb.  Also, dpkg.cfg is
       no longer a conffile.
-    
+
 Sat May 25 22:45:06 CDT 2002 Adam Heath <doogie@debian.org>
 
   * Merge changes from 1.9.20 and 1.9.21.
@@ -11188,7 +11188,7 @@ Sat Feb  2 23:00:25 CET 2002 Wichert Akkerman <wakkerma@debian.org>
 Sat Feb  2 22:59:06 CET 2002 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/install-info.pl: Continue to read all data from a pipe, until
-    EOF.  
+    EOF.
 
 Sat Feb  2 22:52:50 CET 2002 Wichert Akkerman <wakkerma@debian.org>
 
@@ -11231,7 +11231,7 @@ Fri Feb  1 16:41:23 CET 2002 Wichert Akkerman <wakkerma@debian.org>
 
   * utils/start-stop-daemon.c: Merge patch from Andres Voegele
     <voegelas@users.sourceforge.net> to add HP-UX support
-    
+
 Fri Feb  1 13:58:59 CET 2002 Wichert Akkerman <wakkerma@debian.org>
 
   * po/fr.po: updated.
@@ -11396,7 +11396,7 @@ Sun Oct  7 19:38:56 CDT 2001 Adam Heath <doogie@debian.org>
 
   * scripts/install-info.pl: oops.  We weren't adding '\n' when printing
     out the reformated info text.
- 
+
 Sun Oct  7 05:00:02 CDT 2001 Adam Heath <doogie@debian.org>
 
   * scripts/install-info.pl: Don't print out the info entry every time we
@@ -11577,10 +11577,10 @@ Wed Jul 18 01:04:15 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
   * doc/ru.po: Updated
 
 Tue Jul 17 16:53:12 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
-  
+
   * Merge changes from v1_9 branch
     + debian/changelog: add 1.9.15 and 1.9.16 releases
-    + scripts/dpkg-source.pl: 
+    + scripts/dpkg-source.pl:
       - Add handleformat sub to check if we can handle a dscformat
       - Revert dscformat to 1.0. Technically we changed a few things
         but older versions of dpkg-source did not handle minor updates
@@ -11589,7 +11589,7 @@ Tue Jul 17 16:53:12 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
         compatible.
       - restore test if tar exited with exited with a non-zero exitcode
       - remove a bunch of commented debug statements
-    + main/help.c: fix narglist construction building and usage in do_script() 
+    + main/help.c: fix narglist construction building and usage in do_script()
 
 Tue Jul 17 00:36:32 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
@@ -11602,7 +11602,7 @@ Mon Jul 16 18:14:16 CEST 2001 peter karlsson <peterk@debian.org>
 
 Mon Jul 16 17:19:21 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
-  * dselect/basecmds.cc, dselect/dselect.h: 
+  * dselect/basecmds.cc, dselect/dselect.h:
     + add checksearch and matchsearch functions to abstract searching algorithm
     + add displayerror member function
   * dselect/baselist.cc: use new checkserach and matchsearch functions to
@@ -11659,7 +11659,7 @@ Sun Jul 15 00:37:13 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
     + fix section of dpkg-doc
   * debian/dpkg.conffiles: remove dselect.cfg
   * debian/dselect.{conffiles,postinst,prerm}: added
-  * debian/rules: 
+  * debian/rules:
     + add German to list of manpage translations
     + split out dselect into its own package
     + strip enoent and start-stop-daemon as well
@@ -11670,7 +11670,7 @@ Sat Jul 14 23:35:57 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
 Sat Jul 14 01:38:27 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
-  * Merge dselect patch from Joey Hess 
+  * Merge dselect patch from Joey Hess
     + dselect/dselect.h: add manual_install prototype
     + dselect/pkgcmds.cc, dselect/pkgsublist.cc: modify kd_select() and
       repeatedly display() to set/unset manual_install so we can identify
@@ -11895,7 +11895,7 @@ Mon May 28 22:54:35 CDT 2001 Adam Heath <doogie@debian.org>
   * configure.in: AC_REQUIRE is not valid outside of AC_DEFUN.
   * automake/dpkg.m4: DPKG_CACHED_TRY_COMPILE was defined with both
     AC_DEFUN() AND define().
- 
+
 Mon May 28 19:07:15 CDT 2001 Adam Heath <doogie@debian.org>
 
   * debian/changelog: Update for 1.9.7.
@@ -11932,7 +11932,7 @@ Mon May 28 16:19:51 CDT 2001  Adam Heath <doogie@debian.org>
 
 Mon May  7 23:07:01 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
-  * main/depcon.c: restore previous statement to break reverse cycles 
+  * main/depcon.c: restore previous statement to break reverse cycles
 
 Mon May  7 23:04:55 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
@@ -11981,7 +11981,7 @@ Tue May  1 00:24:49 CDT 2001 Adam Heath <doogie@debian.org>
   * acconfig.h, config.h.bot, configure.in, lib/varbuf.c, debian/changelog:
     Check for __va_copy, and use it, instead of a direct assignment, for
     broken arches, like ppc.
-  
+
 Mon Apr 30 17:34:47 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * configure.in: remove last list reference.
@@ -12040,7 +12040,7 @@ Sat Apr 28 12:18:55 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/dpkg-buildpackage.sh: only check for valid sign interface
     when the user specifies one
-   
+
 Sat Apr 28 03:33:28 CDT 2001 Adam Heath <doogie@debian.org>
 
   * debian/dpkg.cfg: Changed to include no-debsig by default, as no debs
@@ -12217,8 +12217,8 @@ Mon Apr 23 17:17:35 CDT 2001 Adam Heath <doogie@debian.org>
 Mon Apr 23 23:54:34 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * main/main.h: add declaration for nerrs
-  * main/enquiry.c: exit with non-zero exitcode if -l or -S do not 
-    produce any output 
+  * main/enquiry.c: exit with non-zero exitcode if -l or -S do not
+    produce any output
 
 Mon Apr 23 16:09:38 CDT 2001 Adam Heath <doogie@debian.org>
 
@@ -12564,7 +12564,7 @@ Fri Mar  2 17:29:02 CET 2001 Wichert Akkerman <wakkerma@debian.org>
     non-exiting override (unless --force is given).
   * scripts/dpkg-statoverride.8: document new exitcode for --list
   * main/main.c, main/dpkg.8: remove --smallmem and --largemem references
-  * scripts/dpkg-buildpackage.sh: 
+  * scripts/dpkg-buildpackage.sh:
     + don't bother to specify architecture settings on commandlines since
       we put them in the environment already
     + remove debsign support, it's useless and debsign can't handle it
@@ -12572,7 +12572,7 @@ Fri Mar  2 17:29:02 CET 2001 Wichert Akkerman <wakkerma@debian.org>
     + remove Linux reference
   * scripts/dpkg-scanpackages.pl: mark last argument as optional in
     usage info
-  * scripts/dpkg-scanpackages.8, scripts/dpkg-name.1, 
+  * scripts/dpkg-scanpackages.8, scripts/dpkg-name.1,
     scripts/dpkg-shlibdeps.pl, scripts/dpkg-source.pl, scripts/822-date.1,
     scripts/cl-debian.pl, scripts/cleanup-info.pl, scripts/dpkg-genchanges.pl,
     scripts/dpkg-distaddfile.pl, scripts/dpkg-source.1,
@@ -12587,22 +12587,22 @@ Sun Feb 25 20:26:03 CET 2001 Wichert Akkerman <wakkerma@debian.org>
 Sun Feb 25 19:17:53 CET 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * debian/changelog: merged additions from v1.8 branch
-  * scripts/controllib.pl: 
+  * scripts/controllib.pl:
     + no need to have Origin in capit
     + consistently use &warn
     + fix -s to export all variables instead of just the first
   * scripts/dpkg-genchanges.pl: do not complain about missing packages
     if doing a source-only build
-  * scripts/dpkg-buildpackage.sh: 
+  * scripts/dpkg-buildpackage.sh:
     + correct filename for secret keyring in gpg test
     + fix -C
     + skip signing pause of building unsigned packages
     + improve srcmsg
     + test for invalid signinterface
-  
+
 Sun Feb 25 19:10:33 CET 2001 Wichert Akkerman <wakkerma@debian.org>
 
-  * doc/fr/dpkg.8, doc-fr/install-info.8, doc-fr/update-alternatives.8, 
+  * doc/fr/dpkg.8, doc-fr/install-info.8, doc-fr/update-alternatives.8,
     doc-fr/update-rc.d.8:  updated
   * doc/fr/dpkg-deb.1: added
 
@@ -12621,7 +12621,7 @@ Fri Feb 23 10:22:02 CET 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/dpkg-divert.pl: fix typo in usage message
   * main/help.c: mangle argv[0] in do_script to always be the full path
-  * include/dpkg-db.h: include string.h so things compile on ia64 
+  * include/dpkg-db.h: include string.h so things compile on ia64
   * scripts/dpkg-architecture.pl: add ia64
 
 Thu Feb 15 11:24:46 EST 2001 Ben Collins <bcollins@debian.org>
@@ -12665,7 +12665,7 @@ Sun Jan 28 22:38:02 EST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/dpkg-source.pl: modify how we handle the dscformat: we now
     assume all major versions are upwards and backwards compatibly. This
-    allows us to add new fields without breaking older versions of 
+    allows us to add new fields without breaking older versions of
     dpkg-source
 
 Sun Jan 21 20:09:36 SGT 2001 Wichert Akkerman <wakkerma@debian.org>
@@ -12807,7 +12807,7 @@ Sat Dec 30 23:08:00 CET 2000 Wichert Akkerman <wakkerma@debian.org>
   * THANKS: add philippe batailler who translated the manpages to French
 
 Sat Dec 30 20:38:20 CST 2000 Adam Heath <doogie@debian.org>
-  
+
   * utils/start-stop-daemon.c: --name is now allowed on the command
     line.
 
@@ -13133,7 +13133,7 @@ Sat Dec  9 01:51:51 CET 2000 Wichert Akkerman <wakkerma@debian.org>
   * dpkg-deb/Makefile.in, dpkg-deb/build.c, dpkg-deb/extract.c: use libz
     if so desired
   * debian/rules: default to using static libz
-  * include/{dpkg-db.h,dpkg.h.in}, lib/mlib.c, lib/varbuf.c: generalize 
+  * include/{dpkg-db.h,dpkg.h.in}, lib/mlib.c, lib/varbuf.c: generalize
     fd copy loops
   * main/filesdb.c: udpates to use read_fd_buf
 
@@ -13174,7 +13174,7 @@ Sun Dec  3 22:11:22 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
 Thu Nov 30 02:45:42 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
-  * scripts/dpkg-statoverride.{pl,8}: 
+  * scripts/dpkg-statoverride.{pl,8}:
     + add new --import option to import settings from /etc/suid.conf
     + fix ENOENT issues
     + use %owner consistently instead of %owner and %user
@@ -13300,7 +13300,7 @@ Thu Oct 19 00:59:40 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
   * utils/start-stop-daemon.c
     + fix a buffer overflow in cmdname handling
     + Only abort if we fail to open an existing pidfile
-  * utils/start-stop-daemon.8: update formating 
+  * utils/start-stop-daemon.8: update formating
 
 Wed Oct 18 17:48:15 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 
@@ -13313,14 +13313,14 @@ Mon Oct 16 10:45:47 EDT 2000 Ben Collins <bcollins@debian.org>
     provides/conflicts/replaces it's own virtual can be installed (can't
     be removed yet, but hey...)
 
-Sat Oct  7 22:18:43 CEST 2000 Wichert Akkerman <wakkerma@debian.org> 
+Sat Oct  7 22:18:43 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * po/gl.po, configure.in: add new Galician translation from  Alberto Garcia
   * po/pt_BR.po, configure.in: add new Brazilian translation from
     Carlos Laviola
   * THANKS: add Alberto and Carlos
 
-Wed Oct  4 16:37:08 CEST 2000 Wichert Akkerman <wakkerma@debian.org> 
+Wed Oct  4 16:37:08 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * main/processarc.c: read trailing zeroes from tar output
 
@@ -13400,7 +13400,7 @@ Fri Sep  8 12:28:34 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * configure.in: add de to ALL_LINGUAS
   * po/de.po: New German translation from Hartmut Koptein
-  * THANKS: Add Hartmut 
+  * THANKS: Add Hartmut
   * main/enquiry.c: fix silly type error
   * scripts/dpkg-divert.pl: change $dpkglibdir to $admindir
   * scripts/Makefile.in: set $admindir as well in scripts
@@ -13523,7 +13523,7 @@ Tue Jun 13 22:11:22 CEST 2000 peter karlsson <peter@softwolves.pp.se>
 
 Tue Jun 13 19:23:37 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 
-  * scripts/dpkg-statoverride.pl: 
+  * scripts/dpkg-statoverride.pl:
     + fix two typos in the help message
     + Add code to implement --update when adding an override
   * scripts/dpkg-statoverride.8: new file
@@ -13542,7 +13542,7 @@ Mon Jun 12 16:35:26 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
   * scripts/dpkg-divert.pl:
     + turn $admindir into $dpkglibdir, which the Makefile will handle
     + fix glob->regexp logic for --list
-  * scripts/Makefile.in: 
+  * scripts/Makefile.in:
     + replace one `sed' with `$(SED)'
     + add dpkg-statoverride
   * scripts/dpkg-statoverride.pl: new util to manage statoverrides
@@ -13572,9 +13572,9 @@ Fri Jun  9 15:52:28 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
       debian-changelog-finalise-last
     + scripts/dpkg-source.pl: fix typo
     + scripts/udate-alternatives.8: fixed errors found while Japanese
-      translation was made. 
+      translation was made.
   * methods/Makefile.am: removed
-  
+
 Sun May 28 17:24:09 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * dpkg-deb/build.c: remove extra closing brace
@@ -13582,7 +13582,7 @@ Sun May 28 17:24:09 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
   * main/filedb.[ch]: add code to manage the statoverride list
   * main/archives.c: modify tarobject() to check for statoverrides
   * TODO: remove integrating suidmanager note, it's partially done now
-    
+
 Sun Apr 30 14:19:41 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * doc/*: remove all references to GNU/Linux and just mention `Debian
@@ -13636,7 +13636,7 @@ Sat Mar 18 19:08:20 CET 2000 Wichert Akkerman <wakkerma@debian.org>
     + dselect/dselect.h: include both signal.h and curses.h and #undef
       the ERR from sys/ucontext.h which breaks curses
     + scripts/dpkg-divert.pl: fix syntax error
- 
+
 Sat Mar  4 16:52:38 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * Synchronize with potato-branch again:
@@ -13721,14 +13721,14 @@ Sat Feb 12 17:11:33 CET 2000 Wichert Akkerman <wakkerma@debian.org>
   * `Merge Marcus Brinkman patches day':
     + scripts/dpkg-architecture.pl: architecture -q should not imply -f
     + scripts/dpkg-shlibdeps.pl: build a list of packages instead of
-      overwriting previous results. 
+      overwriting previous results.
     + utils/start-stop-daemon.c: update HURD specifics
     + configure.in: revamp HURD detection stuff
     + debian/rules: use dpkg-buildarchitecture to get proper info,
       set config_arg if we are crosscompiling
     + debian/rules: typo in clean target, scan start-stop-daemon for
       shlibdeps
-      
+
 Tue Feb  8 21:33:58 EST 2000 Ben Collins <bcollins@debian.org>
 
   * main/{processarc,archive}.c: Make the conflictor an array of structs and
@@ -13776,7 +13776,7 @@ Tue Jan 11 03:34:22 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
 Tue Jan 11 18:32:52 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
-  * configure.in: Fix include in test for alphasort 
+  * configure.in: Fix include in test for alphasort
   * Makefile.in: add intl to subdirectory-list
   * dpkg-deb/Makefile.in: set top_builddir
   * dselect/Makefile.in: set top_builddir
@@ -13808,7 +13808,7 @@ Sun Jan  9 16:11:39 CET 2000 Wichert Akkerman <wakkerma@debian.org>
     + various text and manpage updates
     + dselect/method.cc: don't abort if locking fails but give a
       warning
-    + THANKS: fix various small errors 
+    + THANKS: fix various small errors
 
 Sun Jan  9 01:40:23 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
@@ -13880,10 +13880,10 @@ Fri Dec 24 15:35:29 CET 1999 Wichert Akkerman <wakkerma@debian.org>
     + dpkg-deb/build.c: use do_fd_copy
     + dpkg-deb/build.c: use dpkg-deb-filelist to reorder files when
       building a package
-    + dpkg-deb/info.c: use do_fd_copy 
+    + dpkg-deb/info.c: use do_fd_copy
     + lib/showcright.c: use do_fd_copy to read license
     + scripts/dpkg-safelist.{1,pl}: new script to reorder a filelist to
-      make sure symlinks are listed after their targets. 
+      make sure symlinks are listed after their targets.
     + dpkg-deb/main.c: add -z option to set compression level
     + dpkg-deb/build.c: pass new -z options to gzip
   * dpkg-deb/dpkg-deb.1: document new -z option
@@ -14566,7 +14566,7 @@ dpkg (1.4.1.7) unstable; urgency=low
     + Use COPYINGFILE instead of hardcoded GPL-location in showcopyright()
     + varbufprintf (used for some error messages) vsnprintf return value
       assumption changed to correspond to reality rather than glibc-doc.
-    + Don't read available-info when not needed (slightly improved from 
+    + Don't read available-info when not needed (slightly improved from
 	  dpkg-iwj: don't read for listfiles either :)
     + Cleanup --assert-* code
     + Assume largemem on systems without sysinfo(2).
@@ -14583,7 +14583,7 @@ dpkg (1.4.1.6) unstable; urgency=low
   * Non-maintainer release.
   * scripts/dpkg-architecture.pl: Update to latest version.
   * scripts/dpkg-architecture.1: Likewise.
-  
+
  -- Marcus Brinkmann <brinkmd@debian.org>  Sat, 24 Jul 1999 18:24:21 +0200
 
 dpkg (1.4.1.5) unstable; urgency=low
@@ -14696,7 +14696,7 @@ dpkg (1.4.0.30) unstable; urgency=low
 
   * dpkg-dev isn't allowed to have a Recommends: debian-keyring (as that's
     in contrib), so it's now lowered to a Suggests: . Thanks to James Troup
-    for pointing this out. 
+    for pointing this out.
 
  -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Sat, 26 Sep 1998 13:59:23 +0200
 
@@ -14746,7 +14746,7 @@ dpkg (1.4.0.26) unstable; urgency=low
 dpkg (1.4.0.25) unstable; urgency=low
 
   * Non-maintainer upload.
-  
+
   * Add the requested -nc option to dpkg-buildpackage (Do
     not clean source tree, useful in debugging cycles).
   * controllib.pl: Again by popular acclamation, fix the getlogin() warnings.
@@ -14798,7 +14798,7 @@ dpkg (1.4.0.24) unstable; urgency=low
 
   * aclocal.m4: applied patch from Joel Klecker <jk@espy.org> to handle
     egcs' --print-libgcc-file-name output. [#20353]
-  
+
   * debian/copyright: correct FSF address.
   * debian/rules: add code from lesstif's debian/rules to make libtool
     less of a fool (i.e. not use -rpath and to link shared libraries
@@ -14890,16 +14890,16 @@ dpkg (1.4.0.20) unstable; urgency=low
 dpkg (1.4.0.19) unstable; urgency=low
 
   * Changed methods/disk.setup to use output of
-    'dpkg --print-installation-architecture' instead of hard-coded 
+    'dpkg --print-installation-architecture' instead of hard-coded
     '1386' (fixes #10995).
-  * Patched dpkg-source to properly quote metacharacters in strings 
+  * Patched dpkg-source to properly quote metacharacters in strings
     before using them in pattern-matching expressions (fixes #10811).
   * Fixed several documentation typos (fixes #10764).
   * dpkg-source now works around 100-character filename limitation of cpio
     (fixes #10400).
   * dpkg-source now properly handles '\ no newline in source' message from
     patch (fixes #5041).
-  
+
  -- Klee Dienes <klee@debian.org>  Sun, 13 Jul 1997 19:28:22 -0700
 
 dpkg (1.4.0.18) unstable; urgency=low
@@ -14925,9 +14925,9 @@ dpkg (1.4.0.17) unstable; urgency=low
     building on non-Debian systems; minor Makefile fixes.
   * Added 'ppc powerpc powerpc' to archtable.
   * Changed documentation paper size to US/Letter instead of A4 (A4
-    may be better, but it's easier to print US/Letter on A4 than it is 
+    may be better, but it's easier to print US/Letter on A4 than it is
     to print A4 on US/Letter).
-  
+
  -- Klee Dienes <klee@debian.org>  Tue,  13 May 1997 15:24:31 -0400
 
 dpkg (1.4.0.16) experimental; urgency=low
@@ -14950,7 +14950,7 @@ dpkg (1.4.0.15) experimental; urgency=low
     automake_1.1o-1.
   * Fix debian/build to make html documentation without including
     directories in tar archives (fixes #9348).
-  
+
  -- Klee Dienes <klee@debian.org>  Fri,  9 May 1997 13:17:18 -0400
 
 dpkg (1.4.0.14) experimental; urgency=low
@@ -14959,7 +14959,7 @@ dpkg (1.4.0.14) experimental; urgency=low
   * Re-write of update-rc.d.pl, primarily by Miquel van Smoorenburg
     <miquels@cistron.nl> (fixes #9434, #9436).
   * Renamed "dpkg Programmer's Manual" to "dpkg Internals Manual".
-  
+
  -- Klee Dienes <klee@debian.org>  Tue,  6 May 1997 22:01:07 -0400
 
 dpkg (1.4.0.13) experimental; urgency=low
@@ -15041,11 +15041,11 @@ dpkg (1.4.0.9) unstable; urgency=low
   * dpkg-source -b now warns (was previously silent) if maintainer changes
     create new subdirectories.  dpkg-source -x now warns (previously gave
     error) if maintainer changes create new subdirectories (partially
-    fixes #6866, #6671, #5045, #6482).    
-  * Added manual page for start-stop-daemon (8). 
-  * Added C version of start-stop-daemon by 
+    fixes #6866, #6671, #5045, #6482).
+  * Added manual page for start-stop-daemon (8).
+  * Added C version of start-stop-daemon by
     Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl> (fixes #1670).
-  * Converted to use GNU automake for the build process by Tom Lees 
+  * Converted to use GNU automake for the build process by Tom Lees
     <tom@lpsg.demon.co.uk>.<
   * Preliminary support for dpkg functions as a shared library (now
     provides libdpkg.so, but much work needs to be done in better
@@ -15058,17 +15058,17 @@ dpkg (1.4.0.9) unstable; urgency=low
     ldd (fixes #7603, #7926, #8688, #9179, #9134, #8516).
   * Removed policy.sgml (it has been moved to the debian-policy package).
   * Include patch from Darren Stalder <torin@daft.com> for
-    dpkg-buildpackage to choose PGP key based on Maintainer: field of 
-    package being built (or -m<maintainer> option, if present) (fixes 
+    dpkg-buildpackage to choose PGP key based on Maintainer: field of
+    package being built (or -m<maintainer> option, if present) (fixes
     #7898).
   * Changed controllib.pl to use $ENV{LOGNAME}, getlogin(), and $<
-    (in that order) to determine the intended ownership of 
+    (in that order) to determine the intended ownership of
     debian/{files,substvars},  (fixes #7324, #6823, #5659, #5965, #5929,
     #9239, #5366).
   * Don't sign .dsc file in dpkg-buildpackage if building a binary-only
     release (fixes #7260).
   * Updated developer-keys.pgp to latest revision (fixes #6134).
-  
+
  -- Klee Dienes <klee@debian.org>  Mon, 17 Mar 1997 16:11:24 -0500
 
 dpkg (1.4.0.8) unstable; urgency=medium
@@ -15091,13 +15091,13 @@ dpkg (1.4.0.6) stable unstable; urgency=high
   * Patched lib/vercmp.c to hopefully fix dselect epoch processing
     (Bug#6204), (Bug#4590).
   * Patched scripts/dpkg-buildpackage, scripts/dpkg-genchanges,
-    scripts/dpkg-gencontrol for epoch processing, courtesy of Loic Prylli 
+    scripts/dpkg-gencontrol for epoch processing, courtesy of Loic Prylli
     <lprylli@graville.fdn.fr> (Bug#6138, Bug#5225).
   * Patched dpkg-genchanges to actually honor the -u switch to specify
     directory (Bug#5564).
   * Applied patch to main/archive.c to correct problems setting set[gu]id
     binaries, courtesy of Herbert Xu <herbert@greathan.apana.org.au>
-    (Bug#5479). 
+    (Bug#5479).
   * Applied patch to dpkg-source to correct debian-only package names,
     courtesy of Guy Maor <maor@ece.utexas.edu> (Bug#5355).
 
@@ -15133,9 +15133,9 @@ dpkg (1.4.0.2) unstable; urgency=medium
     more the way Ian likes ;-)
   * dpkg-source.pl: new function deoctify() as replacement for eval()
     (turn \ddd into the corresponding character) [rem: probably better
-    solution would be to convert cpios output names into complete \ddd 
-    representation as well tars output names] 
-  * dpkg-source.pl: fixed 2 typos in failure message on creating 
+    solution would be to convert cpios output names into complete \ddd
+    representation as well tars output names]
+  * dpkg-source.pl: fixed 2 typos in failure message on creating
     $origtargz.tmp-nest.
   * main/main.c: typo `tread' -> `treat'
   * main/enquiry.c: fixed the ignorance for some relations in --compare-versions
@@ -15150,7 +15150,7 @@ dpkg (1.4.0.1) unstable; urgency=medium
   * dpkg-source: doesn't get screwed up from hardlinks
     in the archive now
   * dpkg-source: doesn't get screwed up from `unprintable' characters
-    in file names (e.g. from the kbd package) 
+    in file names (e.g. from the kbd package)
   * controllib.pl: $varlistvile -> $varlistfile (thanx Karl Sackett)
   * dpkg-buildpackge: quoting for $rootcommand (thanx  Michael Meskes)
     and `eval' as default $rootcommand
@@ -15290,7 +15290,7 @@ dpkg (1.3.7) unstable; urgency=low (medium for source pkg docs)
   * Manpages should be compressed.
   * Copyright file is moved to /usr/doc/<package>/copyright.
   * Changelogs must be installed in /usr/doc/<package>.
-  
+
   * dpkg-deb(8) moved to dpkg-deb(1).
 
   * binary target split into binary-arch and binary-indep in source.
@@ -16090,7 +16090,7 @@ dpkg (0.93.72) BETA; priority=MEDIUM
   * New names for certain control file fields (old names work
     as aliases): Optional -> Suggests, Recommended -> Recommends,
     Class -> Priority.
-     
+
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sun, 3 Sep 1995 16:37:41 +0100
 
 dpkg (0.93.71) BETA; priority=LOW

+ 2 - 2
Makefile.am

@@ -102,7 +102,7 @@ LCOV_CAPTURE_OPTS = $(LCOV_OPTS) --no-recursion \
 coverage: all
 	$(RM) -f *.lcov
 	find -name '*.gcda' -o -name '*.gcov' | xargs $(RM) -f
-	
+
 	$(LCOV) $(LCOV_CAPTURE_OPTS) -c -o dpkg_base.lcov -i
 	$(MAKE) -C lib/dpkg check
 	$(MAKE) -C src check
@@ -115,7 +115,7 @@ coverage: all
 	  --html-prolog $(top_srcdir)/doc/lcov-prolog \
 	  --html-epilog $(top_srcdir)/doc/lcov-epilog \
 	  -o doc/coverage dpkg.lcov
-	
+
 	$(MAKE) -C scripts $@
 
 coverage-clean:

+ 1 - 1
THANKS

@@ -113,7 +113,7 @@ Marc Dequènes <duck@duckcorp.org>
 Marc Haber <mh+debian-packages@zugschlus.de>
 Marcel Toele <mtoele@kern.nl>
 Marco d'Itri <md@linux.it>
-Marcus Brinkmann <brinkmd@debian.org> 
+Marcus Brinkmann <brinkmd@debian.org>
 Mark Rosenstand <mark@borkware.net>
 Martin Koeppe <mkoeppe@gmx.de>
 Masato Taruishi <taru@debian.or.jp>

+ 1 - 1
TODO

@@ -148,7 +148,7 @@ other stuff unlikely to get done soon
    (when running dpkg -i)? Keeps it from being listed as obsolete, and maybe
    from being considered for auto-upgrades (apt-get needs to know about this
    too)
- * Filename field generated by --record-avail 
+ * Filename field generated by --record-avail
  * understand Replaces in dselect
  * diversions list as control archive entry
  * single maintainer script, and new package getting there first

+ 51 - 51
debian/changelog

@@ -672,7 +672,7 @@ dpkg (1.16.2) unstable; urgency=low
   * Swedish (Peter Krefting).
 
   [ Updated man page translations ]
-  * German (Helge Kreutzmann), including typo fix in dpkg-genchanges 
+  * German (Helge Kreutzmann), including typo fix in dpkg-genchanges
     Closes: #646496, sub optimal translation of package states LP: #368783
     and an fix by Chris Leick
   * Japanese (TAKAHASHI Motonobu).
@@ -4929,7 +4929,7 @@ dpkg (1.13.11.1) unstable; urgency=low
  -- Scott James Remnant <scott@netsplit.com>  Thu, 12 Jan 2006 07:56:49 +0000
 
 dpkg (1.13.11) unstable; urgency=low
-  
+
   The "Good, clean fun" Release.
 
   * Fixed the always broken error handling so that only the intended
@@ -4996,7 +4996,7 @@ dpkg (1.13.11) unstable; urgency=low
  -- Scott James Remnant <scott@netsplit.com>  Wed, 17 Aug 2005 04:44:44 +0100
 
 dpkg (1.13.10) unstable; urgency=low
-  
+
   The "Bully's Special Prize" Release.
 
   * Removed /usr/sbin/start-stop-daemon.  Closes: #313400.
@@ -5032,7 +5032,7 @@ dpkg (1.13.10) unstable; urgency=low
  -- Scott James Remnant <scott@netsplit.com>  Tue, 28 Jun 2005 14:19:06 +0100
 
 dpkg (1.13.9) unstable; urgency=low
-  
+
   The "On like Donkey Kong" Release.
 
   * Only open the log file when we first need to write to it, this avoids
@@ -5059,7 +5059,7 @@ dpkg (1.13.9) unstable; urgency=low
  -- Scott James Remnant <scott@netsplit.com>  Sun, 12 Jun 2005 15:52:43 +0100
 
 dpkg (1.13.8) experimental; urgency=low
-  
+
   The "In like Flynn" Release.
 
   * Linux 2.6.12 changed the behaviour of mmap to fail and set EINVAL when
@@ -5069,7 +5069,7 @@ dpkg (1.13.8) experimental; urgency=low
  -- Scott James Remnant <scott@netsplit.com>  Fri, 10 Jun 2005 07:39:44 +0100
 
 dpkg (1.13.7) experimental; urgency=low
-  
+
   The "Maidenhead Creeping Water Plant" Release.
 
   * Reduced inability to open a log file to a warning, suppressed for
@@ -5078,7 +5078,7 @@ dpkg (1.13.7) experimental; urgency=low
  -- Scott James Remnant <scott@netsplit.com>  Thu,  9 Jun 2005 06:12:56 +0100
 
 dpkg (1.13.6) experimental; urgency=low
-  
+
   The "Just kidding about the God part" Release.
 
   * Fixed incorrect installation location of /etc/logrotate.d/dpkg caused
@@ -5087,7 +5087,7 @@ dpkg (1.13.6) experimental; urgency=low
  -- Scott James Remnant <scott@netsplit.com>  Mon,  6 Jun 2005 05:58:36 +0100
 
 dpkg (1.13.5) experimental; urgency=low
-  
+
   The "Flatulent Elm of West Ruislip" Release.
 
   * Actions and package states are now logged by default in the
@@ -5113,7 +5113,7 @@ dpkg (1.13.5) experimental; urgency=low
  -- Scott James Remnant <scott@netsplit.com>  Mon,  6 Jun 2005 05:34:21 +0100
 
 dpkg (1.13.4) experimental; urgency=low
-  
+
   The "Or the Wabbit gets it" Release.
 
   * Add -L option to dpkg-architecture to list architecture strings
@@ -5122,7 +5122,7 @@ dpkg (1.13.4) experimental; urgency=low
  -- Scott James Remnant <scott@netsplit.com>  Tue, 29 Mar 2005 13:31:15 +0100
 
 dpkg (1.13.3) experimental; urgency=low
-  
+
   The "Paying off Karma at a vastly accelerated rate" Release.
 
   * Missing newline added to warning output function.  Closes: #283798.
@@ -5153,7 +5153,7 @@ dpkg (1.13.3) experimental; urgency=low
  -- Scott James Remnant <scott@netsplit.com>  Mon, 21 Mar 2005 03:10:27 +0000
 
 dpkg (1.13.2) experimental; urgency=low
-  
+
   The "Mysteriously Unnamed" Release.
 
   * md5sum has been removed, the coreutils or textutils version will be
@@ -5174,7 +5174,7 @@ dpkg (1.13.2) experimental; urgency=low
     Closes: #287152.
   * Output arguments to maintainer scripts with -D2.  Closes: #237684,
     #296030.
-  
+
   * Architecture Support:
     - Added ppc64.  Closes: #263743.
     - Split archtable into cputable and ostable, archtable is retained
@@ -5193,9 +5193,9 @@ dpkg (1.13.2) experimental; urgency=low
  -- Scott James Remnant <scott@netsplit.com>  Fri, 18 Mar 2005 16:21:32 +0000
 
 dpkg (1.13.1) experimental; urgency=low
-  
+
   The "Livin' like a good boy oughta" Release.
-  
+
   * Removed dpkg --print-gnu-build-architecture option.  Use variables
     defined by dpkg-architecture instead.
   * Soft-deprecated dpkg --print-installation-architecture.  Use
@@ -5230,7 +5230,7 @@ dpkg (1.13.1) experimental; urgency=low
  -- Scott James Remnant <scott@netsplit.com>  Thu,  3 Mar 2005 12:09:07 +0000
 
 dpkg (1.13.0) experimental; urgency=low
-  
+
   The "Three banana strategy" Release.
 
   * Remove the /usr/info or /usr/info/dir symlinks we used to create.
@@ -5247,11 +5247,11 @@ dpkg (1.13.0) experimental; urgency=low
   * The dpkg-doc and dpkg-static packages are no more.
   * dpkg.cfg cleaned up to remove non-useful examples.
     Closes: #169618, #305192.
-  
+
  -- Scott James Remnant <scott@netsplit.com>  Fri, 14 Jan 2005 19:28:00 +0000
 
 dpkg (1.10.28) unstable; urgency=low
-  
+
   The "Awh, yeah?  Ripper!" Release.
 
   * New Translations (Christian Perrier):
@@ -6053,7 +6053,7 @@ dpkg (1.10) unstable; urgency=low
       Closes: #76100.
     * Error messages now include the filename being processed.
       Closes: #66735
-    * /usr/share/info/dir now has it's entries formatted to even widths. 
+    * /usr/share/info/dir now has it's entries formatted to even widths.
       Closes: #11228
     * --calign|--align|--maxwidth are now ignored.
   * strip enoent as well. Closes: Bug#112378
@@ -6193,8 +6193,8 @@ dpkg (1.9.15) unstable; urgency=low
 dpkg (1.9.14) unstable; urgency=low
 
   * Make the Uploaders field in a .dsc file optional.
-  * Disabled sanity checking of source packages.  
- 
+  * Disabled sanity checking of source packages.
+
  -- Adam Heath <doogie@debian.org>  Mon, 25 Jun 2001 02:22:40 -0500
 
 dpkg (1.9.13) unstable; urgency=medium
@@ -6330,7 +6330,7 @@ dpkg (1.9.3) unstable; urgency=low
   * Fix compiles on ppc. Closes: Bug#95918.
 
  -- Adam Heath <doogie@debian.org>  Tue,  1 May 2001 00:29:45 -0500
-   
+
 dpkg (1.9.2) unstable; urgency=low
 
   * Recompile, to fix incorrect path 1.9.1/dpkg-divert. Closes: Bug#95845
@@ -6488,7 +6488,7 @@ dpkg (1.8.2) unstable; urgency=low
   * Don't attempt to read from an input source when we only want 0 bytes.
     Also handle buggy systems that return EAGAIN instead of EINTR.  Closes:
     #81881.
- 
+
  -- Adam Heath <doogie@debian.org>  Thu, 11 Jan 2001 00:43:50 -0600
 
 dpkg (1.8.1.1) unstable; urgency=low
@@ -6672,7 +6672,7 @@ dpkg (1.6.12) frozen unstable; urgency=high
 dpkg (1.6.11) frozen unstable; urgency=high
 
   * Oops, missed one case where the libc/ncurses conflict reared its
-    ugly head and broke dselect miserably. 
+    ugly head and broke dselect miserably.
   * fix syntax error in dpkg-divert. Closes: Bug#60050
 
  -- Wichert Akkerman <wakkerma@debian.org>  Fri, 10 Mar 2000 11:52:07 +1100
@@ -7046,7 +7046,7 @@ dpkg (1.4.1.7) unstable; urgency=low
     + Use COPYINGFILE instead of hardcoded GPL-location in showcopyright()
     + varbufprintf (used for some error messages) vsnprintf return value
       assumption changed to correspond to reality rather than glibc-doc.
-    + Don't read available-info when not needed (slightly improved from 
+    + Don't read available-info when not needed (slightly improved from
       dpkg-iwj: don't read for listfiles either :)
     + Cleanup --assert-* code
     + Assume largemem on systems without sysinfo(2).
@@ -7063,7 +7063,7 @@ dpkg (1.4.1.6) unstable; urgency=low
   * Non-maintainer release.
   * scripts/dpkg-architecture.pl: Update to latest version.
   * scripts/dpkg-architecture.1: Likewise.
-  
+
  -- Marcus Brinkmann <brinkmd@debian.org>  Sat, 24 Jul 1999 18:24:21 +0200
 
 dpkg (1.4.1.5) unstable; urgency=low
@@ -7176,7 +7176,7 @@ dpkg (1.4.0.30) unstable; urgency=low
 
   * dpkg-dev isn't allowed to have a Recommends: debian-keyring (as that's
     in contrib), so it's now lowered to a Suggests: . Thanks to James Troup
-    for pointing this out. 
+    for pointing this out.
 
  -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Sat, 26 Sep 1998 13:59:23 +0200
 
@@ -7227,7 +7227,7 @@ dpkg (1.4.0.26) unstable; urgency=low
 dpkg (1.4.0.25) unstable; urgency=low
 
   * Non-maintainer upload.
-  
+
   * Add the requested -nc option to dpkg-buildpackage (Do
     not clean source tree, useful in debugging cycles).
   * controllib.pl: Again by popular acclamation, fix the getlogin() warnings.
@@ -7279,7 +7279,7 @@ dpkg (1.4.0.24) unstable; urgency=low
 
   * aclocal.m4: applied patch from Joel Klecker <jk@espy.org> to handle
     egcs' --print-libgcc-file-name output. [#20353]
-  
+
   * debian/copyright: correct FSF address.
   * debian/rules: add code from lesstif's debian/rules to make libtool
     less of a fool (i.e. not use -rpath and to link shared libraries
@@ -7371,16 +7371,16 @@ dpkg (1.4.0.20) unstable; urgency=low
 dpkg (1.4.0.19) unstable; urgency=low
 
   * Changed methods/disk.setup to use output of
-    'dpkg --print-installation-architecture' instead of hard-coded 
+    'dpkg --print-installation-architecture' instead of hard-coded
     '1386' (fixes #10995).
-  * Patched dpkg-source to properly quote metacharacters in strings 
+  * Patched dpkg-source to properly quote metacharacters in strings
     before using them in pattern-matching expressions (fixes #10811).
   * Fixed several documentation typos (fixes #10764).
   * dpkg-source now works around 100-character filename limitation of cpio
     (fixes #10400).
   * dpkg-source now properly handles '\ no newline in source' message from
     patch (fixes #5041).
-  
+
  -- Klee Dienes <klee@debian.org>  Sun, 13 Jul 1997 19:28:22 -0700
 
 dpkg (1.4.0.18) unstable; urgency=low
@@ -7406,9 +7406,9 @@ dpkg (1.4.0.17) unstable; urgency=low
     building on non-Debian systems; minor Makefile fixes.
   * Added 'ppc powerpc powerpc' to archtable.
   * Changed documentation paper size to US/Letter instead of A4 (A4
-    may be better, but it's easier to print US/Letter on A4 than it is 
+    may be better, but it's easier to print US/Letter on A4 than it is
     to print A4 on US/Letter).
-  
+
  -- Klee Dienes <klee@debian.org>  Tue,  13 May 1997 15:24:31 -0400
 
 dpkg (1.4.0.16) experimental; urgency=low
@@ -7431,7 +7431,7 @@ dpkg (1.4.0.15) experimental; urgency=low
     automake_1.1o-1.
   * Fix debian/build to make html documentation without including
     directories in tar archives (fixes #9348).
-  
+
  -- Klee Dienes <klee@debian.org>  Fri,  9 May 1997 13:17:18 -0400
 
 dpkg (1.4.0.14) experimental; urgency=low
@@ -7440,7 +7440,7 @@ dpkg (1.4.0.14) experimental; urgency=low
   * Re-write of update-rc.d.pl, primarily by Miquel van Smoorenburg
     <miquels@cistron.nl> (fixes #9434, #9436).
   * Renamed "dpkg Programmer's Manual" to "dpkg Internals Manual".
-  
+
  -- Klee Dienes <klee@debian.org>  Tue,  6 May 1997 22:01:07 -0400
 
 dpkg (1.4.0.13) experimental; urgency=low
@@ -7522,11 +7522,11 @@ dpkg (1.4.0.9) unstable; urgency=low
   * dpkg-source -b now warns (was previously silent) if maintainer changes
     create new subdirectories.  dpkg-source -x now warns (previously gave
     error) if maintainer changes create new subdirectories (partially
-    fixes #6866, #6671, #5045, #6482).    
-  * Added manual page for start-stop-daemon (8). 
-  * Added C version of start-stop-daemon by 
+    fixes #6866, #6671, #5045, #6482).
+  * Added manual page for start-stop-daemon (8).
+  * Added C version of start-stop-daemon by
     Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl> (fixes #1670).
-  * Converted to use GNU automake for the build process by Tom Lees 
+  * Converted to use GNU automake for the build process by Tom Lees
     <tom@lpsg.demon.co.uk>.<
   * Preliminary support for dpkg functions as a shared library (now
     provides libdpkg.so, but much work needs to be done in better
@@ -7539,17 +7539,17 @@ dpkg (1.4.0.9) unstable; urgency=low
     ldd (fixes #7603, #7926, #8688, #9179, #9134, #8516).
   * Removed policy.sgml (it has been moved to the debian-policy package).
   * Include patch from Darren Stalder <torin@daft.com> for
-    dpkg-buildpackage to choose PGP key based on Maintainer: field of 
-    package being built (or -m<maintainer> option, if present) (fixes 
+    dpkg-buildpackage to choose PGP key based on Maintainer: field of
+    package being built (or -m<maintainer> option, if present) (fixes
     #7898).
   * Changed controllib.pl to use $ENV{LOGNAME}, getlogin(), and $<
-    (in that order) to determine the intended ownership of 
+    (in that order) to determine the intended ownership of
     debian/{files,substvars},  (fixes #7324, #6823, #5659, #5965, #5929,
     #9239, #5366).
   * Don't sign .dsc file in dpkg-buildpackage if building a binary-only
     release (fixes #7260).
   * Updated developer-keys.pgp to latest revision (fixes #6134).
-  
+
  -- Klee Dienes <klee@debian.org>  Mon, 17 Mar 1997 16:11:24 -0500
 
 dpkg (1.4.0.8) unstable; urgency=medium
@@ -7572,13 +7572,13 @@ dpkg (1.4.0.6) stable unstable; urgency=high
   * Patched lib/vercmp.c to hopefully fix dselect epoch processing
     (Bug#6204), (Bug#4590).
   * Patched scripts/dpkg-buildpackage, scripts/dpkg-genchanges,
-    scripts/dpkg-gencontrol for epoch processing, courtesy of Loic Prylli 
+    scripts/dpkg-gencontrol for epoch processing, courtesy of Loic Prylli
     <lprylli@graville.fdn.fr> (Bug#6138, Bug#5225).
   * Patched dpkg-genchanges to actually honor the -u switch to specify
     directory (Bug#5564).
   * Applied patch to main/archive.c to correct problems setting set[gu]id
     binaries, courtesy of Herbert Xu <herbert@greathan.apana.org.au>
-    (Bug#5479). 
+    (Bug#5479).
   * Applied patch to dpkg-source to correct debian-only package names,
     courtesy of Guy Maor <maor@ece.utexas.edu> (Bug#5355).
 
@@ -7614,9 +7614,9 @@ dpkg (1.4.0.2) unstable; urgency=medium
     more the way Ian likes ;-)
   * dpkg-source.pl: new function deoctify() as replacement for eval()
     (turn \ddd into the corresponding character) [rem: probably better
-    solution would be to convert cpios output names into complete \ddd 
-    representation as well tars output names] 
-  * dpkg-source.pl: fixed 2 typos in failure message on creating 
+    solution would be to convert cpios output names into complete \ddd
+    representation as well tars output names]
+  * dpkg-source.pl: fixed 2 typos in failure message on creating
     $origtargz.tmp-nest.
   * main/main.c: typo `tread' -> `treat'
   * main/enquiry.c: fixed the ignorance for some relations in --compare-versions
@@ -7631,7 +7631,7 @@ dpkg (1.4.0.1) unstable; urgency=medium
   * dpkg-source: doesn't get screwed up from hardlinks
     in the archive now
   * dpkg-source: doesn't get screwed up from `unprintable' characters
-    in file names (e.g. from the kbd package) 
+    in file names (e.g. from the kbd package)
   * controllib.pl: $varlistvile -> $varlistfile (thanx Karl Sackett)
   * dpkg-buildpackge: quoting for $rootcommand (thanx  Michael Meskes)
     and `eval' as default $rootcommand
@@ -7771,7 +7771,7 @@ dpkg (1.3.7) unstable; urgency=low (medium for source pkg docs)
   * Manpages should be compressed.
   * Copyright file is moved to /usr/doc/<package>/copyright.
   * Changelogs must be installed in /usr/doc/<package>.
-  
+
   * dpkg-deb(8) moved to dpkg-deb(1).
 
   * binary target split into binary-arch and binary-indep in source.
@@ -8571,7 +8571,7 @@ dpkg (0.93.72) BETA; priority=MEDIUM
   * New names for certain control file fields (old names work
     as aliases): Optional -> Suggests, Recommended -> Recommends,
     Class -> Priority.
-     
+
  -- Ian Jackson <iwj10@cus.cam.ac.uk>  Sun, 3 Sep 1995 16:37:41 +0100
 
 dpkg (0.93.71) BETA; priority=LOW

+ 3 - 3
dselect/methods/disk/setup

@@ -356,7 +356,7 @@ do
 	then
 		echo \
 "I would like to know where on the CD-ROM the top level of the Debian
-distribution is (eg. 'dists/stable') - this directory usually contains the 
+distribution is (eg. 'dists/stable') - this directory usually contains the
 Packages-Master file.
 
 If the CD-ROM is badly organised and doesn't have a straightforward copy of
@@ -367,14 +367,14 @@ I need individually."
 "In order to make it easy for me to find the relevant files I'd ideally
 like to install from a straightforward copy of the Debian distribution.
 To use this I'll need to know where the top level of that copy of the
-distribution is (eg. 'debian/dists/stable') - this directory usually 
+distribution is (eg. 'debian/dists/stable') - this directory usually
 contains the Packages-Master file.
 
 If you do not have a straightforward copy of the distribution available
 just answer 'none' and we'll go through the parts I need individually."
 	fi
 	defhierbase=none
-# maybe ask for debian/dists and then show and ask for available dists 
+# maybe ask for debian/dists and then show and ask for available dists
 # eg. {stable,frozen,unstable,bo,hamm,slink}
 	if [ -n "$p_hierbase" ]
 	then

+ 1 - 1
dselect/methods/disk/update

@@ -93,7 +93,7 @@ do
 			;;
 		esac
 		;;
-	esac	
+	esac
 done
 
 echo -n 'Update OK.  Hit RETURN.  '

+ 1 - 1
dselect/methods/floppy/install

@@ -57,7 +57,7 @@ All packages unpacked, going on to configure them.
 Packages yet to be unpacked:'
 	echo "$yet"
 	dpkg-split -l
-		
+
 	echo -n '
 Insert a disk containing *.deb files, or type q to quit.  '
 	read response

+ 1 - 1
dselect/po/es.po

@@ -15,7 +15,7 @@
 #        Santiago Vila <sanvila@debian.org>, 2000, 2001, 2004.
 #
 #
-#   Traductores, si no conoce el formato PO, merece la pena leer la 
+#   Traductores, si no conoce el formato PO, merece la pena leer la
 #   documentación de gettext, especialmente las secciones dedicadas a este
 #   formato, por ejemplo ejecutando:
 #          info -n '(gettext)PO Files'

+ 5 - 5
dselect/po/nb.po

@@ -1,8 +1,8 @@
-# Norwegian Bokmål translation of dselect.
-# Gaute Hvoslef Kvalnes <gaute@verdsveven.com>, 2003, 2004.
-# Håvard Korsvoll <korsvoll@skulelinux.no>, 2003, 2004.
-# Bjorn Steensrud <bjornst@powertech.no>, 2004.
-# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2005, 2009, 2010.
+# Norwegian Bokmål translation of dselect.
+# Gaute Hvoslef Kvalnes <gaute@verdsveven.com>, 2003, 2004.
+# Håvard Korsvoll <korsvoll@skulelinux.no>, 2003, 2004.
+# Bjorn Steensrud <bjornst@powertech.no>, 2004.
+# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2005, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"

+ 2 - 2
man/deb-shlibs.5

@@ -2,7 +2,7 @@
 .\"
 .\" Copyright © 1996 Michael Shields <shields@crosslink.net>
 .\" Copyright © 2008 Zack Weinberg <zackw@panix.com>
-.\" 
+.\"
 .\" This is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
 .\" the Free Software Foundation; either version 2 of the License, or
@@ -47,7 +47,7 @@ See also the Debian Policy Manual for further details.
 .PP
 The
 .B shlibs
-file for a typical library package, named 
+file for a typical library package, named
 .IR libcrunch1 ,
 that provides one library whose soname is
 .IR libcrunch.so.1 ,

+ 3 - 3
man/deb-symbols.5

@@ -41,7 +41,7 @@ The \fIlibrary-soname\fR is exactly the value of the SONAME field
 as exported by \fBobjdump\fR(1). A \fIdependency-template\fR is a
 dependency where \fI#MINVER#\fR is dynamically replaced either by
 a version check like "(>= \fIminimal-version\fR)" or by nothing (if
-an unversioned dependency is deemed sufficient). 
+an unversioned dependency is deemed sufficient).
 .P
 Each exported \fIsymbol\fR (listed as \fIname\fR@\fIversion\fR, with
 \fIversion\fR being "Base" if the library is not versioned) is associated
@@ -58,13 +58,13 @@ of the "\-dev" package associated to the library and is used by
 strict as the corresponding build dependency.
 .SH EXAMPLES
 .SS Simple symbols file
-.PP 
+.PP
 libftp.so.3 libftp3 #MINVER#
  DefaultNetbuf@Base 3.1-1-6
  FtpAccess@Base 3.1-1-6
  [...]
 .SS Advanced symbols file
-.PP 
+.PP
 libGL.so.1 libgl1
 .br
 | libgl1\-mesa\-glx #MINVER#

+ 2 - 2
man/dpkg-gensymbols.1

@@ -412,7 +412,7 @@ that is integrated in the package itself.
 .B \-O
 Print the generated symbols file to standard output, rather than being
 stored in the package build tree.
-.TP 
+.TP
 .BI \-O filename
 Store the generated symbols file as \fIfilename\fR. If \fIfilename\fR is
 pre-existing, its content is used as basis for the generated symbols file.
@@ -451,7 +451,7 @@ option to generate a symbol file or diff for any architecture provided its
 binaries are already available.
 .TP
 .BI \-d
-Enable debug mode. Numerous messages are displayed to explain what 
+Enable debug mode. Numerous messages are displayed to explain what
 .B dpkg\-gensymbols
 does.
 .TP

+ 1 - 1
man/dpkg-scanpackages.1

@@ -4,7 +4,7 @@
 .\" Copyright © 2006 Frank Lichtenheld <djpig@debian.org>
 .\" Copyright © 2007 Guillem Jover <guillem@debian.org>
 .\" Copyright © 2009 Raphaël Hertzog <hertzog@debian.org>
-.\" 
+.\"
 .\" This is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
 .\" the Free Software Foundation; either version 2 of the License, or

+ 5 - 5
man/dpkg-shlibdeps.1

@@ -50,7 +50,7 @@ files or
 files. For each binary that
 .B dpkg\-shlibdeps
 analyzes, it finds out the list of libraries that it's linked with.
-Then, for each library, it looks up either the 
+Then, for each library, it looks up either the
 .I symbols
 file, or the
 .I shlibs
@@ -71,7 +71,7 @@ in the following places (first match is used):
 .IP debian/*/DEBIAN/symbols
 Shared library information generated by the current build process that also invoked
 .BR dpkg\-shlibdeps .
-They are generated by 
+They are generated by
 .BR dpkg\-gensymbols (1).
 They are only used if the library is found in a package's build tree. The
 symbols file in that build tree takes precedence over symbols files from
@@ -85,7 +85,7 @@ Per-system overriding shared library dependency information.
 Package-provided shared library dependency information.
 Unless overridden by \fB\-\-admindir\fP, those files are located in
 /var/lib/dpkg.
-.P 
+.P
 While scanning the symbols used by all binaries,
 .B dpkg\-shlibdeps
 remembers the (biggest) minimal version needed for each library. At the end
@@ -197,7 +197,7 @@ the default is
 .BR debian/substvars .
 .TP
 .BI \-v
-Enable verbose mode. Numerous messages are displayed to explain what 
+Enable verbose mode. Numerous messages are displayed to explain what
 .B dpkg\-shlibdeps
 does.
 .TP
@@ -219,7 +219,7 @@ tried in the same order before directories of other binary packages.
 Do not fail if dependency information can't be found for a shared library.
 Usage of this option is discouraged, all libraries should provide
 dependency information (either with shlibs files, or with symbols files)
-even if they are not yet used by other packages.  
+even if they are not yet used by other packages.
 .TP
 .BI \-\-warnings= value
 \fIvalue\fP is a bit field defining the set of warnings that

+ 1 - 1
man/dpkg-source.1

@@ -305,7 +305,7 @@ Specifies to expect the original source as a tarfile, by default
 .IB package _ upstream-version .orig.tar. extension \fR.
 It will leave this original source in place as a tarfile, or copy it
 to the current directory if it isn't already there. The
-tarball will be unpacked into 
+tarball will be unpacked into
 .IB directory .orig
 for the generation of the diff.
 .TP

+ 2 - 2
man/dpkg.1

@@ -406,8 +406,8 @@ Turns on (or off) all force options.
 Install a package, even if newer version of it is already installed.
 
 \fIWarning: At present \fP\fBdpkg\fP\fI does not do any dependency
-checking on downgrades and therefore will not warn you 
-if the downgrade breaks the dependency of some other 
+checking on downgrades and therefore will not warn you
+if the downgrade breaks the dependency of some other
 package. This can have serious side effects, downgrading
 essential system components can even make your whole
 system unusable. Use with care.\fP

+ 5 - 5
po/ChangeLog.old

@@ -881,11 +881,11 @@
 2006-09-16  Frédéric Bothamy  <frederic.bothamy@free.fr>
 
 	* fr.po: Updated to 920t.
-	
+
 2006-09-14  Javier Fernandez-Sanguino  <jfs@debian.org>
 
 	* es.po: Updated to 920t.
-	
+
 2006-09-13  Stefano Canepa  <sc@linux.it>
 
 	* it.po: Updated to 920t.
@@ -907,7 +907,7 @@
 	* pt.po: Fixed extra space.
 
 2006-08-29  Bart Cornelis  <cobaco@skolelinux.no>
-	
+
 	* nl.po: Updated translation.
 
 2006-08-29  Sven Joachim  <svenjoac@gmx.de>
@@ -1195,7 +1195,7 @@
 2006-05-04  Robert Luberda  <robert@debian.org>
 
 	* pl.po: Updated to 742t.
-	
+
 2006-05-04  Bart Cornelis  <cobaco@linux.be>
 
 	* nl.po: Updated translation.
@@ -1818,7 +1818,7 @@
 2005-01-10  Scott James Remnant  <scott@netsplit.com>
 
 	* POTFILES.in: Update with new file paths.
-	
+
 	* dpkg.pot: Remove from version control, it will be automatically
 	generated through gettext and automake.
 	* en.po: Remove needless english translation, the default strings

+ 1 - 1
po/es.po

@@ -15,7 +15,7 @@
 #   - Tomas Bautista <bautista@cma.ulpgc.es>, 2000.
 #   - Santiago Vila <sanvila@debian.org>, 2000, 2001, 2004.
 #
-#   Traductores, si no conoce el formato PO, merece la pena leer la 
+#   Traductores, si no conoce el formato PO, merece la pena leer la
 #   documentación de gettext, especialmente las secciones dedicadas a este
 #   formato, por ejemplo ejecutando:
 #          info -n '(gettext)PO Files'

+ 1 - 1
scripts/Dpkg/Shlibs/SymbolFile.pm

@@ -412,7 +412,7 @@ sub merge_symbols {
 	    # If the symbol is already listed in the file
 	    $sym->mark_found_in_library($minver, $self->get_arch());
 	} else {
-	    # The exact symbol is not present in the file, but it might match a 
+	    # The exact symbol is not present in the file, but it might match a
 	    # pattern.
 	    my $pattern = $self->find_matching_pattern($name, $obj, 1);
 	    if (defined $pattern) {

+ 4 - 4
scripts/dpkg-checkbuilddeps.pl

@@ -120,21 +120,21 @@ exit 1 if @unmet || @conflicts;
 # Silly little status file parser that returns a Dpkg::Deps::KnownFacts
 sub parse_status {
 	my $status = shift;
-	
+
 	my $facts = Dpkg::Deps::KnownFacts->new();
 	local $/ = '';
 	open(my $status_fh, '<', $status) ||
 		syserr(_g('cannot open %s'), $status);
 	while (<$status_fh>) {
 		next unless /^Status: .*ok installed$/m;
-	
+
 		my ($package) = /^Package: (.*)$/m;
 		my ($version) = /^Version: (.*)$/m;
 		my ($arch) = /^Architecture: (.*)$/m;
 		my ($multiarch) = /^Multi-Arch: (.*)$/m;
 		$facts->add_installed_package($package, $version, $arch,
 		                              $multiarch);
-	
+
 		if (/^Provides: (.*)$/m) {
 			my $provides = deps_parse($1, reduce_arch => 1, union => 1);
 			next if not defined $provides;
@@ -158,7 +158,7 @@ sub parse_status {
 #
 # Additional parameters that must be passed:
 # * A reference to a hash of all "ok installed" the packages on the system,
-#   with the hash key being the package name, and the value being the 
+#   with the hash key being the package name, and the value being the
 #   installed version.
 # * A reference to a hash, where the keys are package names, and the
 #   value is a true value iff some package installed on the system provides

+ 5 - 5
scripts/dpkg-scanpackages.pl

@@ -191,11 +191,11 @@ FILE:
 	            $fn, $?);
 	    next;
 	}
-	
+
 	defined($fields->{'Package'})
 	    or error(_g('No Package field in control file of %s'), $fn);
 	my $p = $fields->{'Package'};
-	
+
 	if (defined($packages{$p}) and not $options{multiversion}) {
 	    foreach (@{$packages{$p}}) {
 		if (version_compare_relation($fields->{'Version'}, REL_GT,
@@ -216,9 +216,9 @@ FILE:
 	}
 	warning(_g('Package %s (filename %s) has Filename field!'), $p, $fn)
 	    if defined($fields->{'Filename'});
-	
+
 	$fields->{'Filename'} = "$pathprefix$fn";
-	
+
         my $sums = Dpkg::Checksums->new();
 	$sums->add_from_file($fn);
         foreach my $alg (checksums_get_list()) {
@@ -230,7 +230,7 @@ FILE:
         }
 	$fields->{'Size'} = $sums->get_size($fn);
         $fields->{'X-Medium'} = $options{medium} if defined $options{medium};
-	
+
 	push @{$packages{$p}}, $fields;
     }
 close($find_h);

+ 2 - 2
scripts/dpkg-source.pl

@@ -219,7 +219,7 @@ if ($options{opmode} =~ /^(-b|--print-format|--(before|after)-build|--commit)$/)
 
     $changelogfile ||= "$dir/debian/changelog";
     $controlfile ||= "$dir/debian/control";
-    
+
     my %ch_options = (file => $changelogfile);
     $ch_options{changelogformat} = $changelogformat if $changelogformat;
     my $changelog = changelog_parse(%ch_options);
@@ -341,7 +341,7 @@ if ($options{opmode} =~ /^(-b|--print-format|--(before|after)-build|--commit)$/)
             field_transfer_single($changelog, $fields);
 	}
     }
-    
+
     $fields->{'Binary'} = join(', ', @binarypackages);
     # Avoid overly long line by splitting over multiple lines
     if (length($fields->{'Binary'}) > 980) {

+ 1 - 1
scripts/t/700_Dpkg_Control.t

@@ -75,7 +75,7 @@ is($value, $expected, "Dump of $datadir/control-1");
 my $src = $c->get_source();
 is($src, $c->[0], 'array representation of Dpkg::Control::Info 1/2');
 is($src->{'my-field-one'}, 'myvalue1', 'Access field through badly capitalized field name');
-is($src->{'long-field'}, 
+is($src->{'long-field'},
 'line1
 line 2 line 2 line 2
 

+ 1 - 0
test/100_critic.t

@@ -46,6 +46,7 @@ my @policies = qw(
     ClassHierarchies::ProhibitExplicitISA
     ClassHierarchies::ProhibitOneArgBless
     CodeLayout::ProhibitQuotedWordLists
+    CodeLayout::ProhibitTrailingWhitespace
     CodeLayout::RequireConsistentNewlines
     ControlStructures::ProhibitCStyleForLoops
     ControlStructures::ProhibitLabelsWithSpecialBlockNames