Merge branch 'master' into dpkg-shlibdeps-buxy

Conflicts:

	scripts/dpkg-shlibdeps.pl

COPYING

@@ -1,8 +1,8 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

ChangeLog

@@ -1,3 +1,339 @@
+2007-09-20  Frank Lichtenheld  <djpig@debian.org>
+
+	* scripts/dpkg-sources.pl (version): Don't use
+	printf if we don't need it, use print instead.
+
+	* scripts/dpkg-buildpackage.sh (usage): Fix typo
+	s/dpkg-genchangs/dpkg-genchanges/
+
+	* scripts/Dpkg.pm: Make the regex for determining
+	$progname more robust.
+
+2007-09-18  Guillem Jover  <guillem@debian.org>
+
+	* lib/mlib.c (checksubprocerr): Warn instead of erroring out in case
+	of receiving a signal and having been asked to only warn.
+
+2007-09-18  Guillem Jover  <guillem@debian.org>
+
+	* src/remove.c (deferred_remove): Remove duplicate nested conditional,
+	and move its contents to the outer one.
+
+2007-09-14  Brian M. Carlson  <sandals@crustytoothpaste.ath.cx>
+
+	* src/remove.c (deferred_remove): Store the previous package status
+	when calling '<prerm> remove' and pass it to push_cleanup.
+	* src/cleanup.c (cu_prermremove): Restore previous stored status if
+	the '<postinst> abort-remove' call succeeds.
+
+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'.
+	* scripts/dpkg-gencontrol.pl ($host_arch): Likewise.
+
+2007-09-06  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-genchanges.pl (%fieldimps): Remove unused variable.
+	* scripts/dpkg-gencontrol.pl (%fieldimps): Likewise.
+	* scripts/dpkg-source.pl (%fieldimps): Likewise.
+	* scripts/controllib.pl (%fieldimps): Switch from 'our' to 'my'.
+
+2007-09-06  Guillem Jover  <guillem@debian.org>
+
+	* scripts/822-date.pl: Add $dpkglib into @INC, needed by the
+	controllib.pl require.
+
+2007-09-06  Guillem Jover  <guillem@debian.org>
+
+	* configure.ac: Bump version to 1.14.7~.
+
+2007-09-05  Guillem Jover  <guillem@debian.org>
+
+	* configure.ac: Release 1.14.6.
+
+2007-09-05  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-gencontrol.pl: Properly override Homepage field from
+	binary package stanzas.
+
+2007-08-31  Guillem Jover  <guillem@debian.org>
+
+	* dpkg-deb/build.c (arbitrary_fields): Add Tag.
+	* scripts/dpkg-genchanges.pl: Ignore Tag field.
+	* scripts/dpkg-gencontrol.pl: Parse Tag from binary package stanza.
+	(@control_fields): Add Tag.
+	* scripts/dpkg-scanpackages.pl (@fieldpri): Add Tag.
+	* scripts/dpkg-source.pl: Ignore Tag field from binary package stanza.
+
+2007-08-31  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-genchanges.pl: Ignore Vcs-Browser, Vcs-Arch, Vcs-Bzr,
+	Vcs-Cvs, Vcs-Darcs, Vcs-Git, Vcs-Hg, Vcs-Mtn and Vcs-Svn fields
+	from control file source stanza.
+	* scripts/dpkg-gencontrol.pl: Likewise.
+	* scripts/dpkg-source.pl: Parse them instead.
+	(@dsc_fields): Add them here.
+
+2007-08-31  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-genchanges.pl: Do not leave unknown fields unwarned
+	and explicitely ignore all known ones from control file source
+	package stanza.
+
+2007-08-30  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-genchanges.pl: Ignore XB- fields instead of XC- fields
+	from control file binary package stanzas.
+
+2007-08-28  Guillem Jover  <guillem@debian.org>
+
+	* scripts/update-alternatives.pl: Fix regression introduced on commit
+	from 2007-08-08, which was producing a warning due to usage of
+	uninitialized variables.
+
+2007-08-28  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-gencontrol.pl: Add comments about the second pass
+	parsing for dependency fields. Remove handling of uninteresting fields
+	in the second pass parsing.
+
+2007-08-24  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-gencontrol.pl: Allow a package stanza to override the
+	Homepage field from the source stanza.
+
+2007-08-20  Guillem Jover  <guillem@debian.org>
+
+	* dpkg-deb/build.c (arbitrary_fields): New variable.
+	(known_arbitrary_field): New function.
+	(do_build): Call known_arbitrary_field to not warn on known arbitrary
+	fields.
+	* scripts/dpkg-genchanges.pl: Ignore Homepage field.
+	* scripts/dpkg-gencontrol.pl: Parse Homepage from source package
+	stanza.
+	(@control_fields): Add Homepage.
+	* scripts/dpkg-scanpackages.pl (@fieldpri): Add Homepage.
+	* scripts/dpkg-source.pl: Parse Homepage from source package stanza.
+	(@dsc_fields): Add Homepage.
+
+2007-08-18  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-divert.pl (infol): Check if parameters are defined
+	before using them. Use defined instead of length to check for undef
+	variables.
+
+2007-08-14  Guillem Jover  <guillem@debian.org>
+
+	* lib/parsehelp.c (parseerr): Switch from ternary operator to compose
+	a string to a conditional call to the function with two different
+	strings, making life easier for translators.
+	* src/archives.c (tarobject): Likewise.
+	* src/query.c (searchoutput): Switch from a loop with two iterations
+	and ternary operators to compose strings to a conditional with two
+	sequential calls with different strings, making life easier for
+	translators.
+
+2007-08-14  Guillem Jover  <guillem@debian.org>
+
+	* dpkg-split/main.c (rerr): Adjust string so that it gets merged by
+	gettext with a similar one.
+
+2007-08-14  Guillem Jover  <guillem@debian.org>
+
+	* src/archives.c (linktosameexistingdir): Mark strings for translation.
+
+2007-08-11  Ian Jackson  <iwj@ubuntu.com>
+
+	* src/archives.c (linktosameexistingdir): New function.
+	(tarobject): Call linktosameexistingdir if the tarball and the on-disk
+	files are symlinks and ignore the symlink if it returns true.
+
+2007-08-08  Ian Jackson  <iwj@ubuntu.com>
+
+	* scripts/update-alternatives.pl: In the case where the slave is
+	inapplicable do not attempt to create the slave link before
+	removing it again.
+
+2007-08-08  Guillem Jover  <guillem@debian.org>
+
+	* src/configure.c (deferred_configure): Do not print a new line
+	if maintainer_script_installed returned true.
+
+2007-08-08  Guillem Jover  <guillem@debian.org>
+
+	* dpkg-deb/build.c (do_build): Use NULL instead of '(char *)0'.
+	* dpkg-deb/extract.c (movecontrolfiles, extracthalf): Likewise.
+	* dpkg-deb/info.c (cu_info_prepare, info_prepare): Likewise.
+	* src/cleanup.c (cu_prermupgrade, cu_prermdeconfigure)
+	(cu_prerminfavour, cu_preinstverynew, cu_preinstnew)
+	(cu_preinstupgrade, cu_postrmupgrade, cu_prermremove): Likewise.
+	* src/configure.c (deferred_configure, suspend): Likewise.
+	* src/help.c (maintainer_script_alternative)
+	(ensure_pathname_nonexisting): Likewise.
+	* src/processarc.c (process_archive): Likewise.
+	* src/remove.c (deferred_remove, removal_bulk_remove_files)
+	(removal_bulk_remove_configfiles): Likewise.
+
+2007-08-08  Guillem Jover  <guillem@debian.org>
+
+	* src/cleanup.c (cu_prermdeconfigure): Split call to
+	maintainer_script_installed depending on the conflictor variable.
+	* src/packages.c (dependencies_ok): Remove comment stating that
+	Breaks needs to be implemented.
+	* src/depcon.c (depisok): Likewise. Remove return at the beggining
+	of the function checking for a Breaks dependency, that was
+	efectively making it a no-op in that case.
+	* src/processarc.c (process_archive): Fix indentation. Split calls
+	in deconfigure code to printf and maintainer_script_installed
+	depending on the removing variable.
+
+2007-08-07  Guillem Jover  <guillem@debian.org>
+
+	* src/query.c (listpackages): Instead of allocating an additional
+	packages array with room for the the current amount of packages,
+	sort the existing one, and print the packages matching the pattern,
+	which fixes segfaults when the resulting array was bigger than the
+	current amount of packages.
+	(showpackages): For each package show it only once it matches any
+	of the patterns, so we avoid duplicated results.
+
+2007-08-07  Ian Jackson  <iwj@ubuntu.com>
+
+	* man/deb-control.5: Document Breaks field.
+	* man/dpkg-query.1: Document Breaks as a recognized field.
+	* man/dpkg.1: Add description of '--force-breaks'.
+	* scripts/controllib.pl (@pkg_dep_fields): Add 'Breaks'.
+	* scripts/dpkg-genchanges.pl: Ignore Breaks field.
+	* scripts/dpkg-source.pl: Likewise.
+	* src/archives.c (try_remove_can): Rename to ...
+	(try_deconfigure_can): ... this. Generalize dependency force check
+	by taking a function as argument. Store the possible package removal
+	which caused the deconfiguration in the xinfo member of the package
+	to be deconfigured.
+	(try_remove_can): New function.
+	(check_breaks): Likewise.
+	* src/archives.h (check_breaks): New prototype.
+	* src/cleanup.c (cu_prermdeconfigure): Handle case when argv[1]
+	might be 0, if deconfigure was due to Breaks.
+	* src/configure.c (deferred_configure): Call breakses_ok.
+	* src/depcon.c (depisok): Add Breaks support.
+	* src/help.c (force_breaks): New function.
+	* src/main.c (fc_breaks): New variable.
+	(forceinfo): Add 'breaks' as a supported option for '--force-...'.
+	* src/main.h (struct perpackagestate): Add xinfo member.
+	(fc_breaks): New variable definition.
+	(breakses_ok): New prototype.
+	(force_depends): Likewise.
+	* src/packages.c (breaks_check_one): New function.
+	(breaks_check_target): Likewise.
+	(breakses_ok): Likewise.
+	* src/processarc.c (process_archive): Check for Breaks dependencies,
+	instead of bailing out if field found. Distinguish between deconfigure
+	due to a removal due to Conflicts or Depends, and deconfigure due to
+	an installation due to Breaks. Run the deconfiguration of each
+	package to be deconfigured once, instead of once per each conflicting
+	package being removed.
+
+2007-07-31  Ian Jackson  <iwj@ubuntu.com>
+
+	* src/archives.c (quote_filename): Change formatting to match the
+	rest of the file (tab -> 2 spaces).
+
+2007-07-25  Guillem Jover  <guillem@debian.org>
+
+	* scripts/changelog/debian.pl: Switch from 'dpkg-gettext.pl' to
+	Dpkg::Gettext.
+
+2007-07-22  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-gettext.pl: Move ...
+	* scripts/Dpkg/Gettext.pm: ... here. Add a package statement.
+	Fix all users.
+	* scripts/Makefile.am (dist_pkglib_SCRIPTS): Remove 'dpkg-gettext.pl'.
+	(nobase_dist_perllib_DATA): Add 'Dpkg/Gettext.pm'.
+
+	* scripts/822-date.pl: Do not push $dpkglibdir into @INC anymore.
+	* scripts/cleanup-info.pl: Likewise.
+	* scripts/controllib.pl: Likewise.
+	* scripts/dpkg-divert.pl: Likewise.
+	* scripts/dpkg-scansources.pl: Likewise.
+	* scripts/dpkg-statoverride.pl: Likewise.
+	* scripts/install-info.pl: Likewise.
+	* scripts/update-alternatives.pl: Likewise.
+
+2007-07-22  Guillem Jover  <guillem@debian.org>
+
+	* scripts/cleanup-info.pl: Use new Dpkg module, and remove variable
+	declarations already present in the module.
+	* scripts/controllib.pl: Likewise.
+	* scripts/dpkg-architecture.pl: Likewise.
+	* scripts/dpkg-checkbuilddeps.pl: Likewise.
+	* scripts/dpkg-distaddfile.pl: Likewise.
+	* scripts/dpkg-divert.pl: Likewise.
+	* scripts/dpkg-genchanges.pl: Likewise.
+	* scripts/dpkg-gencontrol.pl: Likewise.
+	* scripts/dpkg-parsechangelog.pl: Likewise.
+	* scripts/dpkg-scanpackages.pl: Likewise.
+	* scripts/dpkg-scansources.pl: Likewise.
+	* scripts/dpkg-shlibdeps.pl: Likewise.
+	* scripts/dpkg-source.pl: Likewise.
+	* scripts/dpkg-statoverride.pl: Likewise.
+	* scripts/install-info.pl: Likewise.
+	* scripts/update-alternatives.pl: Likewise.
+	* scripts/822-date.pl: Likewise.
+	* changelog/debian.pl: Likewise.
+
+	* scripts/controllib.pl (init_substvars): Remove comment about
+	$version needing to be a global variable set elsewhere.
+
+	* scripts/dpkg-scanpackages.pl: Remove $0 mangling.
+	(version, usage): Use $progname instead of $0.
+	* scripts/dpkg-statoverride.pl: Likewise.
+	* scripts/install-info.pl: Likewise.
+	* scripts/dpkg-divert.pl: Likewise.
+	(quit, badusage): Use $progname instead of $0.
+	* scripts/update-alternatives.pl: Likewise.
+	* scripts/dpkg-scansources.pl ($Me): Remove declaration.
+	(xwarndie_mess, version, usage): Use $progname instead of $Me.
+
+2007-07-21  Guillem Jover  <guillem@debian.org>
+
+	* m4/perl.m4 (DPKG_PROG_PERL): Add support for user overridable
+	PERL_LIBDIR variable, autodetected from the system installation.
+	* scripts/Makefile.am (perllibdir): New variable.
+	(nobase_dist_perllib_DATA): Likewise.
+	(install-data-hook): New target.
+	* scripts/Dpkg.pm: New file.
+
+2007-07-03  Frank Lichtenheld  <djpig@debian.org>
+
+	* configure.ac: Bump version to 1.14.6~.
+
+	* configure.ac: Release 1.14.5.
+
+2007-07-02  Frank Lichtenheld  <djpig@debian.org>
+
+	* COPYING: Update to current version of GPL v2
+	text. Updates FSF address and LGPL name.
+
 2007-07-01  Frank Lichtenheld  <djpig@debian.org>
 
 	* scripts/dpkg-source.pl: Warn that newly created empty files are

THANKS

@@ -12,7 +12,7 @@ Charles Briscoe-Smith <cpbs@debian.org>
 Christian Haggstrom <chm@c00.info>
 Christophe Le Bars <clebars@teaser.fr>
 Colin Plumb <colin@nyx.net>
-Colin Watson <cjw44@flatline.org.uk>
+Colin Watson <cjwatson@debian.org>
 Dan Gohman <gohmandj@mrs.umn.edu>
 Daniel Jacobowitz <dan@debian.org>
 Darren Stalder <torin@daft.com>
@@ -53,7 +53,7 @@ Peter Karlsson <peterk@debian.org>
 Petr Cech <cech@atrey.karlin.mff.cuni.cz>
 Philippe Batailler <pbatailler@teaser.fr>
 Piotr Roszatycki <dexter@fnet.pl>
-Raphael Hertzog <rhertzog@hrnet.fr>
+Raphael Hertzog <hertzog@debian.org>
 Richard Kettlewell <rjk@sfere.greenend.org.uk>
 Robert Millan <rmh@debian.org>
 Roderick Schertler <roderick@argon.org>

TODO

@@ -9,7 +9,7 @@ lenny
  * Triage as much bugs as possible to get the bug count below 300 ;) and
    merge as much patches as possible.
 
-1.14.2
+1.14.x
 ------
 
  * Make dpkg bootstrappable (modularize dpkg-architecture).
@@ -18,9 +18,7 @@ lenny
    - Add field Package-Type and friends.
    - Generate proper Packages files. (#383916)
 
- * Support Tag field.
-
-1.14.x
+1.14.y
 ------
 
  * Add Wig&Pen source package support.
@@ -31,8 +29,6 @@ lenny
 
  * Add multiarch support.
 
- * Merge back support for Breaks field from Ubuntu.
-
  * Merge dpkg-cross functionality.
 
  * Merge dpkg-sig?
@@ -156,7 +152,6 @@ other stuff unlikely to get done soon
  * understand Replaces in dselect
  * diversions list as control archive entry
  * single maintainer script, and new package getting there first
- * dpkg -s show something for virtual packages
  * local conffiles, aswell as local files that dpkg should check before
    overwriting
  * hooks
@@ -169,8 +164,3 @@ other stuff unlikely to get done soon
  * `fake' or `null' packages
  * dpkg --query | -Q
 
-obsoleted so not done
- * version numbers not starting digit early.
- * dselect bottom window too large, and/or resize
- * `template' file giving default selections of dselect.
-

configure.ac

@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dpkg], [1.14.5~], [debian-dpkg@lists.debian.org])
+AC_INIT([dpkg], [1.14.7~], [debian-dpkg@lists.debian.org])
 AC_CONFIG_SRCDIR([lib/dpkg.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])

debian/changelog

@@ -1,4 +1,111 @@
-dpkg (1.14.5) UNRELEASED; urgency=low
+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 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.
+  * After '<prerm> remove' fails and while doing the error unwinding, if
+    the '<postinst> abort-remove' call succeeds, preserve the old status
+    instead of unconditionally setting it to 'Installed'. Closes: #432893
+    Thanks to Brian M. Carlson.
+  * Add Vcs-Browser and Vcs-Git fields to debian/control.
+
+  [ Updated dpkg translations ]
+  * Basque (Piarres Beobide). Closes: #440859
+  * Danish (Claus Hindsgaul). Closes: #441106
+  * French (Frédéric Bothamy).
+  * German (Sven Joachim). Closes: #440537
+  * Nepali (Shiva Prasad Pokharel). Closes: #437825
+  * Portuguese (Miguel Figueiredo). Closes: #441113
+  * Romanian (Eddy Petri?or).
+  * Vietnamese (Clytie Siddall). Closes: #440502
+  * Korean (Sunjae Park). Closes: #443190
+
+  [ Updated man pages translations ]
+  * German (Helge Kreutzmann).
+  * Swedish (Peter Karlsson).
+  * Korean (Sunjae Park). Closes: #443191
+
+ -- Guillem Jover <guillem@debian.org>  Thu, 06 Sep 2007 03:42:40 +0300
+
+dpkg (1.14.6) unstable; urgency=low
+
+  [ Frank Lichtenheld ]
+  * Synchronise usage information of dpkg, dpkg-deb, and
+    dpkg-query man pages. This fixes some small mistakes
+    and also Closes: #321520
+
+  [ Guillem Jover ]
+  * Man pages cleanup:
+    - Some italics and bold fixes.
+    - Unify ellipsis, argument separator, and remove redundant program name
+      preceding the options.
+    - Substitute 'FILES' header with 'SEE ALSO' in dpkg-buildpackage(1),
+      and remove leftover string from man page split. Closes: #439306
+    - Split option descriptions so that it gets easier to distinguish.
+    - Unify author and copyright information formatting.
+  * Move variables automatically modified at build time for the perl scripts
+    to a new style perl module (Dpkg) and make all programs use it.
+  * Switch 'dpkg-gettext.pl' to a new style perl module (Dpkg::Gettext).
+  * Implement support for Breaks field. Closes: #379140
+    Thanks to Ian Jackson.
+  * Run the deconfiguration of each package to be deconfigured once, instead
+    of once per each conflicting package being removed. Closes: #378003
+    Thanks to Ian Jackson.
+  * Do not segfault when the result from a 'dpkg-query -l' is bigger than
+    the total number of current packages, and do not produce repeated
+    results with overlapping patterns on 'dpkg-query -W'. Closes: #428427
+  * Tightening dpkg-dev versioned Depends to dpkg 1.14.6, and dpkg Conflicts
+    against << dpkg-dev 1.14.6, where the perl modularization started.
+  * Do not print empty lines after 'Setting up ...' output. Closes: #392317
+  * When a slave alternative is inapplicable do not attempt to create the
+    slave link before removing it again. Closes: #411699
+    Thanks to Ian Jackson.
+  * Do not consider it a file conflict if the package contains a symlink
+    to a directory where the existing symlink on-disk points to the
+    same place. Closes: #377682
+    Thanks to Ian Jackson.
+  * Fix perl warnings:
+    - When removing a non diverted file with dpkg-divert. Closes: #438416
+  * Implement support for Homepage field. Closes: #142324
+  * Ignore XB- fields instead of XC- fields from control file binary package
+    stanzas in dpkg-genchanges.
+  * Explicitely ignore all known fields from the control file source package
+    stanza in dpkg-genchanges, instead of leaving unknown fields unwarned.
+  * Implement support for Vcs-Browser, Vcs-Arch, Vcs-Bzr, Vcs-Cvs, Vcs-Darcs,
+    Vcs-Git, Vcs-Hg, Vcs-Mtn and Vcs-Svn fields in control file source
+    package stanza.
+  * Implement support for Tag field.
+
+  [ Updated scripts translations ]
+  * French (Frédéric Bothamy, Christian Perrier).
+  * Swedish (Peter Karlsson).
+
+  [ Updated dpkg translations ]
+  * Dzongkha (Tshewang Norbu). Closes: #430931
+  * Nepali (Shiva Prasad Pokharel). Closes: #435353
+  * Polish (Robert Luberda).
+  * Russian (Yuri Kozlov). Closes: #436147
+  * Swedish (Peter Karlsson).
+
+  [ Updated dselect translations ]
+  * Russian (Yuri Kozlov). Closes: #436149
+  * Swedish (Peter Karlsson).
+
+  [ Updated man pages translations ]
+  * German (Helge Kreutzmann).
+  * Polish (Robert Luberda).
+  * Swedish (Peter Karlsson).
+
+ -- Guillem Jover <guillem@debian.org>  Wed, 05 Sep 2007 07:36:02 +0300
+
+dpkg (1.14.5) unstable; urgency=low
 
   [ Guillem Jover ]
   * Add lpia support to ostable and triplettable.
@@ -31,22 +138,21 @@ dpkg (1.14.5) UNRELEASED; urgency=low
     by Ian Jackson. Closes: #390915, #207289
   * dpkg-source warns now about new empty files since those will
     not be represented in the diff. Closes: #383394
-  
+
   [ Updated dselect translations ]
-  * French (Christian Perrier)
-  * Romanian - updated and converted to use correct diacritics
+  * French (Christian Perrier).
+  * Romanian (Eddy Petrişor).
 
   [ Updated dpkg translations ]
-  * Portuguese (Miguel Figueiredo).
   * Estonian (Ivar Smolin). Closes: #427589
-  * Romanian - updated and converted to use correct diacritics
+  * Portuguese (Miguel Figueiredo).
+  * Romanian (Eddy Petrişor).
   * Spanish (Javier Fernandez-Sanguino). Closes: #429958
 
   [ Updated man pages translations ]
   * German (Helge Kreutzmann).
 
-
- -- Frank Lichtenheld <djpig@debian.org>  Sat, 23 Jun 2007 11:27:55 +0200
+ -- Frank Lichtenheld <djpig@debian.org>  Tue, 03 Jul 2007 00:27:07 +0200
 
 dpkg (1.14.4) unstable; urgency=low
 
@@ -203,7 +309,7 @@ dpkg (1.14.0) unstable; urgency=low
   * Dutch (Bart Cornelis).
   * French (Frédéric Bothamy).
   * Polish (Robert Luberda).
-  * Romanian (Eddy Petri?or).
+  * Romanian (Eddy Petrişor).
   * Simplified Chinese (Anthony Wong). Closes: #415320
   * Traditional Chinese (Anthony Wong). Closes: #415230
 
@@ -244,7 +350,7 @@ dpkg (1.13.25) unstable; urgency=low
   * Korean (Sunjae Park). Closes: #394135, #404938
   * Norwegian Bokmal (Hans Fredrik Nordhaug). Closes: #391143
   * Nepali (Shiva Prasad Pokharel).
-  * Romanian (Eddy Petri?or).
+  * Romanian (Eddy Petrişor).
   * Catalan (Jordà Polo).
   * Swedish (Peter Karlsson).
   * Vietnamese (Clytie Siddall). Closes: #399343

debian/control

@@ -5,6 +5,8 @@ Maintainer: Dpkg Developers <team@dpkg.org>
 Uploaders: Frank Lichtenheld <djpig@debian.org>, Guillem Jover <guillem@debian.org>, Brendan O'Dea <bod@debian.org>, Christian Perrier <bubulle@debian.org>
 Origin: debian
 Bugs: debbugs://bugs.debian.org
+Vcs-Browser: http://git.debian.org/?p=dpkg/dpkg.git
+Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git
 Standards-Version: 3.7.2
 Build-Depends: debhelper (>= 4.1.81), pkg-config, po4a (>= 0.23),
  libncurses5-dev | libncurses-dev, zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev,
@@ -15,7 +17,7 @@ Architecture: any
 Essential: yes
 Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1)
 Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11), dpkg-static,
- dpkg-dev (<< 1.14.0)
+ dpkg-dev (<< 1.14.6)
 Replaces: dpkg-doc-ja, dpkg-static, manpages-de (<= 0.4-3),
  manpages-pl (<= 20051117-1)
 Suggests: apt, lzma
@@ -30,7 +32,7 @@ Package: dpkg-dev
 Section: utils
 Priority: optional
 Architecture: all
-Depends: dpkg (>= 1.14.0), perl5, perl-modules, cpio (>= 2.4.2-2),
+Depends: dpkg (>= 1.14.6), perl5, perl-modules, cpio (>= 2.4.2-2),
  patch (>= 2.2-1), make, binutils
 Recommends: gcc | c-compiler, bzip2
 Suggests: gnupg, debian-keyring

debian/dpkg.install

@@ -7,7 +7,6 @@ usr/bin/dpkg
 usr/bin/dpkg-deb
 usr/bin/dpkg-query
 usr/bin/dpkg-split
-usr/lib/dpkg/dpkg-gettext.pl
 usr/lib/dpkg/enoent
 usr/lib/dpkg/mksplit
 usr/sbin
@@ -35,6 +34,8 @@ usr/share/man/*/*/start-stop-daemon.8
 usr/share/man/*/start-stop-daemon.8
 usr/share/man/*/*/update-alternatives.8
 usr/share/man/*/update-alternatives.8
+usr/share/perl5/Dpkg.pm
+usr/share/perl5/Dpkg/Gettext.pm
 var/lib/dpkg/alternatives
 var/lib/dpkg/info
 var/lib/dpkg/parts

dpkg-deb/.gitignore

@@ -1,3 +1,4 @@
+*.o
 .deps
 Makefile
 Makefile.in

dpkg-deb/build.c

@@ -56,6 +56,22 @@ struct _finfo {
   struct _finfo* next;
 };
 
+const char *arbitrary_fields[]= {
+  "Homepage",
+  "Tag",
+  NULL
+};
+
+static int known_arbitrary_field(const struct arbitraryfield *field) {
+  const char **known;
+
+  for (known= arbitrary_fields; *known; known++)
+    if (strcasecmp(field->name, *known) == 0)
+      return 1;
+
+  return 0;
+}
+
 /* Do a quick check if vstring is a valid versionnumber. Valid in this case
  * means it contains at least one digit. If an error is found increment
  * *errs.
@@ -223,6 +239,9 @@ void do_build(const char *const *argv) {
       warns++;
     }
     for (field= checkedinfo->available.arbs; field; field= field->next) {
+      if (known_arbitrary_field(field))
+        continue;
+
       fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"),
               controlfile, field->name);
       warns++;
@@ -324,7 +343,8 @@ void do_build(const char *const *argv) {
     m_dup2(p1[1],1); close(p1[0]); close(p1[1]);
     if (chdir(directory)) ohshite(_("failed to chdir to `%.255s'"),directory);
     if (chdir(BUILDCONTROLDIR)) ohshite(_("failed to chdir to .../DEBIAN"));
-    execlp(TAR,"tar","-cf","-",".",(char*)0); ohshite(_("failed to exec tar -cf"));
+    execlp(TAR, "tar", "-cf", "-", ".", NULL);
+    ohshite(_("failed to exec tar -cf"));
   }
   close(p1[1]);
   /* Create a temporary file to store the control data in. Immediately unlink
@@ -396,7 +416,7 @@ void do_build(const char *const *argv) {
     m_dup2(p1[0],0); close(p1[0]); close(p1[1]);
     m_dup2(p2[1],1); close(p2[0]); close(p2[1]);
     if (chdir(directory)) ohshite(_("failed to chdir to `%.255s'"),directory);
-    execlp(TAR,"tar","-cf", "-", "--null", "-T", "-", "--no-recursion", (char*)0);
+    execlp(TAR, "tar", "-cf", "-", "--null", "-T", "-", "--no-recursion", NULL);
     ohshite(_("failed to exec tar -cf"));
   }
   close(p1[0]);
@@ -417,7 +437,8 @@ void do_build(const char *const *argv) {
   if (!(c3= m_fork())) {
     m_dup2(p3[1],1); close(p3[0]); close(p3[1]);
     if (chdir(directory)) ohshite(_("failed to chdir to `%.255s'"),directory);
-    execlp(FIND,"find",".","-path","./" BUILDCONTROLDIR,"-prune","-o","-print0",(char*)0);
+    execlp(FIND, "find", ".", "-path", "./" BUILDCONTROLDIR, "-prune", "-o",
+           "-print0", NULL);
     ohshite(_("failed to exec find"));
   }
   close(p3[1]);

dpkg-deb/extract.c

@@ -48,7 +48,8 @@ static void movecontrolfiles(const char *thing) {
   
   sprintf(buf, "mv %s/* . && rmdir %s", thing, thing);
   if (!(c1= m_fork())) {
-    execlp("sh","sh","-c",buf,(char*)0); ohshite(_("failed to exec sh -c mv foo/* &c"));
+    execlp("sh", "sh", "-c", buf, NULL);
+    ohshite(_("failed to exec sh -c mv foo/* &c"));
   }
   waitsubproc(c1,"sh -c mv foo/* &c",0);
 }
@@ -299,7 +300,7 @@ void extracthalf(const char *debar, const char *directory,
       strcat(buffer, "f");
       m_dup2(p2[0],0);
       close(p2[0]);
-      execlp(TAR,"tar",buffer,"-",(char*)0);
+      execlp(TAR, "tar", buffer, "-", NULL);
       ohshite(_("failed to exec tar"));
     }
     close(p2[0]);

dpkg-deb/info.c

@@ -50,7 +50,7 @@ static void cu_info_prepare(int argc, void **argv) {
   if (lstat(directory,&stab) && errno==ENOENT) return;
   if ((c1= fork()) == -1) { perror(_("failed to fork for cleanup")); return; }
   if (!c1) {
-    execlp(RM,"rm","-rf",directory,(char*)0);
+    execlp(RM, "rm", "-rf", directory, NULL);
     perror(_("failed to exec rm for cleanup")); _exit(1);
   }
   if (waitpid(c1,&status,0) != c1) { perror(_("failed to wait for rm cleanup")); return; }
@@ -72,7 +72,8 @@ static void info_prepare(const char *const **argvp,
   *directoryp= dbuf;
 
   if (!(c1= m_fork())) {
-    execlp(RM,"rm","-rf",dbuf,(char*)0); ohshite(_("failed to exec rm -rf"));
+    execlp(RM, "rm", "-rf", dbuf, NULL);
+    ohshite(_("failed to exec rm -rf"));
   }
   waitsubproc(c1,"rm -rf",0);
   push_cleanup(cu_info_prepare,-1, 0,0, 1, (void*)dbuf);

dpkg-split/.gitignore

@@ -1,3 +1,4 @@
+*.o
 .deps
 Makefile
 Makefile.in

dpkg-split/main.c

@@ -88,7 +88,7 @@ struct partqueue *queue= NULL;
 int npquiet= 0, msdos= 0;
 
 void rerr(const char *fn) {
-  ohshite(_("error reading %s"),fn);
+  ohshite(_("error reading %.250s"), fn);
 }
 
 void rerreof(FILE *f, const char *fn) {

dselect/.gitignore

@@ -1,3 +1,4 @@
+*.o
 .deps
 Makefile
 Makefile.in

dselect/po/ChangeLog

@@ -1,3 +1,23 @@
+2007-09-19  Sunjae Park  <darehanl@gmail.com>
+
+	* ko.po: Updated to 285t.
+
+2007-08-18  Guillem Jover  <guillem@debian.org>
+
+	* *.po: Merged with dselect.pot.
+
+2007-08-06  Yuri Kozlov  <kozlov.y@gmail.com>
+
+	* ru.po: Updated to 285t.
+
+2007-07-29  Peter Karlsson  <peterk@debian.org>
+
+	* sv.po: Updated to 285t.
+
+2007-07-13  Ivar Smolin  <okul@linux.ee>
+
+	* et.po: Updated to 237t48u.
+
 2007-06-05  Christian Perrier  <bubulle@debianpt.org>
 
 	* fr.po: Updated to 285t.

dselect/po/et.po

@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dselect 1.14.4\n"
+"Project-Id-Version: dselect 1.14.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2007-05-08 04:15+0300\n"
-"PO-Revision-Date: 2007-06-27 19:14+0300\n"
+"PO-Revision-Date: 2007-07-13 08:22+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -58,11 +58,11 @@ msgstr "tõrge funktsioonis ioctl(TIOCGWINSZ)"
 
 #: dselect/baselist.cc:60
 msgid "doupdate in SIGWINCH handler failed"
-msgstr ""
+msgstr "tõrge signaali SIGWINCH käsitleja doupdate funktsioonis"
 
 #: dselect/baselist.cc:67
 msgid "failed to restore old SIGWINCH sigact"
-msgstr ""
+msgstr "tõrge signaali SIGWINCH vana sigact'i taastamisel"
 
 #: dselect/baselist.cc:69
 msgid "failed to restore old signal mask"
@@ -74,15 +74,15 @@ msgstr "tõrge vana signaalimaski hankimisel"
 
 #: dselect/baselist.cc:80
 msgid "failed to get old SIGWINCH sigact"
-msgstr ""
+msgstr "tõrge signaali SIGWINCH vana sigact'i hankimisel"
 
 #: dselect/baselist.cc:84
 msgid "failed to block SIGWINCH"
-msgstr "tõrge SIGWINCH blokkimisel"
+msgstr "tõrge signaali SIGWINCH blokkimisel"
 
 #: dselect/baselist.cc:89
 msgid "failed to set new SIGWINCH sigact"
-msgstr ""
+msgstr "tõrge signaalile SIGWINCH uue sigact'i määramisel"
 
 #: dselect/baselist.cc:126
 msgid "failed to allocate colour pair"
@@ -94,7 +94,7 @@ msgstr "tõrge pealkirjaakna loomisel"
 
 #: dselect/baselist.cc:170
 msgid "failed to create whatinfo window"
-msgstr ""
+msgstr "tõrge teabeakna loomisel"
 
 #: dselect/baselist.cc:174
 msgid "failed to create baselist pad"
@@ -133,7 +133,7 @@ msgstr ""
 
 #: dselect/baselist.cc:259
 msgid "Keybindings"
-msgstr ""
+msgstr "Klahviseosed"
 
 #: dselect/baselist.cc:307
 #, c-format
@@ -241,7 +241,7 @@ msgstr ""
 
 #: dselect/bindings.cc:151
 msgid "Search for a package whose name contains a string"
-msgstr ""
+msgstr "Pakkide otsimine paki nimes sisalduva stringi järgi"
 
 #: dselect/bindings.cc:152
 msgid "Repeat last search."
@@ -564,8 +564,8 @@ msgid ""
 "  /                search (just return to cancel)\n"
 "  \\                repeat last search\n"
 msgstr ""
-"Liikumisklahvid: Eelmine/Järgmine, Algusesse/Lõppu, Üles/Alla, "
-"Edasi/Tagasi:\n"
+"Liikumisklahvid: Eelmine/Järgmine, Algusesse/Lõppu, Üles/Alla, Edasi/"
+"Tagasi:\n"
 "  j, Nool alla          k, Nool üles            valiku liigutamine\n"
 "  N, Page-down, Tühik   P, Page-up, Backspace   nimekirja kerimine lehe "
 "võrra\n"
@@ -576,7 +576,7 @@ msgstr ""
 "  ^u                    ^d                      teabe kerimine rea võrra\n"
 "  B, Left-arrow         F, Right-arrow          külgkerimine 1/3 ekraani "
 "võrra\n"
-"  ^b                    ^f                      kÜlgkerimine ühe märgi "
+"  ^b                    ^f                      külgkerimine ühe märgi "
 "võrra\n"
 "(Need klahvid on samad, mis pakkide nimekirja kuvas.)\n"
 "\n"
@@ -685,7 +685,7 @@ msgstr ""
 #: dselect/main.cc:147
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
-msgstr ""
+msgstr "Debiani `%s' pakihaldusprogrammi kasutajaliidese versioon %s.\n"
 
 #: dselect/main.cc:150
 msgid ""
@@ -786,7 +786,7 @@ msgstr "Lubamatu %s `%s'\n"
 
 #: dselect/main.cc:253
 msgid "screen part"
-msgstr ""
+msgstr "ekraani osa"
 
 #: dselect/main.cc:259
 msgid "Null colour specification\n"
@@ -878,11 +878,11 @@ msgstr "tõrge funktsioonis doupdate"
 
 #: dselect/methlist.cc:168
 msgid "failed to unblock SIGWINCH"
-msgstr ""
+msgstr "tõrge SIGWINCH signaalilt blokeeringu eemaldamisel"
 
 #: dselect/methlist.cc:172
 msgid "failed to re-block SIGWINCH"
-msgstr ""
+msgstr "tõrge SIGWINCH signaali uuesti blokkimisel"
 
 #: dselect/methlist.cc:173
 msgid "getch failed"
@@ -898,7 +898,7 @@ msgstr "Selgitus"
 
 #: dselect/methlist.cc:200
 msgid "No explanation available."
-msgstr ""
+msgstr "Selgitust pole saadaval."
 
 #: dselect/method.cc:64
 #, c-format
@@ -1030,7 +1030,7 @@ msgstr ""
 
 #: dselect/methparse.cc:143
 msgid "EOF in index string"
-msgstr ""
+msgstr "faililõputunnus indeksistringis"
 
 #: dselect/methparse.cc:146
 msgid "index string too long"
@@ -1042,7 +1042,7 @@ msgstr ""
 
 #: dselect/methparse.cc:151
 msgid "EOF before option name start"
-msgstr ""
+msgstr "faililõputunnus enne valiku nime algust"
 
 #: dselect/methparse.cc:155
 msgid "nonalpha where option name start wanted"
@@ -1054,19 +1054,19 @@ msgstr ""
 
 #: dselect/methparse.cc:160
 msgid "EOF in option name"
-msgstr ""
+msgstr "faililõputunnus valiku nimes"
 
 #: dselect/methparse.cc:165
 msgid "newline before summary"
-msgstr ""
+msgstr "reavahetus enne kokkuvõtet"
 
 #: dselect/methparse.cc:167
 msgid "EOF before summary"
-msgstr ""
+msgstr "faililõputunnus enne kokkuvõtet"
 
 #: dselect/methparse.cc:173
 msgid "EOF in summary - missing newline"
-msgstr ""
+msgstr "faililõputunnus kokkuvõttes - puudub reavahetus"
 
 #: dselect/methparse.cc:183
 #, c-format
@@ -1160,7 +1160,7 @@ msgstr "lahtipakitud (üles seadmata)"
 
 #: dselect/pkgdisplay.cc:54
 msgid "failed config"
-msgstr ""
+msgstr "tõrge seadistamisel"
 
 #: dselect/pkgdisplay.cc:55
 msgid "installed"
@@ -1204,7 +1204,7 @@ msgstr ""
 
 #: dselect/pkgdisplay.cc:67
 msgid "!Bug!"
-msgstr ""
+msgstr "!Viga"
 
 #: dselect/pkgdisplay.cc:68
 msgid "Unclassified"
@@ -1408,19 +1408,19 @@ msgstr " (oleku järgi)"
 
 #: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
-msgstr ""
+msgstr " märgi:+/=/- vähem:v abi:?"
 
 #: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
-msgstr ""
+msgstr " märgi:+/=/- rohkem:v abi:?"
 
 #: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
-msgstr ""
+msgstr " vähem:v abi:?"
 
 #: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
-msgstr " jutukam:v abi:?"
+msgstr " rohkem:v abi:?"
 
 #: dselect/pkginfo.cc:82
 msgid ""

dselect/po/fr.po

@@ -673,7 +673,8 @@ msgstr ""
 
 #: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
-msgstr "Affichage, 2e partie : surlignage de la liste ; affichage d'informations"
+msgstr ""
+"Affichage, 2e partie : surlignage de la liste ; affichage d'informations"
 
 #: dselect/helpmsgs.cc:147
 msgid ""
@@ -1241,7 +1242,8 @@ msgstr "script de requ
 #: dselect/methparse.cc:53
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
-msgstr "erreur de syntaxe dans le fichier des options de méthode « %.250s » -- %s"
+msgstr ""
+"erreur de syntaxe dans le fichier des options de méthode « %.250s » -- %s"
 
 #: dselect/methparse.cc:58
 #, c-format
@@ -1251,7 +1253,8 @@ msgstr "erreur de lecture sur le fichier des options
 #: dselect/methparse.cc:86
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
-msgstr "impossible de lire le répertoire « %.250s » pour récupérer les méthodes"
+msgstr ""
+"impossible de lire le répertoire « %.250s » pour récupérer les méthodes"
 
 #: dselect/methparse.cc:100
 #, c-format
@@ -1270,7 +1273,8 @@ msgstr "impossible de lire le fichier des options de m
 
 #: dselect/methparse.cc:140
 msgid "non-digit where digit wanted"
-msgstr "caractère non numérique rencontré alors qu'un caractère numérique est attendu"
+msgstr ""
+"caractère non numérique rencontré alors qu'un caractère numérique est attendu"
 
 #: dselect/methparse.cc:143
 msgid "EOF in index string"
@@ -1322,7 +1326,8 @@ msgstr "impossible d'ouvrir le fichier de description d'option
 #: dselect/methparse.cc:187
 #, c-format
 msgid "unable to stat option description file `%.250s'"
-msgstr "impossible d'analyser le nouveau fichier de description d'option « %.250s »"
+msgstr ""
+"impossible d'analyser le nouveau fichier de description d'option « %.250s »"
 
 #: dselect/methparse.cc:191
 #, c-format
@@ -1806,4 +1811,3 @@ msgstr "Vers. inst"
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Vers. dispo."
-

dselect/po/ko.po

@@ -1,15 +1,16 @@
 # Chu-yeon Park <kokids@debian.org>, 2001.
 # Eungkyu Song <eungkyu@sparcs.kaist.ac.kr>, 2001.
 # Changwoo Ryu <cwryu@debian.org>, 2004.
+# Sunjae Park <darehanl@gmail.com>, 2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2007-05-08 04:15+0300\n"
-"PO-Revision-Date: 2006-12-29 08:18+0900\n"
-"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
-"Language-Team: Korean <cwryu@debian.org>\n"
+"PO-Revision-Date: 2007-09-16 22:55-0400\n"
+"Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
+"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -29,7 +30,7 @@ msgstr "도움말: "
 #: dselect/basecmds.cc:177
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
-"도움말 메뉴는 ?, 다음 주제는 ., 도움말을 나가려면 <space>를 누르십시오."
+"도움말 메뉴는 ?, 다음 주제는 ., 도움말에서 나가시려면 <space>를 누르십시오."
 
 #: dselect/basecmds.cc:184
 msgid "Help information is available under the following topics:"
@@ -137,7 +138,6 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-#, fuzzy
 msgid "Keybindings"
 msgstr "키바인딩"
 
@@ -301,7 +301,6 @@ msgid "Keystrokes"
 msgstr "키 입력"
 
 #: dselect/helpmsgs.cc:25
-#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -333,7 +332,7 @@ msgid ""
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "이동 키: 이전/다음, 처음/끝, 위/아래, 앞/뒤:\n"
-"  n, 아래 화살표         p, 위 화살표            반전 막대 이동\n"
+"  j, 아래 화살표         k, 위 화살표            반전 막대 이동\n"
 "  N, Page-down, 스페이스 P, Page-up, 백스페이스  한 페이지 단위로 목록 스크"
 "롤\n"
 "  ^n                     ^p                      한 줄 단위로 목록 스크롤\n"
@@ -357,7 +356,7 @@ msgstr ""
 "   Q     확인, 끝내기 (의존성 무시)           o, O  정렬 옵션 순환\n"
 " X, Esc  나가기, 어떠한 바뀐 사항도 무시      v, V  상태 표시 옵션 바꾸기\n"
 "   R     이 목록 전 상태로 되돌리기            ^l   화면 다시 그리기\n"
-"   U     모두 제안하는 상태로                   /   찾기 (취소하려면 Return\n"
+"   U     모두 제안하는 상태로                   /   찾기 (취소하려면 엔터)\n"
 "   D     모두 직접 요청된 상태로                \\  마지막 찾기 반복\n"
 
 #: dselect/helpmsgs.cc:51
@@ -685,7 +684,6 @@ msgid "Keystrokes for method selection"
 msgstr "설치 방법 선택, 키 입력"
 
 #: dselect/helpmsgs.cc:191
-#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -710,7 +708,7 @@ msgid ""
 "  \\                repeat last search\n"
 msgstr ""
 "이동 키: 이전/다음, 처음/끝, 위/아래, 앞/뒤:\n"
-"  n, 아래 화살표         p, 위 화살표            반전 막대 이동\n"
+"  j, 아래 화살표         k, 위 화살표            반전 막대 이동\n"
 "  N, Page-down, 스페이스 P, Page-up, 백스페이스  한 페이지 단위로 목록 스크"
 "롤\n"
 "  ^n                     ^p                      한 줄 단위로 목록 스크롤\n"
@@ -1036,9 +1034,8 @@ msgid "[none]"
 msgstr "[없음]"
 
 #: dselect/methlist.cc:191
-#, fuzzy
 msgid "Explanation"
-msgstr "설명 : "
+msgstr "설명"
 
 #: dselect/methlist.cc:200
 msgid "No explanation available."
@@ -1372,7 +1369,7 @@ msgstr "꾸러미는 다음 꾸러미에 선의존:"
 
 #: dselect/pkgdisplay.cc:75
 msgid "breaks with"
-msgstr ""
+msgstr "망가뜨림"
 
 #: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
@@ -1587,25 +1584,21 @@ msgstr ""
 
 # FIXME: bad msgid
 #: dselect/pkginfo.cc:95
-#, fuzzy
 msgid "Interrelationships"
 msgstr "꾸러미 관계"
 
 # FIXME: bad msgid
 #: dselect/pkginfo.cc:112
-#, fuzzy
 msgid "No description available."
 msgstr "상세 설명 없음."
 
 #: dselect/pkginfo.cc:130
-#, fuzzy
 msgid "Installed control file information"
-msgstr "설치된 제어 정보 : "
+msgstr "설치된 제어 파일 정보 "
 
 #: dselect/pkginfo.cc:146
-#, fuzzy
 msgid "Available control file information"
-msgstr "제어 파일 정보의 유효 버전"
+msgstr "현재 있는 제어 파일 정보"
 
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"

dselect/po/pt.po

@@ -331,7 +331,8 @@ msgstr ""
 "  j, Seta-baixo         k, Seta-cima            mover destaque\n"
 "  N, Page-down, Espaço  P, Page-up, Backspace   rolar lista em 1 página\n"
 "  ^n                    ^p                      rolar lista em 1 linha\n"
-"  t, Home               e, End                  saltar p/ topo/final da lista\n"
+"  t, Home               e, End                  saltar p/ topo/final da "
+"lista\n"
 "  u                     d                       rolar info. em 1 página\n"
 "  ^u                    ^d                      rolar info. em 1 linha\n"
 "  B, Seta-esquerda      F, Seta-direita         mover ecrã em 1/3\n"
@@ -339,14 +340,18 @@ msgstr ""
 "\n"
 "Marcar pacotes para processamento posterior:\n"
 " +, Insert  instalar ou actualizar   =, H  manter no estado actual\n"
-" -, Delete  remover                  :, G  largar: actualizar ou deixar desinstalado\n"
+" -, Delete  remover                  :, G  largar: actualizar ou deixar "
+"desinstalado\n"
 " _          remover & purgar configuração\n"
 "                                            Miscelânea:\n"
-"Quit, exit, sobrescrever (note maiúsc.!)     ?, F1 pedir ajuda (também Ajuda)\n"
+"Quit, exit, sobrescrever (note maiúsc.!)     ?, F1 pedir ajuda (também "
+"Ajuda)\n"
 " Return  Confirm, sair (verificar depend.)   i, I  muda/circula por telas de "
 "opções.\n"
-"   Q     Confirma, deixa (ignora depend.)    o, O  circ. por opc. de classif.\n"
-" X, Esc, eXit, abandonar alterações          v, V mudar opções de mostrar estado\n"
+"   Q     Confirma, deixa (ignora depend.)    o, O  circ. por opc. de "
+"classif.\n"
+" X, Esc, eXit, abandonar alterações          v, V mudar opções de mostrar "
+"estado\n"
 "   R     Reverte ao estado antes desta lista ^l   redesenhar ecrã\n"
 "   U     colocar tudo no estado sUgerido      /    procurar (Enter p/"
 "cancelar)\n"
@@ -715,11 +720,13 @@ msgid ""
 "  /                search (just return to cancel)\n"
 "  \\                repeat last search\n"
 msgstr ""
-"Teclas de movimentação: Próx./Anterior, Topo/Final, Cima/Baixo, Trás/Frente:\n"
+"Teclas de movimentação: Próx./Anterior, Topo/Final, Cima/Baixo, Trás/"
+"Frente:\n"
 "  j, Seta-baixo         k, Seta-cima            mover destaque\n"
 "  N, Page-down, Espaço  P, Page-up, Backspace   rolar lista em 1 página\n"
 "  ^n                    ^p                      rolar lista em 1 linha\n"
-"  t, Home               e, End                  saltar p/topo/final da lista\n"
+"  t, Home               e, End                  saltar p/topo/final da "
+"lista\n"
 "  u                     d                       rolar info. em 1 página\n"
 "  ^u                    ^d                      rolar info. em 1 linha\n"
 "  B, Seta-esquerda      F, Seta-direita         rolar 1/3 da tela p/o lado\n"

dselect/po/ro.po

@@ -25,7 +25,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n"
+"Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #  spațiile sunt necesare!!
@@ -1133,7 +1134,8 @@ msgstr "nu pot aștepta după %.250s"
 #: dselect/method.cc:175
 #, c-format
 msgid "got wrong child's status - asked for %ld, got %ld"
-msgstr "am recepționat o stare greșită a procesului-fiu - cerut %ld, recepționat %ld"
+msgstr ""
+"am recepționat o stare greșită a procesului-fiu - cerut %ld, recepționat %ld"
 
 #: dselect/method.cc:186
 #, c-format
@@ -1761,4 +1763,3 @@ msgstr "Ver.disp"
 
 #~ msgid "available version of control info for "
 #~ msgstr "versiune disponibilă a informației de control pentru"
-

dselect/po/ru.po

@@ -1,21 +1,21 @@
-# translation of dselect-ru.po to Russian
+# translation of ru.po to Russian
 # Localization file for dpkg and other programs from dpkg package.
 # Copyright (C) 1999 Michael Sobolev
 #
 # Michael Sobolev <mss@transas.com>, 1999.
-# Yuri Kozlov <kozlov.y@gmail.com>, 2004, 2005, 2006.
+# Yuri Kozlov <kozlov.y@gmail.com>, 2004, 2005, 2006, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_po_ru\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2007-05-08 04:15+0300\n"
-"PO-Revision-Date: 2006-10-07 18:03+0400\n"
+"PO-Revision-Date: 2007-08-05 23:02+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.2\n"
+"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -144,9 +144,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-#, fuzzy
 msgid "Keybindings"
-msgstr "горячие клавиши"
+msgstr "Горячие клавиши"
 
 #: dselect/baselist.cc:307
 #, c-format
@@ -305,7 +304,6 @@ msgid "Keystrokes"
 msgstr "Горячие клавиши"
 
 #: dselect/helpmsgs.cc:25
-#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -337,7 +335,7 @@ msgid ""
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Клавиши перемещения: След/Пред, Нач/Кон, Верх/Низ, Назад/Вперёд:\n"
-"  стрелка вниз, j      стрелка вверх, k     перемещение выделения\n"
+"  j, стрелка вниз,      k, стрелка вверх,     перемещение выделения\n"
 "  N, PageDown, пробел     P, PageUp, Backspace    прокрутка списка на "
 "страницу\n"
 "  ^n                      ^p                      прокрутка списка на "
@@ -352,6 +350,7 @@ msgstr ""
 "                                                   на 1/3 экрана\n"
 "  ^b                      ^f                      прокрутка в сторону\n"
 "                                                   на 1 колонку\n"
+"\n"
 "Пометка пакетов для дальнейшей обработки:\n"
 " +, Insert  установить или обновить  =, H  зафиксировать в текущем "
 "состоянии\n"
@@ -361,16 +360,15 @@ msgstr ""
 "                                             Различные:\n"
 "Выход, перезапись (капитализация важна!):     ?, F1 вызов справки (также "
 "Help)\n"
-"  Ввод  Подтвердить и выйти, проверив         i, I  переключение экранов\n"
-"        зависимости                                 информации\n"
-"   Q    Подтвердить и выйти, не проверяя      o, O  переключение порядка\n"
-"        зависимости                                 сортировки\n"
-" X, Esc Выйти, отменив все изменения          v, V  изменить экран "
+"  Ввод  Подтвердить, выйти (проверка зависимостей) i, I  переключение "
+"экранов\n"
+"   Q    Подтвердить, выйти (не проверяя)      o, O  переключение порядка\n"
+" X, Esc Выйти, отменить все изменения         v, V  изменить экран "
 "состояния\n"
 "   R    Вернуться к предыдущему состоянию      ^l   перерисовать экран\n"
 "   U    Установить предложенное программой      /   поиск (ввод для отмены)\n"
 "        состояние для всех пакетов\n"
-"   D    Установить непосредственно              \\   повторить последний "
+"   D    Установить непосредственно            n, \\   повторить последний "
 "поиск\n"
 "        затребованное состояние для всех пакетов\n"
 
@@ -710,7 +708,6 @@ msgid "Keystrokes for method selection"
 msgstr "Горячие клавиши при выборе метода доступа"
 
 #: dselect/helpmsgs.cc:191
-#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -735,7 +732,7 @@ msgid ""
 "  \\                repeat last search\n"
 msgstr ""
 "Клавиши перемещения: След/Пред, Нач/Кон, Верх/Низ, Назад/Вперёд:\n"
-"  n, стрелка вниз, j      p, стрелка вверх, k     перемещение выделения\n"
+"  j, стрелка вниз       k, стрелка вверх     перемещение выделения\n"
 "  N, PageDown, пробел     P, PageUp, Backspace    прокрутка списка на "
 "страницу\n"
 "  ^n                      ^p                      прокрутка списка на "
@@ -750,14 +747,14 @@ msgstr ""
 "                                                   на 1/3 экрана\n"
 "  ^b                      ^f                      прокрутка в сторону\n"
 "                                                   на 1 колонку\n"
-"(Это те же клавиши перемещения, что и в списке пакетов)\n"
+"(Это те же клавиши перемещения, что и в списке пакетов.)\n"
 "\n"
-"Выход:ъ\n"
-"  Ввод             выбрать выделенный метод и перейти к диалогу его "
+"Выход:\n"
+"  Return, Enter    выбрать выделенный метод и перейти к диалогу его "
 "настройки\n"
 "  x, X             выйти, не изменяя используемый метод установки\n"
 "\n"
-"Различные:\n"
+"Различное:\n"
 "  ?, Help, F1      вызов справки\n"
 " ^l                перерисовать экран\n"
 "  /                поиск (ввод для отмены)\n"
@@ -1067,9 +1064,8 @@ msgid "[none]"
 msgstr "[нет]"
 
 #: dselect/methlist.cc:191
-#, fuzzy
 msgid "Explanation"
-msgstr "описание метода "
+msgstr "Описание метода"
 
 #: dselect/methlist.cc:200
 msgid "No explanation available."
@@ -1092,7 +1088,7 @@ msgid ""
 "Press <enter> to continue."
 msgstr ""
 "\n"
-"Чтобы продолжить, нажмите ввод."
+"Чтобы продолжить, нажмите <ввод>."
 
 #: dselect/method.cc:144
 #, c-format
@@ -1410,7 +1406,7 @@ msgstr "требует предварительной установки"
 
 #: dselect/pkgdisplay.cc:75
 msgid "breaks with"
-msgstr ""
+msgstr "ломает"
 
 #: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
@@ -1625,24 +1621,20 @@ msgstr ""
 "позволит отмечать пакеты, пользуясь широким набором критериев."
 
 #: dselect/pkginfo.cc:95
-#, fuzzy
 msgid "Interrelationships"
-msgstr "зависимости "
+msgstr "зависимости"
 
 #: dselect/pkginfo.cc:112
-#, fuzzy
 msgid "No description available."
-msgstr "описание отсутствует."
+msgstr "Описание отсутствует."
 
 #: dselect/pkginfo.cc:130
-#, fuzzy
 msgid "Installed control file information"
-msgstr "информация об установленной версии пакета "
+msgstr "Установлена информация из файла control"
 
 #: dselect/pkginfo.cc:146
-#, fuzzy
 msgid "Available control file information"
-msgstr "информация о доступной версии"
+msgstr "Доступна информация из файла control"
 
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
@@ -1741,18 +1733,3 @@ msgstr "Уст.верс."
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Дост.верс."
-
-#~ msgid "interrelationships affecting "
-#~ msgstr "зависимости с участием "
-
-#~ msgid "description of "
-#~ msgstr "описание пакета "
-
-#~ msgid "description"
-#~ msgstr "описание"
-
-#~ msgid "currently installed control info"
-#~ msgstr "информация об установленной версии"
-
-#~ msgid "available version of control info for "
-#~ msgstr "информация о доступной версии пакета "

dselect/po/sv.po

@@ -1,17 +1,16 @@
 # Swedish translation of dpkg
-# Copyright 1999-2006 Software in the Public Interest
-# Peter Karlsson <peterk@debian.org>, 1999-2005.
+# Copyright 1999-2007 Software in the Public Interest
+# Peter Karlsson <peterk@debian.org>, 1999-2007.
 # Daniel Nylander <po@danielnylander.se>, 2006.
-# $Id$
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dselect\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2007-05-08 04:15+0300\n"
-"PO-Revision-Date: 2006-10-05 13:22-0700\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"PO-Revision-Date: 2007-07-29 11:58-0100\n"
+"Last-Translator: Peter Karlsson <peterk@debian.org>\n"
+"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -138,11 +137,9 @@ msgstr ""
 " whatinfo_row=%d, list_row=%d;\n"
 "\n"
 
-# ??
 #: dselect/baselist.cc:259
-#, fuzzy
 msgid "Keybindings"
-msgstr "tangentbordsbindningar"
+msgstr "Tangentbindningar"
 
 #: dselect/baselist.cc:307
 #, c-format
@@ -301,7 +298,6 @@ msgid "Keystrokes"
 msgstr "Tangenter"
 
 #: dselect/helpmsgs.cc:25
-#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -333,7 +329,7 @@ msgid ""
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Rörelsetangenter: Nästa/Föregående, Början/Slut, Upp/Ner, Framåt/Bakåt:\n"
-"  Nedåtpil, j           Uppåtpil, k             flytta markeringsrad\n"
+"  j, Nedåtpil           k, Uppåtpil             flytta markeringsrad\n"
 "  N, PgDn, blanksteg    P, PgUp, backsteg       rulla listan en sida\n"
 "  ^n                    ^p                      rulla listan en rad\n"
 "  t, Home               e, End                  början/slutet av listan\n"
@@ -513,8 +509,7 @@ msgstr ""
 "mellan dem, paketbeskrivningarna och den interna kontrollinformationen.\n"
 "\n"
 "En samling \"föreslagna\" paket har beräknats, och de ursprungliga\n"
-"inställningarna i denna underlista har satts till att matcha dessa, så att "
-"du\n"
+"inställningarna i underlistan har satts till att matcha dessa, så att du\n"
 "helt enkelt kan trycka Enter för att acceptera valen om du vill. Du kan\n"
 "avbryta ändringarna som orsakade problemen och gå tillbaka till huvudlistan\n"
 "genom att trycka ett versalt \"X\".\n"
@@ -584,7 +579,7 @@ msgstr ""
 " paket i dessa { \"U\"   - uppackat, men ännu ej konfigurerat\n"
 "     tillstånd { \"C\"   - halvt konfigurerat (ett fel uppstod)\n"
 "    är trasiga { \"I\"   - halvt installerat (ett fel uppstod)\n"
-" Gammal markering: vad som önskades innan denna lista visades\n"
+" Gammal markering: vad som önskades innan listan visades\n"
 " Markering: vad önskas för detta paket:\n"
 "  \"*\": markerat för att installeras eller uppgraderas\n"
 "  \"-\": markerat för att tas bort, men att behålla konfigurationsfilerna\n"
@@ -684,7 +679,7 @@ msgstr ""
 "dselect och dpkg kan göra automatiska installationer genom att ladda paket-\n"
 "filerna från en av flera olika platser.\n"
 "\n"
-"Denna lista låter dig välja en av dessa installationsmetoder.\n"
+"Listan låter dig välja en av dessa installationsmetoder.\n"
 "\n"
 "Flytta markeringsraden till den metod du vill använda och tryck Enter. Nu\n"
 "kommer du frågas om krävd information för att genomföra installationen.\n"
@@ -705,7 +700,6 @@ msgid "Keystrokes for method selection"
 msgstr "Tangenter för metodval"
 
 #: dselect/helpmsgs.cc:191
-#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -730,7 +724,7 @@ msgid ""
 "  \\                repeat last search\n"
 msgstr ""
 "Rörelsetangenter: Nästa/Föregående, Början/Slut, Upp/Ner, Framåt/Bakåt:\n"
-"  n, nedåtpil, j        p, uppåtpil, k          flytta markeringsrad\n"
+"  j, Nedåtpil           k, Uppåtpil             flytta markeringsrad\n"
 "  N, PgDn, blanksteg    P, PgUp, backsteg       rulla listan en sida\n"
 "  ^n                    ^p                      rulla listan en rad\n"
 "  t, Home               e, End                  början/slutet av listan\n"
@@ -741,7 +735,7 @@ msgstr ""
 "(Detta är samma förflyttningstangenter som i paketlistan.)\n"
 "\n"
 "Avsluta:\n"
-" Enter   väljer denna metod och går till dess konfigurationsdialog\n"
+" Enter   väljer metoden och går till dess konfigurationsdialog\n"
 " x, X    avslutar utan att ändra eller ställa in installationsmetoden\n"
 "\n"
 "Diverse:\n"
@@ -902,8 +896,8 @@ msgid ""
 "  --license | --licence      Show the license.\n"
 "\n"
 msgstr ""
-"  --help                     Visa det här hjälpmeddelandet.\n"
-"  --version                  Visa versionen.\n"
+"  --help                     Visa detta hjälpmeddelande.\n"
+"  --version                  Visa versionsnummer.\n"
 "  --license | --licence      Visa licensen.\n"
 "\n"
 
@@ -1050,9 +1044,8 @@ msgid "[none]"
 msgstr "[ingen]"
 
 #: dselect/methlist.cc:191
-#, fuzzy
 msgid "Explanation"
-msgstr "förklaring av "
+msgstr "Förklaring"
 
 #: dselect/methlist.cc:200
 msgid "No explanation available."
@@ -1386,7 +1379,7 @@ msgstr "beror i f
 
 #: dselect/pkgdisplay.cc:75
 msgid "breaks with"
-msgstr ""
+msgstr "förstörs med"
 
 #: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
@@ -1601,24 +1594,20 @@ msgstr ""
 "själv möjligheten att markera paket i olika sorters grupper."
 
 #: dselect/pkginfo.cc:95
-#, fuzzy
 msgid "Interrelationships"
-msgstr "beroenden"
+msgstr "Inbördes beroenden"
 
 #: dselect/pkginfo.cc:112
-#, fuzzy
 msgid "No description available."
-msgstr "ingen beskrivning finns."
+msgstr "Ingen beskrivning finns."
 
 #: dselect/pkginfo.cc:130
-#, fuzzy
 msgid "Installed control file information"
-msgstr "installerad kontrollinfo för "
+msgstr "Installerad kontrollfilsinformation för "
 
 #: dselect/pkginfo.cc:146
-#, fuzzy
 msgid "Available control file information"
-msgstr "tillgänglig version av kontrollinfo för"
+msgstr "Tillgänglig kontrollfilsinformation för"
 
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"

getopt/.gitignore

@@ -1,4 +1,5 @@
 *.a
+*.o
 .deps
 Makefile
 Makefile.in

lib/.gitignore

@@ -1,4 +1,5 @@
 *.a
+*.o
 .deps
 Makefile
 Makefile.in

lib/mlib.c

@@ -118,8 +118,8 @@ int checksubprocerr(int status, const char *description, int flags) {
   } else if (WIFSIGNALED(status)) {
     n= WTERMSIG(status); if (!n || ((flags & PROCPIPE) && n==SIGPIPE)) return 0;
     if (flags & PROCWARN)
-      ohshit(_("dpkg: warning - %s killed by signal (%s)%s\n"),
-	     description, strsignal(n), WCOREDUMP(status) ? _(", core dumped") : "");
+      fprintf(stderr, _("dpkg: warning - %s killed by signal (%s)%s\n"),
+              description, strsignal(n), WCOREDUMP(status) ? _(", core dumped") : "");
     else
       ohshit(_("subprocess %s killed by signal (%s)%s"),
 	     description, strsignal(n), WCOREDUMP(status) ? _(", core dumped") : "");

lib/parsehelp.c

@@ -36,8 +36,14 @@ void parseerr
   va_list al;
   char buf1[768], buf2[1000], *p, *q;
   if (file && ferror(file)) ohshite(_("failed to read `%s' at line %d"),filename,lno);
-  sprintf(buf1, _("%s, in file `%.255s' near line %d"),
-          warnonly ? _("warning") : _("parse error"), filename, lno);
+
+  if (warnonly)
+    sprintf(buf1, _("warning, in file `%.255s' near line %d"),
+            filename, lno);
+  else
+    sprintf(buf1, _("parse error, in file `%.255s' near line %d"),
+            filename, lno);
+
   if (pigp && pigp->name) {
     sprintf(buf2, _(" package `%.255s'"), pigp->name);
     strcat(buf1,buf2);

m4/perl.m4

@@ -4,4 +4,6 @@
 AC_DEFUN([DPKG_PROG_PERL],
 [AC_ARG_VAR([PERL], [Perl interpreter])dnl
 AC_PATH_PROG([PERL], [perl], [/usr/bin/perl])dnl
+AC_ARG_VAR([PERL_LIBDIR], [Perl library directory])dnl
+PERL_LIBDIR=`$PERL -MConfig -e 'print $Config{vendorlib}'`dnl
 ])# DPKG_PROG_PERL

man/ChangeLog

@@ -1,3 +1,138 @@
+2007-09-15  Guillem Jover  <guillem@debian.org>
+
+	* po/dpkg-man.pot: Regenerated.
+	* po/*.po: Merged with dpkg-man.pot.
+
+2007-09-09  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* po/de.po: Updated to 1254t135f.
+
+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
+	compressed Packages files for apt.
+
+2007-09-05  Peter Karlsson  <peterk@debian.org>
+
+	* po/sv.po: Updated to 1289t.
+
+2007-09-05  Guillem Jover  <guillem@debian.org>
+
+	* po/dpkg-man.pot: Regenerated.
+	* po/*.po: Merged with dpkg-man.pot.
+
+2007-08-31  Guillem Jover  <guillem@debian.org>
+
+	* deb-control.5: Document Tag field.
+	* dpkg-query.1: Document Tag as a recognized field.
+
+2007-08-25  Peter Karlsson  <peterk@debian.org>
+
+	* po/sv.po: Updated to 1285t.
+
+2007-08-20  Guillem Jover  <guillem@debian.org>
+
+	* deb-control.5: Document Homepage field.
+	* dpkg-query.1: Document Homepage as a recognized field.
+
+2007-08-18  Guillem Jover  <guillem@debian.org>
+
+	* po/dpkg-man.pot: Regenerated.
+	* po/*.po: Merged with dpkg-man.pot.
+
+2007-08-14  Robert Luberda  <robert@debian.org>
+
+	* po/pl.po: Update to 1002t14f269u.
+
+2007-08-05  Peter Karlsson  <peterk@debian.org>
+
+	* po/sv.po: Updated to 1282t.
+
+2007-08-05  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* po/de.po: Updated to 1111t6f165u.
+
+2007-07-31  Peter Karlsson  <peterk@debian.org>
+
+	* po/sv.po, po/sv.add: Updated to 991t291u.
+
+2007-07-21  Guillem Jover  <guillem@debian.org>
+
+	* po/dpkg-man.pot: Regenerated.
+	* po/*.po: Merged with dpkg-man.pot.
+
+2007-07-18  Guillem Jover  <guillem@debian.org>
+
+	* cleanup-info.8: Unify author and copyright information formatting.
+	* deb-substvars.5: Likewise.
+	* dpkg-checkbuilddeps.1: Likewise.
+	* dpkg-deb.1: Likewise.
+	* dpkg-divert.8: Likewise.
+	* dpkg-name.1: Likewise.
+	* dpkg-query.1: Likewise.
+	* dpkg-split.1: Likewise.
+	* dpkg-statoverride.8: Likewise.
+	* install-info.8: Likewise.
+	* update-alternatives.8: Likewise.
+
+2007-07-18  Guillem Jover  <guillem@debian.org>
+
+	* dpkg.1: Split indeendent options.
+	* dpkg-buildpackage.1: Likewise.
+	* dpkg-genchanges.1: Likewise.
+	* dpkg-source.1: Likewise.
+
+2007-07-18  Guillem Jover  <guillem@debian.org>
+
+	* dpkg-buildpackage.1: Remove ', and' leftover from man page split.
+	Substitute 'FILES' with 'SEE ALSO'.
+
+2007-07-18  Guillem Jover  <guillem@debian.org>
+
+	* dpkg-deb.1: Remove space before ellipsis in parameters.
+	* dpkg-query.1: Likewise.
+	* update-alternatives.8: Likewise.
+	* dpkg.1: Likewise. Use commas instead if pipes to separate
+	alternative options. Remove redundant preceding 'dpkg' from options.
+
+2007-07-18  Guillem Jover  <guillem@debian.org>
+
+	* dpkg.1: Fix italics and bold usage.
+	* dpkg-divert.8: Likewise.
+	* dpkg-buildpackage.1: Likewise.
+
+2007-07-10  Frank Lichtenheld  <djpig@debian.org>
+
+	* dpkg.1, dpkg-query.1, dpkg-deb.1: Synchronise
+	usage information between these three man pages.
+	Also fix some formatting oddities and small
+	mistakes.
+
+2007-07-08  Helge Kreutzmann  <debian@helgefjell.de>
+
+	* po/de.po: Updated to 1061t1f219u.
+
+2007-07-04  Frank Lichtenheld  <djpig@debian.org>
+
+	* Makefile.am (uninstall-local): New target to
+	remove the translated man pages. Detected with
+	the help of 'make distcheck'.
+
+2007-07-02  Frank Lichtenheld  <djpig@debian.org>
+
+	* po/dpkg-man.pot: Regenerated.
+	* po/*.po: Merged with dpkg-dev.pot.
+
 2007-06-23  Joachim Breitner  <nomeata@debian.org>
 
 	* de.po: Fix typo ('wir' -> 'wird')
@@ -139,11 +274,11 @@
 	* po/dpkg-man.pot: Regenerated.
 	* po/*.po: Merged with dpkg-man.pot.
 
-2007-03-20  Robert Luberda <robert@debian.org>
+2007-03-20  Robert Luberda  <robert@debian.org>
 
 	* po/pl.po: Update to 974t18f286u.
 
-2007-03-18  Robert Luberda <robert@debian.org>
+2007-03-18  Robert Luberda  <robert@debian.org>
 
 	* po/pl.po: Update to 878t92f308u.
 

man/Makefile.am

@@ -27,6 +27,17 @@ install-data-local:
 		fi \
 	done
 
+uninstall-local:
+	for lang in $(LINGUAS); do \
+		if [ -d $(srcdir)/$$lang ]; then \
+			files=$$(echo $(srcdir)/$$lang/*.[1-9]); \
+			$(MAKE) uninstall-man \
+				mandir="$(mandir)/$$lang" \
+				man_MANS="" \
+				dist_man_MANS="$$files"; \
+		fi \
+	done
+
 dist-hook: man.stamp
 	cp $(srcdir)/man.stamp $(distdir)/
 	for lang in $(LINGUAS); do \

man/cleanup-info.8

@@ -1,4 +1,4 @@
-.TH cleanup\-info 8 "2007-03-06" "Debian Project" "dpkg utilities"
+.TH cleanup\-info 8 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 cleanup\-info \- clean up the mess that bogus install\-info may have done
 .
@@ -52,7 +52,7 @@ Probably many.
 .BR install\-info (8),
 .BR info (1).
 .SH AUTHOR
-Copyright (C) 1996 Kim-Minh Kaplan.
+Copyright (C) 1996 Kim-Minh Kaplan
 .sp
-This is free software; see the GNU General Public Licence
-version 2 or later for copying conditions. There is NO warranty.
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.

man/deb-control.5

@@ -1,6 +1,6 @@
 .\" Author: Raul Miller
 .\" Includes text from the debian Guidelines by Ian Jackson, Ian Murdock
-.TH deb\-control 5 "2007-05-15" "Debian Project" "Debian"
+.TH deb\-control 5 "2007-08-31" "Debian Project" "Debian"
 .SH NAME
 deb\-control \- Debian packages' master control file format
 .
@@ -85,6 +85,13 @@ etc. Note that the
 option is meant for packages that are architecture independent. Some examples
 of this are shell and Perl scripts, and documentation.
 .TP
+.BR Homepage: " <url>"
+The upstream project home page URL.
+.TP
+.BR Tag: " <tag list>"
+List of tags describing the qualities of the package. The description and
+list of supported tags can be found in the \fBdebtags\fP package.
+.TP
 .BR Source: " <source name>"
 The name of the source package that this binary package came from, if
 different than the name of the package itself.
@@ -136,6 +143,14 @@ by a hyphen). Accepted version relationships are ">>" for greater than,
 "<<" for less than, ">=" for greater than or equal to, "<=" for less than
 or equal to, and "=" for equal to.
 .TP
+.BR Breaks: " <package list>"
+Lists packages that this one breaks, for example by exposing bugs
+when the named packages rely on this one. The package maintenance
+software will not allow broken packages to be configured; generally
+the resolution is to upgrade the packages named in a
+.B Breaks
+field.
+.TP
 .BR Conflicts: " <package list>"
 Lists packages that conflict with this one, for example by containing
 files with the same names. The package maintenance software will not
@@ -205,5 +220,6 @@ Description: GNU grep, egrep and fgrep.
 .
 .SH SEE ALSO
 .BR deb (5),
+.BR debtags (1),
 .BR dpkg (1),
 .BR dpkg-deb (1).

man/deb-substvars.5

@@ -1,5 +1,5 @@
 .\" Authors: Ian Jackson
-.TH deb\-substvars 5 "2007-06-12" "Debian Project" "dpkg utilities"
+.TH deb\-substvars 5 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 deb\-substvars \- Debian source substitution variables
 .
@@ -134,12 +134,9 @@ standard output field settings is rather confused.
 .BR dpkg\-source (1).
 .
 .SH AUTHOR
-The utilities and this manpage were written by Ian Jackson.
-.
-.SH COPYRIGHT
 Copyright (C) 1995-1996 Ian Jackson
 .br
 Copyright (C) 2000 Wichert Akkerman
 .sp
-This is free software; see the GNU General Public Licence version 2 or later
-for copying conditions. There is NO WARRANTY.
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.

man/dpkg-buildpackage.1

@@ -1,4 +1,4 @@
-.TH dpkg\-buildpackage 1 "2007-06-12" "Debian Project" "dpkg utilities"
+.TH dpkg\-buildpackage 1 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-buildpackage \- build binary or source packages from sources
 .
@@ -15,7 +15,7 @@ a package.
 .TP
 .B \-b
 Specifies a binary-only build, no source files are to be built and/or
-distributed, and
+distributed.
 .TP
 .B \-B
 Specifies a binary-only build, no architecture independent binary package
@@ -24,19 +24,17 @@ files are to be distributed either.
 .B \-S
 Specifies a source-only build, no binary packages need to be made.
 .PP
-These options control whether the original source archive is included
-in the upload generated by
-.BR dpkg\-buildpackage
-if any source is being generated (i.e.,
+The \fB-s\fP\fIx\fP options control whether the original source archive is
+included in the upload if any source is being generated (i.e.
 .BR \-b " or " \-B
 haven't been used).
 .TP
 .B \-si
-Include the original source if the version number ends in
+By default, or if specified, the original source will be included if the
+version number ends in
 .BR \-0 " or " \-1 ,
 i.e. if the Debian revision part of the version number is
 .BR 0 " or " 1 .
-.B This is the default.
 .TP
 .B \-sa
 Forces the inclusion of the original source.
@@ -76,13 +74,13 @@ Check build dependencies and conflicts; abort if unsatisfied.
 .B \-d
 Do not check build dependencies and conflicts.
 .TP
-.BI \-W
+.B \-W
 Turn certain errors into warnings. Only \fBdpkg\-source\fP uses this, but
 .BR dpkg\-buildpackage
 recognizes it, and passes it thru to
 .BR dpkg\-source "."
 .TP
-.BI \-E
+.B \-E
 Negates a previously set
 .BR \-W "."
 Only \fBdpkg\-source\fP uses this, but
@@ -183,7 +181,7 @@ It should be possible to specify spaces and shell metacharacters in
 and initial arguments for
 .IR gain-root-command " and " sign-command .
 .
-.SH FILES
+.SH "SEE ALSO"
 .BR dpkg\-source (1),
 .BR dpkg\-architecture (1),
 .BR dpkg\-genchanges (1),

man/dpkg-checkbuilddeps.1

@@ -1,4 +1,4 @@
-.TH dpkg\-checkbuilddeps 1 "2007-06-12" "Debian Project" "dpkg utilities"
+.TH dpkg\-checkbuilddeps 1 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-checkbuilddeps \- check build dependencies and conflicts
 .
@@ -29,10 +29,10 @@ be built.
 Show the usage message and exit.
 .
 .SH AUTHOR
-Copyright 2001 Joey Hess
+Copyright (C) 2001 Joey Hess
 .UR mailto:joeyh@debian.org
-<joeyh@debian.org>.
+<joeyh@debian.org>
 .UE
 .sp
 This is free software; see the GNU General Public Licence version 2 or
-later for copying conditions. There is NO warranty.
+later for copying conditions. There is NO WARRANTY.

man/dpkg-deb.1

@@ -1,4 +1,4 @@
-.TH dpkg\-deb 1 "2007-06-12" "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
 .
@@ -76,7 +76,7 @@ option may not be used (since
 needs to read and parse the package control file to determine which
 filename to use).
 .TP
-.BR \-I ", " \-\-info " \fIarchive\fP [\fIcontrol-file-name\fP ...]"
+.BR \-I ", " \-\-info " \fIarchive\fP [\fIcontrol-file-name\fP...]"
 Provides information about a binary package archive.
 
 If no
@@ -97,9 +97,9 @@ 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 ...]"
+.BR \-f ", " \-\-field " \fIarchive\fP [\fIcontrol-field-name\fP...]"
 Extracts control file information from a binary package archive.
 
 If no
@@ -149,7 +149,7 @@ format. Together with
 .BR tar (1)
 this can be used to extract a particular file from a package archive.
 .TP
-.BR \-e ", " \-\-control " \fIarchive directory\fP"
+.BR \-e ", " \-\-control " \fIarchive\fP [\fIdirectory\fP]"
 Extracts the control information files from a package archive into the
 specified directory.
 
@@ -242,11 +242,7 @@ package's scripts run and its status and contents recorded.
 .BR dselect (1).
 .
 .SH AUTHOR
-.B dpkg\-deb
-and this manpage were written by Ian Jackson.
-They are Copyright (C) 1995-1996 by him and released under the
-GNU General Public Licence version 2 or later; there is NO WARRANTY. See
-.I /usr/share/doc/dpkg/copyright
-and
-.I /usr/share/common\-licenses/GPL
-for details.
+Copyright (C) 1995-1996 Ian Jackson
+.sp
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.

man/dpkg-divert.8

@@ -1,4 +1,4 @@
-.TH dpkg\-divert 8 "2007-06-12" "Debian Project" "dpkg utilities"
+.TH dpkg\-divert 8 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-divert \- override a package's version of a file
 .
@@ -11,10 +11,10 @@ dpkg\-divert \- override a package's version of a file
 .B dpkg\-divert
 is the utility used to set up and update the list of diversions.
 .PP
-File `diversions' are a way of forcing
+File \fIdiversions\fP are a way of forcing
 .BR dpkg (1)
 not to install a file into its
-location, but to a `diverted' location. Diversions can be used through the
+location, but to a \fIdiverted\fP location. Diversions can be used through the
 Debian package scripts to move a file away when it causes a conflict. System
 administrators can also use it to override some package's configuration
 file, or whenever some files (which aren't marked as 'conffiles') need to be
@@ -110,16 +110,16 @@ dpkg-divert \-\-package wibble \-\-rename \-\-remove /usr/bin/example
 .I /var/lib/dpkg/diversions
 File which contains the current list of diversions of the system. It is
 located in the dpkg administration directory, along with other files
-important to dpkg, such as `status' or `available'.
+important to dpkg, such as \fIstatus\fP or \fIavailable\fP.
 .br
 Note: \fBdpkg\-divert\fP preserves the old copy of this file, with extension
-"\-old", before replacing it with the new one.
+\fI\-old\fP, before replacing it with the new one.
 .
 .SH SEE ALSO
 .BR dpkg (1).
 .
 .SH AUTHOR
-Copyright (C) 1995 Ian Jackson.
+Copyright (C) 1995 Ian Jackson
 .sp
-This is free software; see the GNU General Public Licence
-version 2 or later for copying conditions. There is NO warranty.
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.

man/dpkg-genchanges.1

@@ -1,4 +1,4 @@
-.TH dpkg\-genchanges 1 "2007-06-12" "Debian Project" "dpkg utilities"
+.TH dpkg\-genchanges 1 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-genchanges \- generate Debian .changes files
 .
@@ -16,6 +16,38 @@ file
 .
 .SH OPTIONS
 .TP
+.BR \-b ", " \-B
+Specifies that a binary-only build is taking place (no source files are
+to be included). There's no distinction between \fB\-b\fP and \fB\-B\fP,
+the produced
+.B .changes
+file will include whatever files were created by the
+.B binary\-*
+target(s) of the package being built.
+.TP
+.B \-S
+Specifies that only the source should be uploaded (no binary packages
+will be included).
+.PP
+The \fB-s\fP\fIx\fP options control whether the original source archive is
+included in the upload if any source is being generated (i.e.
+.BR \-b " or " \-B
+haven't been used).
+.TP
+.B \-si
+By default, or if specified, the original source will be included if the
+version number ends in
+.BR \-0 " or " \-1 ,
+i.e. if the Debian revision part of the version number is
+.BR 0 " or " 1 .
+.TP
+.B \-sa
+Forces the inclusion of the original source.
+.TP
+.B \-sd
+Forces the exclusion of the original source and includes only the diff.
+.fi
+.TP
 .BI \-v version
 Causes changelog information from all versions strictly later than
 .I version
@@ -39,27 +71,6 @@ Use
 as the name and email address of the maintainer for this upload,
 rather than using the information from the source tree's changelog.
 .TP
-.BR \-si ", " \-sa ", " \-sd
-These options control whether the original source archive is included
-in the upload generated by
-.BR dpkg\-genchanges
-if any source is being generated (i.e.,
-.BR \-b " or " \-B
-haven't been used).
-
-By default, or if
-.B \-si
-is specified, the original source will be included if the version
-number ends in
-.BR \-0 " or " \-1 ,
-i.e. if the Debian revision part of the version number is
-.BR 0 " or " 1 .
-
-.B \-sa
-forces the inclusion of the original source;
-.B \-sd
-forces its exclusion and includes only the diff.
-.TP
 .BI \-V name = value
 Set an output substitution variable.
 See \fBdeb\-substvars\fP(5) for a discussion of output substitution.
@@ -76,29 +87,6 @@ Override or add an output control file field.
 .BI \-U field
 Remove an output control file field.
 .TP
-.BR \-b ", " \-B ", " \-S
-For
-.BR dpkg\-genchanges " and " dpkg\-buildpackage
-.BR \-b " and " \-B
-specify that a binary-only build is taking place.
-.B \-b
-indicates that no source files are to be built and/or distributed, and
-.B \-B
-that no architecture-independent binary package files are to be
-distributed either.
-.B \-S
-specifies that only the source should be uploaded and no binary packages
-need to be made. The distinction between
-.BR \-b " and " \-B
-is only used by
-.BR dpkg\-buildpackage ;
-.B dpkg\-genchanges
-just produces a
-.B .changes
-file for whatever files were produced by the
-.B binary\-*
-target(s) of the package being built.
-.TP
 .BI \-c controlfile
 Specifies the main source control file to read information from. The
 default is

man/dpkg-name.1

@@ -3,7 +3,7 @@
 .\"
 .\" This is free software; see the GNU General Public Licence version 2
 .\" or later for copying conditions.  There is NO warranty.
-.TH dpkg\-name 1 "2007-03-06" "Debian Project" "dpkg utilities"
+.TH dpkg\-name 1 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-name \- rename Debian packages to full package names
 .
@@ -102,10 +102,8 @@ might depend on this naming structure.
 .BR find (1),
 .BR xargs (1).
 .
-.SH COPYRIGHT
-Copyright 1995,1996 Erick Branderhorst.
-.B dpkg\-name
-is free software; see the GNU General Public Licence version 2 or
-later for copying conditions. There is
-.B no
-warranty.
+.SH AUTHOR
+Copyright 1995,1996 Erick Branderhorst
+.sp
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.

man/dpkg-query.1

@@ -1,4 +1,4 @@
-.TH dpkg\-query 1 "2007-03-06" "Debian Project" "dpkg suite"
+.TH dpkg\-query 1 "2007-07-18" "Debian Project" "dpkg suite"
 .SH NAME
 dpkg\-query \- a tool to query the dpkg database
 .
@@ -12,7 +12,7 @@ the \fBdpkg\fP database.
 .
 .SH COMMANDS
 .TP
-.BR \-l ", " \-\-list " \fIpackage-name-pattern\fP ..."
+.BR \-l ", " \-\-list " \fIpackage-name-pattern\fP..."
 List packages matching given pattern. If no \fIpackage-name-pattern\fP
 is given, list all packages in \fI/var/lib/dpkg/status\fP, excluding
 the ones marked with state purge. Normal shell wildchars are allowed
@@ -31,29 +31,29 @@ automatically to fit the terminal width. It is intended for human
 readers, and is not easily machine-readable. See \fB\-W\fP (\fB\-\-show\fP)
 and \fB\-\-showformat\fP for a way to configure the output format.
 .TP
-.BR \-W ", " \-\-show " \fIpackage-name-pattern\fP ..."
+.BR \-W ", " \-\-show " \fIpackage-name-pattern\fP..."
 Just like the \fB\-\-list\fP option this will list all packages matching
 the given pattern. However the output can be customized using the
 \fB\-\-showformat\fP option.
 The default output format gives one line per matching package, each line
 having the name and installed version of the package, separated by a tab.
 .TP
-.BR \-s ", " \-\-status " \fIpackage-name\fP ..."
+.BR \-s ", " \-\-status " \fIpackage-name\fP..."
 Report status of specified package. This just displays the entry in
 the installed package status database.
 .TP
-.BR \-L ", " \-\-listfiles " \fIpackage-name\fP ..."
-List files installed to your system from \fBpackage-name\fP.
+.BR \-L ", " \-\-listfiles " \fIpackage-name\fP..."
+List files installed to your system from \fIpackage-name\fP.
 However, note that files created by package-specific
 installation-scripts are not listed.
 .TP
-.BR \-S ", " \-\-search " \fIfilename-search-pattern\fP ..."
+.BR \-S ", " \-\-search " \fIfilename-search-pattern\fP..."
 Search for a filename from installed packages. All standard shell
 wildchars can be used in the pattern. This command will not list
 extra files created by maintainer scripts, nor will it list
 alternatives.
 .TP
-.BR \-p ", " \-\-print\-avail " \fIpackage-name\fP"
+.BR \-p ", " \-\-print\-avail " \fIpackage-name\fP..."
 Display details about \fIpackage-name\fP, as found in
 \fI/var/lib/dpkg/available\fP.
 .TP
@@ -103,11 +103,13 @@ alignment will be used. The following \fIfield\fRs are recognised:
     \fBConffiles\fP
     \fBConfig\-Version\fP
     \fBConflicts\fP
+    \fBBreaks\fP
     \fBDepends\fP
     \fBDescription\fP
     \fBEnhances\fP
     \fBEssential\fP
     \fBFilename\fP
+    \fBHomepage\fP
     \fBInstalled\-Size\fP
     \fBMD5sum\fP
     \fBMSDOS\-Filename\fP
@@ -125,6 +127,7 @@ alignment will be used. The following \fIfield\fRs are recognised:
     \fBSource\fP
     \fBStatus\fP
     \fBSuggests\fP
+    \fBTag\fP
     \fBVersion\fP
 .fi
 
@@ -147,13 +150,13 @@ This setting influences the output of the \fB\-\-list\fP option by changing
 the width of its output.
 .
 .SH AUTHOR
-Copyright 2001 Wichert Akkerman
+Copyright (C) 2001 Wichert Akkerman
 .UR mailto:wakkerma@debian.org
 <wakkerma@debian.org>
 .UE
 .sp
 This is free software; see the GNU General Public Licence version 2 or
-later for copying conditions. There is NO warranty.
+later for copying conditions. There is NO WARRANTY.
 .
 .SH SEE ALSO
 .BR dpkg (1).

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-06-12" "Debian Project" "dpkg utilities"
+.TH dpkg\-scanpackages 1 "2007-09-08" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-scanpackages \- create Packages index files
 .
@@ -43,8 +43,10 @@ of machines.
 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) or
 .BR gzip (1)
-(generating a Packages.gz file). apt ignores uncompressed Packages
+(generatinc a Packages.gz file). apt ignores uncompressed Packages
 files except on local access (i.e.
 .B file://
 sources).

man/dpkg-source.1

@@ -1,5 +1,5 @@
 .\" Authors: Ian Jackson
-.TH dpkg\-source 1 "2007-06-12" "Debian Project" "dpkg utilities"
+.TH dpkg\-source 1 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-source \- Debian source package (.dsc) manipulation tool
 .
@@ -132,59 +132,60 @@ option when it is called to generate a .orig.tar.gz or .tar.gz file. For
 example, \-ICVS will make tar skip over CVS directories when generating
 a .tar.gz file. The option may be repeated multiple times to list multiple
 filenames to exclude.
+.PP
+All the
+.BI \-s X
+options are mutually exclusive. If you specify more than one only the
+last one will be used.
 .TP
-.BR \-sa , \-sp , \-su , \-sk , \-sA , \-sP , \-sU , \-sK , \-ss " with " \-b
-If
-.BR \-sk " or " \-sp
-is specified
-.B dpkg\-source
-expects the original source as a tarfile, by default
+.B Build options (with -b):
+.PP
+.BR \-sa ", " \-sp ", " \-sk ", " \-su " and " \-sr
+will not overwrite existing tarfiles or directories. If this is
+desired then
+.BR \-sA ", " \-sP ", " \-sK ", " \-sU " and " \-sR
+should be used instead.
+.TP
+.BR \-sk
+Specifies to expect the original source as a tarfile, by default
 .IB package _ upstream-version .orig.tar.gz\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
-If
+to the current directory if it isn't already there.
+.TP
 .B \-sp
-is used rather than
+Like
 .B \-sk
-it will remove it again afterwards.
-
-If
-.BR \-su " or " \-sr
-is specified the original source is expected as a directory, by
+but will remove that tarball again afterwards.
+.TP
+.B \-su
+Specifies that the original source is expected as a directory, by
 default
 .IB package - upstream-version .orig
 and
 .B dpkg\-source
-will create a new original source archive from it. If
+will create a new original source archive from it.
+.TP
 .B \-sr
-is used
-.B dpkg\-source will remove that directory after it has been used.
-
-If
+Like
+.B \-su
+but will remove that directory after it has been used.
+.TP
 .B \-ss
-is specified
-.B dpkg\-source
-will expect that the original source is available both as a directory
+Specifies that the original source is available both as a directory
 and as a tarfile. If will use the directory to create the diff, but
 the tarfile to create the
 .BR .dsc .
 This option must be used with care - if the directory and tarfile do
 not match a bad source archive will be generated.
-
-If
+.TP
 .B \-sn
-is specified
-.B dpkg\-source
-will not look for any original source, and will not generate a diff.
+Specifies to not look for any original source, and to not generate a diff.
 The second argument, if supplied, must be the empty string. This is
 used for Debian-specific packages which do not have a separate
 upstream source and therefore have no debianisation diffs.
-
-If
+.TP
 .BR \-sa " or " \-sA
-is specified
-.B dpkg\-source
-will look for the original source archive as a tarfile or as a
+Specifies to look for the original source archive as a tarfile or as a
 directory - the second argument, if any, may be either, or the empty
 string (this is equivalent to using
 .BR \-sn ).
@@ -208,35 +209,24 @@ or raise an error if
 was specified.
 .B \-sA
 is the default.
-
-.BR \-sa ", " \-sp ", " \-sk ", " \-su " and " \-sr
-will not overwrite existing tarfiles or directories. If this is
-desired then
-.BR \-sA ", " \-sP ", " \-sK ", " \-sU " and " \-sR
-should be used instead.
 .TP
-.BR \-sp , \-su , \-sn " with " \-x
+.B Extract options (with \-x):
+.PP
 In all cases any existing original source tree will be removed.
-
-If
+.TP
 .B \-sp
-is used when extracting then the original source (if any) will be left
+Used when extracting then the original source (if any) will be left
 as a tarfile. If it is not already located in the current directory
 or if an existing but different file is there it will be copied there.
-This is the default.
-
+(\fBThis is the default\fP).
+.TP
 .B \-su
-unpacks the original source tree.
-
+Unpacks the original source tree.
+.TP
 .B \-sn
-ensures that the original source is neither copied to the current
+Ensures that the original source is neither copied to the current
 directory nor unpacked. Any original source tree that was in the
 current directory is still removed.
-.PP
-All the
-.B \-sX
-options are mutually exclusive. If you specify more than one only the
-last one will be used.
 .
 .SH BUGS
 The point at which field overriding occurs compared to certain

man/dpkg-split.1

@@ -1,5 +1,5 @@
 .\" Authors: Ian Jackson
-.TH dpkg\-split 1 "2007-03-06" "Debian Project" "dpkg utilities"
+.TH dpkg\-split 1 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-split \- Debian package archive split/join tool
 .
@@ -230,12 +230,7 @@ filename format should not be relied upon.
 .BR dpkg (1).
 .
 .SH AUTHOR
-.B dpkg\-split
-and this manpage were written by Ian Jackson. They are
-Copyright (C) 1995-1996
-by him and released under the GNU General Public Licence version 2 or later;
-there is NO WARRANTY. See
-.I /usr/share/doc/dpkg/copyright
-and
-.I /usr/share/common\-licenses/GPL
-for details.
+Copyright (C) 1995-1996 Ian Jackson
+.sp
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.

man/dpkg-statoverride.8

@@ -1,4 +1,4 @@
-.TH dpkg\-statoverride 8 "2007-06-12" "Debian project" "dpkg utilities"
+.TH dpkg\-statoverride 8 "2007-07-18" "Debian project" "dpkg utilities"
 .SH NAME
 dpkg\-statoverride \- override ownership and mode of files
 .
@@ -79,10 +79,10 @@ extension "\-old", before replacing it with the new one.
 .BR dpkg (1).
 .
 .SH AUTHOR
-Copyright 2000 Wichert Akkerman
+Copyright (C) 2000 Wichert Akkerman
 .UR mailto:wakkerma@debian.org
 <wakkerma@debian.org>
 .UE
 .sp
 This is free software; see the GNU General Public Licence version 2 or
-later for copying conditions. There is NO warranty.
+later for copying conditions. There is NO WARRANTY.

man/dpkg.1

@@ -1,4 +1,4 @@
-.TH dpkg 1 "2007-06-12" "Debian Project" "dpkg suite"
+.TH dpkg 1 "2007-07-18" "Debian Project" "dpkg suite"
 .SH NAME
 dpkg \- package manager for Debian
 .
@@ -91,7 +91,7 @@ option \fB\-\-force\-remove\-reinstreq\fP.
 .
 .SH ACTIONS
 .TP
-\fBdpkg \-i\fP | \fB\-\-install\fP \fIpackage_file\fP...
+\fB\-i\fP, \fB\-\-install\fP \fIpackage_file\fP...
 Install the package. If \fB\-\-recursive\fP or \fB\-R\fP option is
 specified, \fIpackage_file\fP must refer to a directory instead.
 
@@ -122,12 +122,12 @@ time old files are removed.
 \fB6.\fP Configure the package. See \fB\-\-configure\fP for detailed
 information about how this is done.
 .TP
-\fBdpkg \-\-unpack \fP\fIpackage_file\fP ...
+\fB\-\-unpack \fP\fIpackage_file\fP...
 Unpack the package, but don't configure it. If \fB\-\-recursive\fP or
 \fB\-R\fP option is specified, \fIpackage_file\fP must refer to a
 directory instead.
 .TP
-\fBdpkg \-\-configure \fP\fIpackage\fP ... | \fB\-a\fP | \fB\-\-pending\fP
+\fB\-\-configure \fP\fIpackage\fP...|\fB\-a\fP|\fB\-\-pending\fP
 Reconfigure an unpacked package. If \fB\-a\fP or \fB\-\-pending\fP is
 given instead of \fIpackage\fP, all unpacked but unconfigured
 packages are configured.
@@ -142,7 +142,7 @@ something goes wrong.
 
 \fB2.\fP Run \fIpostinst\fP script, if provided by the package.
 .TP
-\fBdpkg \-r\fP | \fB\-\-remove\fP | \fB\-P\fP | \fB\-\-purge \fP\fIpackage\fP ... | \fB\-a\fP | \fB\-\-pending\fP
+\fB\-r\fP, \fB\-\-remove\fP, \fB\-P\fP, \fB\-\-purge \fP\fIpackage\fP...|\fB\-a\fP|\fB\-\-pending\fP
 Remove an installed package. \fB\-r\fP or \fB\-\-remove\fP remove
 everything except configuration files. This may avoid having to
 reconfigure the package if it is reinstalled later. (Configuration
@@ -165,7 +165,7 @@ Removing of a package consists of the following steps:
 \fB3.\fP Run \fIpostrm\fP script
 .br
 .TP
-\fBdpkg \-\-update\-avail\fP | \fB\-\-merge\-avail\fP \fIPackages-file\fP
+\fB\-\-update\-avail\fP, \fB\-\-merge\-avail\fP \fIPackages-file\fP
 Update \fBdpkg\fP's and \fBdselect\fP's idea of which packages are
 available. With action \fB\-\-merge\-avail\fP, old information is
 combined with information from \fIPackages-file\fP. With action
@@ -177,47 +177,47 @@ record of available packages in \fI/var/lib/dpkg/available\fP.
 A simpler one-shot command to retrieve and update the \fIavailable\fR
 file is \fBdselect update\fR.
 .TP
-\fBdpkg \-A\fP | \fB\-\-record\-avail\fP \fIpackage_file\fP ...
+\fB\-A\fP, \fB\-\-record\-avail\fP \fIpackage_file\fP...
 Update \fBdpkg\fP and \fBdselect\fP's idea of which packages are
 available with information from the package \fIpackage_file\fP. If
 \fB\-\-recursive\fP or \fB\-R\fP option is specified, \fIpackage_file\fP
 must refer to a directory instead.
 .TP
-.B dpkg \-\-forget\-old\-unavail
+.B \-\-forget\-old\-unavail
 Forget about uninstalled unavailable packages.
 .TP
-.B dpkg \-\-clear\-avail
+.B \-\-clear\-avail
 Erase the existing information about what packages are available.
 .TP
-\fBdpkg \-C\fP | \fB\-\-audit\fP
+\fB \-C\fP, \fB\-\-audit\fP
 Searches for packages that have been installed only partially on your
 system. \fBdpkg\fP will suggest what to do with them to get them
 working.
 .TP
-\fBdpkg \-\-get\-selections\fP [\fIpackage-name-pattern\fP...]
+\fB\-\-get\-selections\fP [\fIpackage-name-pattern\fP...]
 Get list of package selections, and write it to stdout. Without a pattern,
 packages marked with state purge will not be shown.
 .TP
-.B dpkg \-\-set\-selections
+.B \-\-set\-selections
 Set package selections using file read from stdin. This file should be
 in the format '<package> <state>', where state is one of install, hold,
 deinstall or purge. Blank lines and comment lines beginning with '#'
 are also permitted.
 .TP
-.B dpkg \-\-clear\-selections
+.B \-\-clear\-selections
 Set the requested state of every non-essential package to deinstall.
 This is intended to be used immediately before \-\-set\-selections, to
 deinstall any packages not in list given to \-\-set\-selections.
 .TP
-.B dpkg \-\-yet\-to\-unpack
+.B \-\-yet\-to\-unpack
 Searches for packages selected for installation, but which for some
 reason still haven't been installed.
 .TP
 .TP
-.B dpkg \-\-print\-architecture
+.B \-\-print\-architecture
 Print architecture of packages \fBdpkg\fP installs (for example, "i386").
 .TP
-.B dpkg \-\-compare\-versions \fIver1 op ver2\fP
+.B \-\-compare\-versions \fIver1 op ver2\fP
 Compare version numbers, where \fIop\fP is a binary operator. \fBdpkg\fP
 returns success (zero result) if the specified condition is satisfied,
 and failure (nonzero result) otherwise. There are
@@ -228,48 +228,48 @@ than any version: \fBlt\-nl le\-nl ge\-nl gt\-nl\fP. These are provided
 only for compatibility with control file syntax: \fB< << <= = >= >>
 >\fP.
 .TP
-.B dpkg \-\-command\-fd <n>
-Accept a series of commands on input file descriptor \fB<n>\fP. Note:
+.B \-\-command\-fd \fI<n>\fP
+Accept a series of commands on input file descriptor \fI<n>\fP. Note:
 additional options set on the command line, and thru this file descriptor,
 are not reset for subsequent commands executed during the same run.
 .TP
-.B dpkg \-\-help
+.B \-\-help
 Display a brief help message.
 .TP
-.B dpkg \-\-force\-help
+.B \-\-force\-help
 Give help about the \fB\-\-force\-\fP\fIthing\fP options.
 .TP
-.BR "dpkg \-Dh " | " \-\-debug=help"
+.BR \-Dh  ", " \-\-debug=help
 Give help about debugging options.
 .TP
-\fBdpkg \-\-licence\fP | \fBdpkg \-\-license\fP
+\fB\-\-licence\fP, \fB\-\-license\fP
 Display \fBdpkg\fP licence.
 .TP
-\fBdpkg \-\-version\fP
+\fB\-\-version\fP
 Display \fBdpkg\fP version information.
 .TP
 \fBdpkg\-deb actions\fP
 See \fBdpkg\-deb\fP(1) for more information about the following actions.
 
 .nf
-\fBdpkg \-b\fP | \fB\-\-build\fP \fIdirectory\fP [\fIfilename\fP]
+\fB\-b\fP, \fB\-\-build\fP \fIdirectory\fP [\fIarchive\fP|\fIdirectory\fP]
     Build a deb package.
-\fBdpkg \-c\fP | \fB\-\-contents\fP \fIfilename\fP
+\fB\-c\fP, \fB\-\-contents\fP \fIarchive\fP
     List contents of a deb package.
-\fBdpkg \-e\fP | \fB\-\-control\fP \fIfilename\fP [\fIdirectory\fP]
+\fB\-e\fP, \fB\-\-control\fP \fIfilename\fP [\fIdirectory\fP]
     Extract control-information from a package.
-\fBdpkg \-x\fP | \fB\-\-extract\fP \fIfilename directory\fP
+\fB\-x\fP, \fB\-\-extract\fP \fIarchive directory\fP
     Extract the files contained by package.
-\fBdpkg \-f\fP | \fB\-\-field\fP  \fIfilename\fP [\fIcontrol-field\fP] ...
+\fB\-X\fP, \fB\-\-vextract\fP \fIarchive directory\fP
+    Extract and display the filenames contained by a
+    package.
+\fB\-f\fP, \fB\-\-field\fP  \fIarchive\fP [\fIcontrol-field\fP...]
     Display control field(s) of a package.
-\fBdpkg \-\-fsys\-tarfile\fP \fIfilename\fP
+\fB\-\-fsys\-tarfile\fP \fIarchive\fP
     Display the filesystem tar-file contained by a
     Debian package.
-\fBdpkg \-I\fP | \fB\-\-info\fP \fIfilename\fP [\fIcontrol-file\fP]
+\fB\-I\fP, \fB\-\-info\fP \fIarchive\fP [\fIcontrol-file\fP...]
     Show information about a package.
-\fBdpkg \-X\fP | \fB\-\-vextract\fP \fIfilename\fP \fIdirectory\fP
-    Extract and display the filenames contained by a
-    package.
 .fi
 
 .TP
@@ -278,16 +278,17 @@ See \fBdpkg\-query\fP(1) for more information about the following actions.
 
 .nf
 
-\fBdpkg \-l\fP | \fB\-\-list\fP \fIpackage-name-pattern\fP ...
+\fB\-l\fP, \fB\-\-list\fP \fIpackage-name-pattern\fP...
     List packages matching given pattern.
-\fBdpkg \-s\fP | \fB\-\-status\fP \fIpackage-name\fP ...
+\fB\-s\fP, \fB\-\-status\fP \fIpackage-name\fP...
     Report status of specified package.
-\fBdpkg \-L\fP | \fB\-\-listfiles\fP \fIpackage\fP ...
-    List files installed to your system from \fBpackage\fP.
-\fBdpkg \-S\fP | \fB\-\-search\fP \fIfilename-search-pattern\fP ...
+\fB\-L\fP, \fB\-\-listfiles\fP \fIpackage-name\fP...
+    List files installed to your system from \fIpackage-name\fP.
+\fB\-S\fP, \fB\-\-search\fP \fIfilename-search-pattern\fP...
     Search for a filename from installed packages.
-\fBdpkg \-p\fP | \fB\-\-print\-avail\fP \fIpackage\fP
-    Display details about \fIpackage\fP, as found in \fI/var/lib/dpkg/available\fP.
+\fB\-p\fP, \fB\-\-print\-avail\fP \fIpackage-name\fP...
+    Display details about \fIpackage-name\fP, as found in
+    \fI/var/lib/dpkg/available\fP.
 .fi
 .
 .SH OPTIONS
@@ -300,13 +301,13 @@ without leading dashes) or a comment (if it starts with a \fB#\fR).
 \fB\-\-abort\-after=\fP\fInumber\fP
 Change after how many errors \fBdpkg\fP will abort. The default is 50.
 .TP
-.BR \-B | \-\-auto\-deconfigure
+.BR \-B ", " \-\-auto\-deconfigure
 When a package is removed, there is a possibility that another
 installed package depended on the removed package. Specifying this
 option will cause automatic deconfiguration of the package which
 depended on the removed package.
 .TP
-\fB\-D\fIoctal\fP | \fB\-\-debug=\fP\fIoctal\fP
+\fB\-D\fIoctal\fP, \fB\-\-debug=\fP\fIoctal\fP
 Switch debugging on. \fIoctal\fP is formed by bitwise-orring desired
 values together from the list below (note that these values may change
 in future releases). \fB\-Dh\fP or \fB\-\-debug=help\fP display these
@@ -324,7 +325,7 @@ debugging values.
  1000   Lots of drivel about e.g. the dpkg/info dir
  2000   Insane amounts of drivel
 .TP
-\fB\-\-force\-\fP\fIthings\fP | \fB\-\-no\-force\-\fP\fIthings\fP | \fB\-\-refuse\-\fP\fIthings\fP
+\fB\-\-force\-\fP\fIthings\fP, \fB\-\-no\-force\-\fP\fIthings\fP, \fB\-\-refuse\-\fP\fIthings\fP
 
 Force or refuse (\fBno\-force\fP and \fBrefuse\fP mean the same thing)
 to do some things. \fIthings\fP is a comma separated list of things
@@ -371,6 +372,9 @@ Turn all dependency problems into warnings.
 \fBdepends\-version\fP:
 Don't care about versions when checking dependencies.
 
+\fBbreaks\fP:
+Install, even if this would break another package.
+
 \fBconflicts\fP:
 Install, even if it conflicts with another package. This is dangerous,
 for it will usually cause overwriting of some files.
@@ -422,7 +426,7 @@ Install a package even if it fails authenticity check.
 Ignore dependency-checking for specified packages (actually, checking is
 performed, but only warnings about conflicts are given, nothing else).
 .TP
-\fB\-\-new\fP | \fB\-\-old\fP
+\fB\-\-new\fP, \fB\-\-old\fP
 Select new or old binary package format. This is a \fBdpkg\-deb\fP(1)
 option.
 .TP
@@ -430,7 +434,7 @@ option.
 Don't read or check contents of control file while building a package.
 This is a \fBdpkg\-deb\fP(1) option.
 .TP
-\fB\-\-no\-act\fP | \fB\-\-dry\-run\fP | \fB\-\-simulate\fP
+\fB\-\-no\-act\fP, \fB\-\-dry\-run\fP, \fB\-\-simulate\fP
 Do everything which is supposed to be done, but don't write any
 changes. This is used to see what would happen with the specified
 action, without actually modifying anything.
@@ -440,7 +444,7 @@ end up with undesirable results. (e.g. \fBdpkg \-\-purge foo
 \-\-no\-act\fP will first purge package foo and then try to purge package
 \-\-no\-act, even though you probably expected it to actually do nothing)
 .TP
-\fB\-R\fP | \fB\-\-recursive\fP
+\fB\-R\fP, \fB\-\-recursive\fP
 Recursively handle all regular files matching pattern \fB*.deb\fP
 found at specified directories and all of its subdirectories. This can
 be used with \fB\-i\fP, \fB\-A\fP, \fB\-\-install\fP, \fB\-\-unpack\fP and
@@ -450,24 +454,29 @@ be used with \fB\-i\fP, \fB\-A\fP, \fB\-\-install\fP, \fB\-\-unpack\fP and
 Don't install a package if a newer version of the same package is already
 installed. This is an alias of \fB\-\-refuse\-downgrade\fP.
 .TP
-\fB\-\-root=\fP\fIdir\fP | \fB\-\-admindir=\fP\fIdir\fP | \fB\-\-instdir=\fP\fIdir\fP
-Change default directories. \fBadmindir\fP defaults to
-\fI/var/lib/dpkg\fP and contains many files that give information
-about status of installed or uninstalled packages, etc. \fBinstdir\fP
-defaults to \fI/\fP and refers to the directory where packages are to
-be installed. \fBinstdir\fP is also the directory passed to
-\fBchroot\fP(2) before running package's installation scripts, which
+.BI \-\-admindir= dir
+Change default administrative directory, which contains many files that
+give information about status of installed or uninstalled packages, etc.
+(Defaults to \fI/var/lib/dpkg\fP)
+.TP
+.BI \-\-instdir= dir
+Change default installation directory which refers to the directory where
+packages are to be installed. \fBinstdir\fP is also the directory passed
+to \fBchroot\fP(2) before running package's installation scripts, which
 means that the scripts see \fBinstdir\fP as a root directory.
-Changing \fBroot\fP changes \fBinstdir\fP to \fIdir\fP and
-\fBadmindir\fP to \fIdir\fP\fB/var/lib/dpkg\fP.
+(Defaults to \fI/\fP)
+.TP
+.BI \-\-root= dir
+Changing \fBroot\fP changes \fBinstdir\fP to \fIdir\fP and \fBadmindir\fP
+to \fIdir\fP\fB/var/lib/dpkg\fP.
 .TP
-\fB\-O\fP | \fB\-\-selected\-only\fP
+\fB\-O\fP, \fB\-\-selected\-only\fP
 Only process the packages that are selected for installation. The
 actual marking is done with \fBdselect\fP or by \fBdpkg\fP, when it
 handles packages. For example, when a package is removed, it will
 be marked selected for deinstallation.
 .TP
-.BR \-E " | " \-\-skip\-same\-version
+.BR \-E ", " \-\-skip\-same\-version
 Don't install the package if the same version of the package is already
 installed.
 .TP
@@ -586,7 +595,7 @@ with:
 Note that this will not actually install or remove anything, but just
 set the selection state on the requested packages. You will need some
 other application to actually download and install the requested
-packages. For example, run \fBdselect\fP and choose "Install".
+packages. For example, run \fBdselect\fP and choose \fIInstall\fP.
 
 Ordinarily, you will find that \fBdselect\fP(1) provides a more
 convenient way to modify the package selection states.
@@ -594,7 +603,7 @@ convenient way to modify the package selection states.
 .
 .SH ADDITIONAL FUNCTIONALITY
 Additional functionality can be gained by installing any of the
-following packages: \fIapt\fR, \fIaptitude\fR and \fIdebsums\fR.
+following packages: \fBapt\fR, \fBaptitude\fR and \fBdebsums\fR.
 .
 .SH SEE ALSO
 \fBdselect\fP(1),

man/install-info.8

@@ -2,7 +2,7 @@
 .\"
 .\" This is free software; see the GNU General Public Licence version 2
 .\" or later for copying conditions.  There is NO warranty.
-.TH install\-info 8 "2007-06-12" "Debian Project" "dpkg utilities"
+.TH install\-info 8 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 install\-info \- create or update entry in Info dir file
 .
@@ -288,10 +288,8 @@ processing steps are shown.
 .BR emacs (1),
 .BR info (1),
 .BR gzip(1).
-.SH COPYRIGHT
-Copyright 1994, Ian Jackson.
-.B install\-info
-is free software; see the GNU General Public Licence version 2 or
-later for copying conditions. There is
-.I no
-warranty.
+.SH AUTHOR
+Copyright 1994 Ian Jackson
+.sp
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.

man/po/sv.add

@@ -1,4 +1,3 @@
 PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary
-Denna manualsida översattes av Peter Karlsson, och även denna översättning
-är att anse som allmängods.
-
+.SH "ÖVERSÄTTNING"
+Peter Karlsson och Debian Nylander.

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.

man/update-alternatives.8

@@ -5,7 +5,7 @@
 .\" by the Free Software Foundation; either version 2 of the License, or
 .\" (at your option) any later version.  There is NO WARRANTY.  You can
 .\" find the GNU GPL in /usr/share/common-licenses/GPL on any Debian system.
-.TH update\-alternatives 8 "2007-06-12" "Debian Project" "dpkg utilities"
+.TH update\-alternatives 8 "2007-07-18" "Debian Project" "dpkg utilities"
 .SH NAME
 update\-alternatives \- maintain symbolic links determining default commands
 .
@@ -202,7 +202,7 @@ to the system administrator's settings.
 .
 .SH COMMANDS
 .TP
-\fB\-\-install\fR \fIgenname symlink altern priority\fR [\fB\-\-slave\fR \fIgenname symlink altern\fR] ...
+\fB\-\-install\fR \fIgenname symlink altern priority\fR [\fB\-\-slave\fR \fIgenname symlink altern\fR]...
 Add a group of alternatives to the system.
 .I genname
 is the generic name for the master link,
@@ -390,15 +390,15 @@ and this manual page, it is a bug,
 either in the implementation or the documentation; please report it.
 .
 .SH AUTHOR
-Debian update\-alternatives is copyright 1995
-Ian Jackson. It is free software; see the GNU General Public Licence
-version 2 or later for copying conditions. There is NO warranty.
+Copyright (C) 1995 Ian Jackson
+.sp
+This is free software; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.
 .PP
-This manual page is copyright 1997/98 Charles Briscoe-Smith.
-This is free documentation; see the GNU General Public Licence
-version 2 or later for copying conditions. There is NO WARRANTY.
-.PP
-You can find the GNU GPL in /usr/share/common\-licenses/GPL on any Debian system.
+This manual page is copyright 1997,1998 Charles Briscoe-Smith.
+.sp
+This is free documentation; see the GNU General Public Licence version 2 or
+later for copying conditions. There is NO WARRANTY.
 .
 .SH "SEE ALSO"
 .BR ln (1),

po/ChangeLog

@@ -1,16 +1,81 @@
+2007-09-19  Sunjae Park  <darehanl@gmail.com>
+
+	* ko.po: Updated to 929t.
+
+2007-09-07  Claus Hindsgaul  <claus.hindsgaul@gmail.com>
+
+	* da.po: Updated to 929t.
+
+2007-09-06  Miguel Figueiredo  <elmig@debianpt.org>
+
+	* pt.po: Updated to 929t.
+
+2007-09-05  Piarres Beobide  <pi@beobide.net>
+
+	* eu.po: Updated to 929t.
+
+2007-09-04  Frédéric Bothamy  <frederic.bothamy@free.fr>
+
+	* fr.po: Updated to 929t.
+
+2007-09-02  Sven Joachim  <svenjoac@gmx.de>
+
+	* de.po: Updated to 929t.
+
+2007-09-02  Clytie Siddall  <clytie@riverland.net.au>
+
+	* vi.po: Updated to 929t.
+
+2007-08-26  Shiva Prasad Pokharel  <pokharelshiv@gmail.com>
+
+	* ne.po: Updated to 903t23f3u.
+
+2007-08-25  Peter Karlsson  <peterk@debian.org>
+
+	* sv.po: Updated to 929t.
+
+2007-08-18  Guillem Jover  <guillem@debian.org>
+
+	* dpkg.pot: Regenerated.
+	* *.po: Merged with dpkg.pot.
+
+2007-08-14  Robert Luberda  <robert@debian.org>
+
+	* pl.po: Updated to 921t.
+
+2007-08-06  Yuri Kozlov  <kozlov.y@gmail.com>
+
+	* ru.po: Updated to 921t.
+
+2007-07-31  Shiva Prasad Pokharel  <pokharelshiv@gmail.com>
+
+	* ne.po: Updated to 921t.
+
+2007-07-24  Peter Karlsson  <peterk@debian.org>
+
+	* sv.po: Updated to 921t.
+
+2007-07-13  Ivar Smolin  <okul@linux.ee>
+
+	* et.po: Updated to 505t416u.
+
+2007-06-28  Tshewang Norbu  <bumthap2006@hotmail.com>
+
+	* dz.po: Updated to 921t.
+
 2007-06-21  Javier Fernandez-Sanguino  <jfs@debian.org>
 
 	* es.po: Updated to 921t.
 
 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>
+2007-06-01  Clytie Siddall  <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
 
@@ -49,7 +114,7 @@
 
 	* de.po: Updated to 921t.
 
-2007-05-10  Bart Cornelis <cobaco@skolelinux.no>
+2007-05-10  Bart Cornelis  <cobaco@skolelinux.no>
 
 	* nl.po: Updated.
 

scripts/822-date.pl

@@ -3,11 +3,12 @@
 use strict;
 use warnings;
 
-our $dpkglibdir = "."; # This line modified by Makefile
-push(@INC, $dpkglibdir);
-require 'dpkg-gettext.pl';
+use Dpkg;
+use Dpkg::Gettext;
+
 textdomain("dpkg-dev");
 
+push(@INC, $dpkglibdir);
 require 'controllib.pl';
 
 @ARGV && die _g("Usage: 822-date")."\n";

scripts/Dpkg.pm

@@ -0,0 +1,17 @@
+package Dpkg;
+
+use strict;
+use warnings;
+
+use base qw(Exporter);
+our @EXPORT = qw($version $progname $admindir $dpkglibdir $pkgdatadir);
+
+our ($progname) = $0 =~ m#(?:.*/)?([^/]*)#;
+
+# The following lines are automatically fixed at install time
+our $version = "1.14";
+our $admindir = "/var/lib/dpkg";
+our $dpkglibdir = ".";
+our $pkgdatadir = "..";
+
+1;