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

ChangeLog

@@ -1,3 +1,17 @@
+2007-12-04  Frank Lichtenheld  <djpig@debian.org>
+
+	* scripts/Makefile.am (EXTRA_DIST): Add
+	missing files from scripts/t/.
+
+	* debian/rules: Call dh_installchangelogs
+	and dh_installdocs for all packages instead
+	of only for dpkg.
+	* debian/dpkg-dev.docs: Symlink to dpkg.docs.
+	* debian/dselect.docs: Likewise.
+	* debian/dpkg-dev.preinst: Remove
+	/usr/share/doc/dpkg-dev symlink on upgrade.
+	* debian/dselect.preinst: Likewise.
+
 2007-11-29  Frank Lichtenheld  <djpig@debian.org>
 
 	* scripts/controllib.pl (parsecdata): Fix

debian/changelog

@@ -6,6 +6,10 @@ dpkg (1.14.13) UNRELEASED; urgency=low
   * Fix control file parsing for field values starting with a colon.
     Apparently nobody ever needed this until Vcs-Cvs came along.
     Closes: #453364
+  * Copy the usr/share/doc directory to dpkg-dev and dselect (Instead
+    of using symlinks). The space requirements are minimal and adding
+    the needed dependencies to comply with policy would be way more
+    inconvenient. Pointed out by Rene Engelhard. Closes: #452730
 
   [ Updated man pages translations ]
   * Swedish (Peter Karlsson)

debian/dpkg-dev.docs

@@ -0,0 +1 @@
+dpkg.docs

debian/dpkg-dev.install

@@ -22,6 +22,8 @@ usr/share/man/*/*/822-date.1
 usr/share/man/*/822-date.1
 usr/share/man/*/*/deb-control.5
 usr/share/man/*/deb-control.5
+usr/share/man/*/*/deb-version.5
+usr/share/man/*/deb-version.5
 usr/share/man/*/*/deb-substvars.5
 usr/share/man/*/deb-substvars.5
 usr/share/man/*/*/deb-override.5

debian/dpkg-dev.preinst

@@ -0,0 +1,42 @@
+#!/bin/sh -e
+# This script can be called in the following ways:
+#
+# Before the package is installed:
+#	<new-preinst> install
+#
+# Before removed package is upgraded:
+#	<new-preinst> install <old-version>
+#
+# Before the package is upgraded:
+#	<new-preinst> upgrade <old-version>
+#
+#
+# If postrm fails during upgrade or fails on failed upgrade:
+#	<old-preinst> abort-upgrade <new-version>
+
+remove_doc_symlink() {
+    if [ -L /usr/share/doc/dpkg-dev ]; then
+	rm /usr/share/doc/dpkg-dev
+    fi
+}
+
+case "$1" in
+    install)
+	;;
+
+    upgrade)
+	remove_doc_symlink
+	;;
+
+    abort-upgrade)
+	;;
+
+
+    *)
+	echo "$0 called with unknown argument \`$1'" 1>&2
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+exit 0

debian/dselect.docs

@@ -0,0 +1 @@
+dpkg.docs

debian/dselect.preinst

@@ -0,0 +1,42 @@
+#!/bin/sh -e
+# This script can be called in the following ways:
+#
+# Before the package is installed:
+#	<new-preinst> install
+#
+# Before removed package is upgraded:
+#	<new-preinst> install <old-version>
+#
+# Before the package is upgraded:
+#	<new-preinst> upgrade <old-version>
+#
+#
+# If postrm fails during upgrade or fails on failed upgrade:
+#	<old-preinst> abort-upgrade <new-version>
+
+remove_doc_symlink() {
+    if [ -L /usr/share/doc/dselect ]; then
+	rm /usr/share/doc/dselect
+    fi
+}
+
+case "$1" in
+    install)
+	;;
+
+    upgrade)
+	remove_doc_symlink
+	;;
+
+    abort-upgrade)
+	;;
+
+
+    *)
+	echo "$0 called with unknown argument \`$1'" 1>&2
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+exit 0

debian/rules

@@ -81,10 +81,8 @@ binary-arch: install
 	install -d debian/dpkg/sbin
 	mv debian/dpkg/usr/sbin/start-stop-daemon debian/dpkg/sbin
 
-	dh_installchangelogs -pdpkg ChangeLog
-	dh_installdocs -pdpkg
-	install -d debian/dselect/usr/share/doc
-	ln -s dpkg debian/dselect/usr/share/doc/dselect
+	dh_installchangelogs -a ChangeLog
+	dh_installdocs -a
 
 	install -d debian/dpkg/usr/share/lintian/overrides
 	install -m 644 debian/dpkg.lintian-overrides \
@@ -108,8 +106,8 @@ binary-indep: install
 	dh_testroot -i
 	dh_install --sourcedir=debian/tmp -i
 
-	install -d debian/dpkg-dev/usr/share/doc
-	ln -s dpkg debian/dpkg-dev/usr/share/doc/dpkg-dev
+	dh_installchangelogs -i ChangeLog
+	dh_installdocs -i
 
 	install -d debian/dpkg-dev/usr/share/lintian/overrides
 	install -m 644 debian/dpkg-dev.lintian-overrides \

man/ChangeLog

@@ -1,3 +1,12 @@
+2007-12-04  Frank Lichtenheld  <djpig@debian.org>
+
+	* po/po4a.cfg: Add deb-version.5.
+	* po/dpkg-man.pot: Regenerated.
+	* po/*.po: Merged with dpkg-man.pot.
+
+	* po/sv.po: Fix a typo ')' vs '>' which lead to
+	build errors.
+
 2007-11-02  Peter Karlsson  <peterk@debian.org>
 
 	* po/sv.po: Updated to 1354t.

man/Makefile.am

@@ -56,6 +56,7 @@ dist_man_MANS = \
 	822-date.1 \
 	cleanup-info.8 \
 	deb-control.5 \
+	deb-version.5 \
 	deb-shlibs.5 \
 	deb-substvars.5 \
 	deb-symbols.5 \

man/deb-version.5

@@ -122,7 +122,5 @@ Copyright © 1996,1997,1998 Ian Jackson and Christian Schwarz.
 .br
 Copyright © 2007 Frank Lichtenheld
 .sp
-This manual is free software; you may redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any later
-version.
+This is free software; see the GNU General Public Licence version 2 or later
+for copying conditions. There is NO WARRANTY.

man/po/de.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-11-29 06:04+0200\n"
+"POT-Creation-Date: 2007-12-04 01:23+0100\n"
 "PO-Revision-Date: 2007-11-19 19:03+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
@@ -27,8 +27,9 @@ msgstr "2007-01-24"
 
 # type: TH
 #: ../../man/822-date.1:2 ../../man/cleanup-info.8:1 ../../man/deb.5:1
-#: ../../man/deb-control.5:3 ../../man/deb-old.5:1 ../../man/deb-override.5:16
-#: ../../man/deb-shlibs.5:16 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/deb-control.5:3 ../../man/deb-version.5:5 ../../man/deb-old.5:1
+#: ../../man/deb-override.5:16 ../../man/deb-shlibs.5:16
+#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
 #: ../../man/dpkg-architecture.1:1 ../../man/dpkg.cfg.5:1
 #: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
 #: ../../man/dpkg-distaddfile.1:1 ../../man/dpkg-deb.1:1
@@ -63,8 +64,9 @@ msgstr "dpkg-Hilfsprogramme"
 
 # type: SH
 #: ../../man/822-date.1:3 ../../man/cleanup-info.8:2 ../../man/deb.5:2
-#: ../../man/deb-control.5:4 ../../man/deb-old.5:2 ../../man/deb-override.5:17
-#: ../../man/deb-shlibs.5:17 ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
+#: ../../man/deb-control.5:4 ../../man/deb-version.5:6 ../../man/deb-old.5:2
+#: ../../man/deb-override.5:17 ../../man/deb-shlibs.5:17
+#: ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
 #: ../../man/dpkg-architecture.1:2 ../../man/dpkg.cfg.5:2
 #: ../../man/dpkg-buildpackage.1:2 ../../man/dpkg-checkbuilddeps.1:2
 #: ../../man/dpkg-distaddfile.1:2 ../../man/dpkg-deb.1:2
@@ -87,8 +89,9 @@ msgstr "822-date - Datum und Uhrzeit im RFC822-Format ausgeben"
 
 # type: SH
 #: ../../man/822-date.1:6 ../../man/cleanup-info.8:5 ../../man/deb.5:4
-#: ../../man/deb-control.5:7 ../../man/deb-old.5:5 ../../man/deb-override.5:20
-#: ../../man/deb-shlibs.5:20 ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
+#: ../../man/deb-control.5:7 ../../man/deb-version.5:9 ../../man/deb-old.5:5
+#: ../../man/deb-override.5:20 ../../man/deb-shlibs.5:20
+#: ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
 #: ../../man/dpkg-architecture.1:5 ../../man/dpkg-buildpackage.1:5
 #: ../../man/dpkg-checkbuilddeps.1:5 ../../man/dpkg-distaddfile.1:5
 #: ../../man/dpkg-deb.1:5 ../../man/dpkg-divert.8:5
@@ -111,7 +114,7 @@ msgstr "B<822-date>"
 
 # type: SH
 #: ../../man/822-date.1:9 ../../man/cleanup-info.8:11 ../../man/deb.5:6
-#: ../../man/deb-control.5:10 ../../man/deb-old.5:8
+#: ../../man/deb-control.5:10 ../../man/deb-version.5:11 ../../man/deb-old.5:8
 #: ../../man/deb-override.5:23 ../../man/deb-shlibs.5:23
 #: ../../man/deb-substvars.5:9 ../../man/dpkg.1:19
 #: ../../man/dpkg-architecture.1:11 ../../man/dpkg.cfg.5:5
@@ -189,18 +192,18 @@ msgstr "Diese Anlage sollte wirklich ein Teil von B<date>(1) sein."
 
 # type: SH
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
-#: ../../man/deb-control.5:227 ../../man/deb-old.5:51
-#: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608
-#: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-buildpackage.1:204 ../../man/dpkg-deb.1:238
-#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:98
-#: ../../man/dpkg-query.1:157 ../../man/dpkg-scanpackages.1:100
-#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:279
-#: ../../man/dpkg-source.1:278 ../../man/dpkg-split.1:226
-#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
-#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
-#: ../../man/update-alternatives.8:403
+#: ../../man/deb-control.5:227 ../../man/deb-version.5:116
+#: ../../man/deb-old.5:51 ../../man/deb-override.5:67
+#: ../../man/deb-shlibs.5:29 ../../man/deb-substvars.5:129
+#: ../../man/dpkg.1:608 ../../man/dpkg-architecture.1:268
+#: ../../man/dpkg.cfg.5:21 ../../man/dpkg-buildpackage.1:204
+#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
+#: ../../man/dpkg-name.1:98 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-scanpackages.1:100 ../../man/dpkg-scansources.1:65
+#: ../../man/dpkg-shlibdeps.1:279 ../../man/dpkg-source.1:278
+#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
+#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
+#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
@@ -423,15 +426,16 @@ msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr "Copyright (C) 1996 Kim-Minh Kaplan"
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
-#: ../../man/dpkg-buildpackage.1:219 ../../man/dpkg-checkbuilddeps.1:35
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
-#: ../../man/dpkg-gencontrol.1:145 ../../man/dpkg-name.1:110
-#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:156
-#: ../../man/dpkg-shlibdeps.1:294 ../../man/dpkg-source.1:289
-#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:85
-#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
+#: ../../man/cleanup-info.8:58 ../../man/deb-version.5:126
+#: ../../man/deb-substvars.5:142 ../../man/dpkg-buildpackage.1:219
+#: ../../man/dpkg-checkbuilddeps.1:35 ../../man/dpkg-distaddfile.1:53
+#: ../../man/dpkg-deb.1:248 ../../man/dpkg-divert.8:125
+#: ../../man/dpkg-genchanges.1:150 ../../man/dpkg-gencontrol.1:145
+#: ../../man/dpkg-name.1:110 ../../man/dpkg-parsechangelog.1:54
+#: ../../man/dpkg-query.1:156 ../../man/dpkg-shlibdeps.1:294
+#: ../../man/dpkg-source.1:289 ../../man/dpkg-split.1:236
+#: ../../man/dpkg-statoverride.8:85 ../../man/install-info.8:295
+#: ../../man/update-alternatives.8:397
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO WARRANTY."
@@ -453,8 +457,8 @@ msgid "2006-02-28"
 msgstr "2006-02-28"
 
 # type: TH
-#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-old.5:1
-#: ../../man/dselect.1:1
+#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-version.5:5
+#: ../../man/deb-old.5:1 ../../man/dselect.1:1
 #, no-wrap
 msgid "Debian"
 msgstr "Debian"
@@ -668,12 +672,12 @@ msgstr "B<Version:> E<lt>Versions-ZeichenketteE<gt>"
 
 # type: Plain text
 #: ../../man/deb-control.5:37
+#, fuzzy
 msgid ""
 "Typically, this is the original package's version number in whatever form "
 "the program's author uses. It may also include a Debian revision number (for "
-"non-native packages). If both version and revision are supplied, they are "
-"separated by a hyphen, `-'. For this reason, the original version may not "
-"have a hyphen in its version number."
+"non-native packages). The exact format and sorting algorithm are described "
+"in B<deb-version>(5)."
 msgstr ""
 "Typischerweise ist das die Original Paketversionsnummer, in der Form, die "
 "der Programmautor verwendet. Es kann auch eine Debian-Revisionsnummer "
@@ -1156,10 +1160,241 @@ msgstr ""
 " langsamer laufen.)\n"
 
 # type: Plain text
-#: ../../man/deb-control.5:231
-msgid "B<deb>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+#: ../../man/deb-control.5:232
+#, fuzzy
+msgid ""
+"B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr "B<deb>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 
+# type: TP
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "deb-version"
+msgstr "B<--version>"
+
+# type: TH
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "2007-10-06"
+msgstr "2007-10-08"
+
+# type: Plain text
+#: ../../man/deb-version.5:8
+#, fuzzy
+msgid "deb-version - Debian package version number format"
+msgstr "deb-control - Dateiformat der Hauptsteuerdatei von Debian-Paketen"
+
+# type: Plain text
+#: ../../man/deb-version.5:11
+msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:14
+msgid ""
+"Version numbers as used for Debian binary and source packages consist of "
+"three components. These are:"
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:14
+#, no-wrap
+msgid "I<epoch>"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:20
+msgid ""
+"This is a single (generally small) unsigned integer.  It may be omitted, in "
+"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"may not contain any colons."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:24
+msgid ""
+"It is provided to allow mistakes in the version numbers of older versions of "
+"a package, and also a package's previous version numbering schemes, to be "
+"left behind."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:24
+#, fuzzy, no-wrap
+msgid "I<upstream_version>"
+msgstr "B<source:Upstream-Version>"
+
+# type: Plain text
+#: ../../man/deb-version.5:34
+msgid ""
+"This is the main part of the version number.  It is usually the version "
+"number of the original (\"upstream\")  package from which the I<.deb> file "
+"has been made, if this is applicable.  Usually this will be in the same "
+"format as that specified by the upstream author(s); however, it may need to "
+"be reformatted to fit into the package management system's format and "
+"comparison scheme."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:39
+msgid ""
+"The comparison behavior of the package management system with respect to the "
+"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"the version number is mandatory."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:48
+msgid ""
+"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
+"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"then hyphens are not allowed; if there is no I<epoch> then colons are not "
+"allowed."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:48
+#, fuzzy, no-wrap
+msgid "I<debian_revision>"
+msgstr "B<binary:Version>"
+
+# type: Plain text
+#: ../../man/deb-version.5:57
+msgid ""
+"This part of the version number specifies the version of the Debian package "
+"based on the upstream version.  It may contain only alphanumerics and the "
+"characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
+"same way as the I<upstream_version> is."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:64
+msgid ""
+"It is optional; if it isn't present then the I<upstream_version> may not "
+"contain a hyphen.  This format represents the case where a piece of software "
+"was written specifically to be turned into a Debian package, and so there is "
+"only one \"debianisation\" of it and therefore no revision indication is "
+"required."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:68
+msgid ""
+"It is conventional to restart the I<debian_revision> at '1' each time time "
+"the I<upstream_version> is increased."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:76
+msgid ""
+"Dpkg will break the version number apart at the last hyphen in the string "
+"(if there is one) to determine the I<upstream_version> and "
+"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
+"than the presence of one (but note that the I<debian_revision> is the least "
+"significant part of the version number)."
+msgstr ""
+
+# type: SS
+#: ../../man/deb-version.5:76
+#, no-wrap
+msgid "Sorting Algorithm"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:80
+msgid ""
+"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"package management system using the same algorithm:"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:82
+msgid "The strings are compared from left to right."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:92
+msgid ""
+"First the initial part of each string consisting entirely of non-digit "
+"characters is determined.  These two parts (one of which may be empty) are "
+"compared lexically.  If a difference is found it is returned.  The lexical "
+"comparison is a comparison of ASCII values modified so that all the letters "
+"sort earlier than all the non-letters and so that a tilde sorts before "
+"anything, even the end of a part.  For example, the following parts are in "
+"sorted order: '~~', '~~a', '~', the empty part, 'a'."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:100
+msgid ""
+"Then the initial part of the remainder of each string which consists "
+"entirely of digit characters is determined.  The numerical values of these "
+"two parts are compared, and any difference found is returned as the result "
+"of the comparison.  For these purposes an empty string (which can only occur "
+"at the end of one or both version strings being compared) counts as zero."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:104
+msgid ""
+"These two steps (comparing and removing initial non-digit strings and "
+"initial digit strings) are repeated until a difference is found or both "
+"strings are exhausted."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:112
+msgid ""
+"Note that the purpose of epochs is to allow us to leave behind mistakes in "
+"version numbering, and to cope with situations where the version numbering "
+"scheme changes.  It is B<not> intended to cope with version numbers "
+"containing strings of letters which the package management system cannot "
+"interpret (such as 'ALPHA' or 'pre-'), or with silly orderings."
+msgstr ""
+
+# type: SH
+#: ../../man/deb-version.5:112
+#, no-wrap
+msgid "CAVEATS"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:116
+msgid ""
+"The tilde character and its special sorting properties were introduced in "
+"dpkg, version 1.10 and some parts of dpkg-dev only gained support for it "
+"later in the 1.10.x series."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:120
+#, fuzzy
+msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
+
+# type: SH
+#: ../../man/deb-version.5:120 ../../man/dpkg.1:621
+#: ../../man/dpkg-buildpackage.1:211 ../../man/dpkg-distaddfile.1:47
+#: ../../man/dpkg-genchanges.1:144 ../../man/dpkg-gencontrol.1:137
+#: ../../man/dpkg-parsechangelog.1:48 ../../man/dpkg-shlibdeps.1:284
+#: ../../man/dpkg-source.1:283 ../../man/dselect.1:449
+#: ../../man/start-stop-daemon.8:242
+#, no-wrap
+msgid "AUTHORS"
+msgstr "AUTOREN"
+
+# type: Plain text
+#: ../../man/deb-version.5:122
+msgid "Copyright © 1996,1997,1998 Ian Jackson and Christian Schwarz."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:124
+#, fuzzy
+msgid "Copyright © 2007 Frank Lichtenheld"
+msgstr "Copyright (C) 2007 Frank Lichtenheld"
+
 # type: TH
 #: ../../man/deb-old.5:1
 #, no-wrap
@@ -3437,16 +3672,6 @@ msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr ""
 "B<--no-act> gibt gewöhnlich weniger Informationen als hilfreich sein könnten."
 
-# type: SH
-#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:211
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
-#: ../../man/dpkg-gencontrol.1:137 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:284 ../../man/dpkg-source.1:283
-#: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
-#, no-wrap
-msgid "AUTHORS"
-msgstr "AUTOREN"
-
 # type: Plain text
 #: ../../man/dpkg.1:623 ../../man/dpkg.cfg.5:20
 msgid ""

man/po/es.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-11-29 06:04+0200\n"
+"POT-Creation-Date: 2007-12-04 01:23+0100\n"
 "PO-Revision-Date: 2005-07-03 15:04+0200\n"
 "Last-Translator: Unknown translator\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -28,8 +28,9 @@ msgstr ""
 
 # type: TH
 #: ../../man/822-date.1:2 ../../man/cleanup-info.8:1 ../../man/deb.5:1
-#: ../../man/deb-control.5:3 ../../man/deb-old.5:1 ../../man/deb-override.5:16
-#: ../../man/deb-shlibs.5:16 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/deb-control.5:3 ../../man/deb-version.5:5 ../../man/deb-old.5:1
+#: ../../man/deb-override.5:16 ../../man/deb-shlibs.5:16
+#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
 #: ../../man/dpkg-architecture.1:1 ../../man/dpkg.cfg.5:1
 #: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
 #: ../../man/dpkg-distaddfile.1:1 ../../man/dpkg-deb.1:1
@@ -72,8 +73,9 @@ msgstr ""
 
 # type: SH
 #: ../../man/822-date.1:3 ../../man/cleanup-info.8:2 ../../man/deb.5:2
-#: ../../man/deb-control.5:4 ../../man/deb-old.5:2 ../../man/deb-override.5:17
-#: ../../man/deb-shlibs.5:17 ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
+#: ../../man/deb-control.5:4 ../../man/deb-version.5:6 ../../man/deb-old.5:2
+#: ../../man/deb-override.5:17 ../../man/deb-shlibs.5:17
+#: ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
 #: ../../man/dpkg-architecture.1:2 ../../man/dpkg.cfg.5:2
 #: ../../man/dpkg-buildpackage.1:2 ../../man/dpkg-checkbuilddeps.1:2
 #: ../../man/dpkg-distaddfile.1:2 ../../man/dpkg-deb.1:2
@@ -97,8 +99,9 @@ msgstr "822-date - Muestra la fecha y la hora en formato RFC822"
 
 # type: SH
 #: ../../man/822-date.1:6 ../../man/cleanup-info.8:5 ../../man/deb.5:4
-#: ../../man/deb-control.5:7 ../../man/deb-old.5:5 ../../man/deb-override.5:20
-#: ../../man/deb-shlibs.5:20 ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
+#: ../../man/deb-control.5:7 ../../man/deb-version.5:9 ../../man/deb-old.5:5
+#: ../../man/deb-override.5:20 ../../man/deb-shlibs.5:20
+#: ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
 #: ../../man/dpkg-architecture.1:5 ../../man/dpkg-buildpackage.1:5
 #: ../../man/dpkg-checkbuilddeps.1:5 ../../man/dpkg-distaddfile.1:5
 #: ../../man/dpkg-deb.1:5 ../../man/dpkg-divert.8:5
@@ -122,7 +125,7 @@ msgstr "B<822-date>"
 
 # type: SH
 #: ../../man/822-date.1:9 ../../man/cleanup-info.8:11 ../../man/deb.5:6
-#: ../../man/deb-control.5:10 ../../man/deb-old.5:8
+#: ../../man/deb-control.5:10 ../../man/deb-version.5:11 ../../man/deb-old.5:8
 #: ../../man/deb-override.5:23 ../../man/deb-shlibs.5:23
 #: ../../man/deb-substvars.5:9 ../../man/dpkg.1:19
 #: ../../man/dpkg-architecture.1:11 ../../man/dpkg.cfg.5:5
@@ -211,18 +214,18 @@ msgstr "Esta funcionalidad en realidad deber
 
 # type: SH
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
-#: ../../man/deb-control.5:227 ../../man/deb-old.5:51
-#: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608
-#: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-buildpackage.1:204 ../../man/dpkg-deb.1:238
-#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:98
-#: ../../man/dpkg-query.1:157 ../../man/dpkg-scanpackages.1:100
-#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:279
-#: ../../man/dpkg-source.1:278 ../../man/dpkg-split.1:226
-#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
-#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
-#: ../../man/update-alternatives.8:403
+#: ../../man/deb-control.5:227 ../../man/deb-version.5:116
+#: ../../man/deb-old.5:51 ../../man/deb-override.5:67
+#: ../../man/deb-shlibs.5:29 ../../man/deb-substvars.5:129
+#: ../../man/dpkg.1:608 ../../man/dpkg-architecture.1:268
+#: ../../man/dpkg.cfg.5:21 ../../man/dpkg-buildpackage.1:204
+#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
+#: ../../man/dpkg-name.1:98 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-scanpackages.1:100 ../../man/dpkg-scansources.1:65
+#: ../../man/dpkg-shlibdeps.1:279 ../../man/dpkg-source.1:278
+#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
+#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
+#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
 #, fuzzy, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -464,15 +467,16 @@ msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr "Copyright (C) 1996 Kim-Minh Kaplan."
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
-#: ../../man/dpkg-buildpackage.1:219 ../../man/dpkg-checkbuilddeps.1:35
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
-#: ../../man/dpkg-gencontrol.1:145 ../../man/dpkg-name.1:110
-#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:156
-#: ../../man/dpkg-shlibdeps.1:294 ../../man/dpkg-source.1:289
-#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:85
-#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
+#: ../../man/cleanup-info.8:58 ../../man/deb-version.5:126
+#: ../../man/deb-substvars.5:142 ../../man/dpkg-buildpackage.1:219
+#: ../../man/dpkg-checkbuilddeps.1:35 ../../man/dpkg-distaddfile.1:53
+#: ../../man/dpkg-deb.1:248 ../../man/dpkg-divert.8:125
+#: ../../man/dpkg-genchanges.1:150 ../../man/dpkg-gencontrol.1:145
+#: ../../man/dpkg-name.1:110 ../../man/dpkg-parsechangelog.1:54
+#: ../../man/dpkg-query.1:156 ../../man/dpkg-shlibdeps.1:294
+#: ../../man/dpkg-source.1:289 ../../man/dpkg-split.1:236
+#: ../../man/dpkg-statoverride.8:85 ../../man/install-info.8:295
+#: ../../man/update-alternatives.8:397
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
@@ -495,8 +499,8 @@ msgid "2006-02-28"
 msgstr ""
 
 # type: TH
-#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-old.5:1
-#: ../../man/dselect.1:1
+#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-version.5:5
+#: ../../man/deb-old.5:1 ../../man/dselect.1:1
 #, fuzzy, no-wrap
 msgid "Debian"
 msgstr ""
@@ -739,9 +743,8 @@ msgstr "B<Version: >E<lt>cadena de caracteres con el n
 msgid ""
 "Typically, this is the original package's version number in whatever form "
 "the program's author uses. It may also include a Debian revision number (for "
-"non-native packages). If both version and revision are supplied, they are "
-"separated by a hyphen, `-'. For this reason, the original version may not "
-"have a hyphen in its version number."
+"non-native packages). The exact format and sorting algorithm are described "
+"in B<deb-version>(5)."
 msgstr ""
 "Normalmente es la versión original de paquete en el formato que use su "
 "autor. Puede incluir el número de revisión de Debian (para paquetes que no "
@@ -1229,11 +1232,242 @@ msgstr ""
 " will run more slowly, however.)\n"
 
 # type: Plain text
-#: ../../man/deb-control.5:231
+#: ../../man/deb-control.5:232
 #, fuzzy
-msgid "B<deb>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+msgid ""
+"B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
+# type: IX
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "deb-version"
+msgstr "--version"
+
+# type: TH
+#: ../../man/deb-version.5:5
+#, no-wrap
+msgid "2007-10-06"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:8
+#, fuzzy
+msgid "deb-version - Debian package version number format"
+msgstr ""
+"deb-control - formato del fichero de control maestro de los paquetes Debian."
+
+# type: Plain text
+#: ../../man/deb-version.5:11
+msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:14
+msgid ""
+"Version numbers as used for Debian binary and source packages consist of "
+"three components. These are:"
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:14
+#, no-wrap
+msgid "I<epoch>"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:20
+msgid ""
+"This is a single (generally small) unsigned integer.  It may be omitted, in "
+"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"may not contain any colons."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:24
+msgid ""
+"It is provided to allow mistakes in the version numbers of older versions of "
+"a package, and also a package's previous version numbering schemes, to be "
+"left behind."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:24
+#, fuzzy, no-wrap
+msgid "I<upstream_version>"
+msgstr "B<dpkg:UpstreamVersion>"
+
+# type: Plain text
+#: ../../man/deb-version.5:34
+msgid ""
+"This is the main part of the version number.  It is usually the version "
+"number of the original (\"upstream\")  package from which the I<.deb> file "
+"has been made, if this is applicable.  Usually this will be in the same "
+"format as that specified by the upstream author(s); however, it may need to "
+"be reformatted to fit into the package management system's format and "
+"comparison scheme."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:39
+msgid ""
+"The comparison behavior of the package management system with respect to the "
+"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"the version number is mandatory."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:48
+msgid ""
+"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
+"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"then hyphens are not allowed; if there is no I<epoch> then colons are not "
+"allowed."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:48
+#, fuzzy, no-wrap
+msgid "I<debian_revision>"
+msgstr "B<dpkg:Version>"
+
+# type: Plain text
+#: ../../man/deb-version.5:57
+msgid ""
+"This part of the version number specifies the version of the Debian package "
+"based on the upstream version.  It may contain only alphanumerics and the "
+"characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
+"same way as the I<upstream_version> is."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:64
+msgid ""
+"It is optional; if it isn't present then the I<upstream_version> may not "
+"contain a hyphen.  This format represents the case where a piece of software "
+"was written specifically to be turned into a Debian package, and so there is "
+"only one \"debianisation\" of it and therefore no revision indication is "
+"required."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:68
+msgid ""
+"It is conventional to restart the I<debian_revision> at '1' each time time "
+"the I<upstream_version> is increased."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:76
+msgid ""
+"Dpkg will break the version number apart at the last hyphen in the string "
+"(if there is one) to determine the I<upstream_version> and "
+"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
+"than the presence of one (but note that the I<debian_revision> is the least "
+"significant part of the version number)."
+msgstr ""
+
+# type: SS
+#: ../../man/deb-version.5:76
+#, no-wrap
+msgid "Sorting Algorithm"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:80
+msgid ""
+"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"package management system using the same algorithm:"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:82
+msgid "The strings are compared from left to right."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:92
+msgid ""
+"First the initial part of each string consisting entirely of non-digit "
+"characters is determined.  These two parts (one of which may be empty) are "
+"compared lexically.  If a difference is found it is returned.  The lexical "
+"comparison is a comparison of ASCII values modified so that all the letters "
+"sort earlier than all the non-letters and so that a tilde sorts before "
+"anything, even the end of a part.  For example, the following parts are in "
+"sorted order: '~~', '~~a', '~', the empty part, 'a'."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:100
+msgid ""
+"Then the initial part of the remainder of each string which consists "
+"entirely of digit characters is determined.  The numerical values of these "
+"two parts are compared, and any difference found is returned as the result "
+"of the comparison.  For these purposes an empty string (which can only occur "
+"at the end of one or both version strings being compared) counts as zero."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:104
+msgid ""
+"These two steps (comparing and removing initial non-digit strings and "
+"initial digit strings) are repeated until a difference is found or both "
+"strings are exhausted."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:112
+msgid ""
+"Note that the purpose of epochs is to allow us to leave behind mistakes in "
+"version numbering, and to cope with situations where the version numbering "
+"scheme changes.  It is B<not> intended to cope with version numbers "
+"containing strings of letters which the package management system cannot "
+"interpret (such as 'ALPHA' or 'pre-'), or with silly orderings."
+msgstr ""
+
+# type: SH
+#: ../../man/deb-version.5:112
+#, no-wrap
+msgid "CAVEATS"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:116
+msgid ""
+"The tilde character and its special sorting properties were introduced in "
+"dpkg, version 1.10 and some parts of dpkg-dev only gained support for it "
+"later in the 1.10.x series."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:120
+#, fuzzy
+msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(8)"
+
+# type: SH
+#: ../../man/deb-version.5:120 ../../man/dpkg.1:621
+#: ../../man/dpkg-buildpackage.1:211 ../../man/dpkg-distaddfile.1:47
+#: ../../man/dpkg-genchanges.1:144 ../../man/dpkg-gencontrol.1:137
+#: ../../man/dpkg-parsechangelog.1:48 ../../man/dpkg-shlibdeps.1:284
+#: ../../man/dpkg-source.1:283 ../../man/dselect.1:449
+#: ../../man/start-stop-daemon.8:242
+#, fuzzy, no-wrap
+msgid "AUTHORS"
+msgstr "AUTORES"
+
+# type: Plain text
+#: ../../man/deb-version.5:122
+msgid "Copyright © 1996,1997,1998 Ian Jackson and Christian Schwarz."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:124
+#, fuzzy
+msgid "Copyright © 2007 Frank Lichtenheld"
+msgstr "Copyright (C) 2000 Wichert Akkerman"
+
 # type: TH
 #: ../../man/deb-old.5:1
 #, no-wrap
@@ -3599,16 +3833,6 @@ msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr ""
 "Normalmente, la opción B<--no-act> da menos información de la que necesita."
 
-# type: SH
-#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:211
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
-#: ../../man/dpkg-gencontrol.1:137 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:284 ../../man/dpkg-source.1:283
-#: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
-#, fuzzy, no-wrap
-msgid "AUTHORS"
-msgstr "AUTORES"
-
 # type: Plain text
 #: ../../man/dpkg.1:623 ../../man/dpkg.cfg.5:20
 #, fuzzy
@@ -12862,11 +13086,6 @@ msgstr "B<ln>(1), FHS, el est
 #~ msgid "-s, --source-override file"
 #~ msgstr "-s, --source-override fichero"
 
-# type: IX
-#, fuzzy
-#~ msgid "--version"
-#~ msgstr "--version"
-
 # type: TH
 #, fuzzy
 #~ msgid "DSELECT"

man/po/fr.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-11-29 06:04+0200\n"
+"POT-Creation-Date: 2007-12-04 01:23+0100\n"
 "PO-Revision-Date: 2007-05-17 03:10+0200\n"
 "Last-Translator: Nicolas François <nicolas.francois@centraliens.net>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -29,8 +29,9 @@ msgstr "24-01-2007"
 
 # type: TH
 #: ../../man/822-date.1:2 ../../man/cleanup-info.8:1 ../../man/deb.5:1
-#: ../../man/deb-control.5:3 ../../man/deb-old.5:1 ../../man/deb-override.5:16
-#: ../../man/deb-shlibs.5:16 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/deb-control.5:3 ../../man/deb-version.5:5 ../../man/deb-old.5:1
+#: ../../man/deb-override.5:16 ../../man/deb-shlibs.5:16
+#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
 #: ../../man/dpkg-architecture.1:1 ../../man/dpkg.cfg.5:1
 #: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
 #: ../../man/dpkg-distaddfile.1:1 ../../man/dpkg-deb.1:1
@@ -65,8 +66,9 @@ msgstr "Utilitaires de dpkg"
 
 # type: SH
 #: ../../man/822-date.1:3 ../../man/cleanup-info.8:2 ../../man/deb.5:2
-#: ../../man/deb-control.5:4 ../../man/deb-old.5:2 ../../man/deb-override.5:17
-#: ../../man/deb-shlibs.5:17 ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
+#: ../../man/deb-control.5:4 ../../man/deb-version.5:6 ../../man/deb-old.5:2
+#: ../../man/deb-override.5:17 ../../man/deb-shlibs.5:17
+#: ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
 #: ../../man/dpkg-architecture.1:2 ../../man/dpkg.cfg.5:2
 #: ../../man/dpkg-buildpackage.1:2 ../../man/dpkg-checkbuilddeps.1:2
 #: ../../man/dpkg-distaddfile.1:2 ../../man/dpkg-deb.1:2
@@ -89,8 +91,9 @@ msgstr "822-date - Afficher la date au format RFC2822"
 
 # type: SH
 #: ../../man/822-date.1:6 ../../man/cleanup-info.8:5 ../../man/deb.5:4
-#: ../../man/deb-control.5:7 ../../man/deb-old.5:5 ../../man/deb-override.5:20
-#: ../../man/deb-shlibs.5:20 ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
+#: ../../man/deb-control.5:7 ../../man/deb-version.5:9 ../../man/deb-old.5:5
+#: ../../man/deb-override.5:20 ../../man/deb-shlibs.5:20
+#: ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
 #: ../../man/dpkg-architecture.1:5 ../../man/dpkg-buildpackage.1:5
 #: ../../man/dpkg-checkbuilddeps.1:5 ../../man/dpkg-distaddfile.1:5
 #: ../../man/dpkg-deb.1:5 ../../man/dpkg-divert.8:5
@@ -113,7 +116,7 @@ msgstr "B<822-date>"
 
 # type: SH
 #: ../../man/822-date.1:9 ../../man/cleanup-info.8:11 ../../man/deb.5:6
-#: ../../man/deb-control.5:10 ../../man/deb-old.5:8
+#: ../../man/deb-control.5:10 ../../man/deb-version.5:11 ../../man/deb-old.5:8
 #: ../../man/deb-override.5:23 ../../man/deb-shlibs.5:23
 #: ../../man/deb-substvars.5:9 ../../man/dpkg.1:19
 #: ../../man/dpkg-architecture.1:11 ../../man/dpkg.cfg.5:5
@@ -191,18 +194,18 @@ msgstr "Cette fonctionnalit
 
 # type: SH
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
-#: ../../man/deb-control.5:227 ../../man/deb-old.5:51
-#: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608
-#: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-buildpackage.1:204 ../../man/dpkg-deb.1:238
-#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:98
-#: ../../man/dpkg-query.1:157 ../../man/dpkg-scanpackages.1:100
-#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:279
-#: ../../man/dpkg-source.1:278 ../../man/dpkg-split.1:226
-#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
-#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
-#: ../../man/update-alternatives.8:403
+#: ../../man/deb-control.5:227 ../../man/deb-version.5:116
+#: ../../man/deb-old.5:51 ../../man/deb-override.5:67
+#: ../../man/deb-shlibs.5:29 ../../man/deb-substvars.5:129
+#: ../../man/dpkg.1:608 ../../man/dpkg-architecture.1:268
+#: ../../man/dpkg.cfg.5:21 ../../man/dpkg-buildpackage.1:204
+#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
+#: ../../man/dpkg-name.1:98 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-scanpackages.1:100 ../../man/dpkg-scansources.1:65
+#: ../../man/dpkg-shlibdeps.1:279 ../../man/dpkg-source.1:278
+#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
+#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
+#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
@@ -429,15 +432,16 @@ msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr "Copyright (C) 1996 Kim-Minh Kaplan."
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
-#: ../../man/dpkg-buildpackage.1:219 ../../man/dpkg-checkbuilddeps.1:35
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
-#: ../../man/dpkg-gencontrol.1:145 ../../man/dpkg-name.1:110
-#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:156
-#: ../../man/dpkg-shlibdeps.1:294 ../../man/dpkg-source.1:289
-#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:85
-#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
+#: ../../man/cleanup-info.8:58 ../../man/deb-version.5:126
+#: ../../man/deb-substvars.5:142 ../../man/dpkg-buildpackage.1:219
+#: ../../man/dpkg-checkbuilddeps.1:35 ../../man/dpkg-distaddfile.1:53
+#: ../../man/dpkg-deb.1:248 ../../man/dpkg-divert.8:125
+#: ../../man/dpkg-genchanges.1:150 ../../man/dpkg-gencontrol.1:145
+#: ../../man/dpkg-name.1:110 ../../man/dpkg-parsechangelog.1:54
+#: ../../man/dpkg-query.1:156 ../../man/dpkg-shlibdeps.1:294
+#: ../../man/dpkg-source.1:289 ../../man/dpkg-split.1:236
+#: ../../man/dpkg-statoverride.8:85 ../../man/install-info.8:295
+#: ../../man/update-alternatives.8:397
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO WARRANTY."
@@ -460,8 +464,8 @@ msgid "2006-02-28"
 msgstr "28-02-2006"
 
 # type: TH
-#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-old.5:1
-#: ../../man/dselect.1:1
+#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-version.5:5
+#: ../../man/deb-old.5:1 ../../man/dselect.1:1
 #, no-wrap
 msgid "Debian"
 msgstr "Debian"
@@ -677,12 +681,12 @@ msgstr "B<Version:> E<lt>cha
 
 # type: Plain text
 #: ../../man/deb-control.5:37
+#, fuzzy
 msgid ""
 "Typically, this is the original package's version number in whatever form "
 "the program's author uses. It may also include a Debian revision number (for "
-"non-native packages). If both version and revision are supplied, they are "
-"separated by a hyphen, `-'. For this reason, the original version may not "
-"have a hyphen in its version number."
+"non-native packages). The exact format and sorting algorithm are described "
+"in B<deb-version>(5)."
 msgstr ""
 "C'est classiquement le numéro de version du paquet original dans la forme "
 "choisie par l'auteur du programme. Il peut y avoir aussi un numéro de "
@@ -1164,11 +1168,242 @@ msgstr ""
 " ralentissent cependant le programme.)\n"
 
 # type: Plain text
-#: ../../man/deb-control.5:231
+#: ../../man/deb-control.5:232
 #, fuzzy
-msgid "B<deb>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+msgid ""
+"B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
+# type: TP
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "deb-version"
+msgstr "B<--version>"
+
+# type: TH
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "2007-10-06"
+msgstr "08-03-2007"
+
+# type: Plain text
+#: ../../man/deb-version.5:8
+#, fuzzy
+msgid "deb-version - Debian package version number format"
+msgstr ""
+"deb-control - Format du fichier principal de contrôle dans les paquets Debian"
+
+# type: Plain text
+#: ../../man/deb-version.5:11
+msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:14
+msgid ""
+"Version numbers as used for Debian binary and source packages consist of "
+"three components. These are:"
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:14
+#, no-wrap
+msgid "I<epoch>"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:20
+msgid ""
+"This is a single (generally small) unsigned integer.  It may be omitted, in "
+"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"may not contain any colons."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:24
+msgid ""
+"It is provided to allow mistakes in the version numbers of older versions of "
+"a package, and also a package's previous version numbering schemes, to be "
+"left behind."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:24
+#, fuzzy, no-wrap
+msgid "I<upstream_version>"
+msgstr "B<source:Upstream-Version>"
+
+# type: Plain text
+#: ../../man/deb-version.5:34
+msgid ""
+"This is the main part of the version number.  It is usually the version "
+"number of the original (\"upstream\")  package from which the I<.deb> file "
+"has been made, if this is applicable.  Usually this will be in the same "
+"format as that specified by the upstream author(s); however, it may need to "
+"be reformatted to fit into the package management system's format and "
+"comparison scheme."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:39
+msgid ""
+"The comparison behavior of the package management system with respect to the "
+"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"the version number is mandatory."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:48
+msgid ""
+"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
+"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"then hyphens are not allowed; if there is no I<epoch> then colons are not "
+"allowed."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:48
+#, fuzzy, no-wrap
+msgid "I<debian_revision>"
+msgstr "B<binary:Version>"
+
+# type: Plain text
+#: ../../man/deb-version.5:57
+msgid ""
+"This part of the version number specifies the version of the Debian package "
+"based on the upstream version.  It may contain only alphanumerics and the "
+"characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
+"same way as the I<upstream_version> is."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:64
+msgid ""
+"It is optional; if it isn't present then the I<upstream_version> may not "
+"contain a hyphen.  This format represents the case where a piece of software "
+"was written specifically to be turned into a Debian package, and so there is "
+"only one \"debianisation\" of it and therefore no revision indication is "
+"required."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:68
+msgid ""
+"It is conventional to restart the I<debian_revision> at '1' each time time "
+"the I<upstream_version> is increased."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:76
+msgid ""
+"Dpkg will break the version number apart at the last hyphen in the string "
+"(if there is one) to determine the I<upstream_version> and "
+"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
+"than the presence of one (but note that the I<debian_revision> is the least "
+"significant part of the version number)."
+msgstr ""
+
+# type: SS
+#: ../../man/deb-version.5:76
+#, no-wrap
+msgid "Sorting Algorithm"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:80
+msgid ""
+"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"package management system using the same algorithm:"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:82
+msgid "The strings are compared from left to right."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:92
+msgid ""
+"First the initial part of each string consisting entirely of non-digit "
+"characters is determined.  These two parts (one of which may be empty) are "
+"compared lexically.  If a difference is found it is returned.  The lexical "
+"comparison is a comparison of ASCII values modified so that all the letters "
+"sort earlier than all the non-letters and so that a tilde sorts before "
+"anything, even the end of a part.  For example, the following parts are in "
+"sorted order: '~~', '~~a', '~', the empty part, 'a'."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:100
+msgid ""
+"Then the initial part of the remainder of each string which consists "
+"entirely of digit characters is determined.  The numerical values of these "
+"two parts are compared, and any difference found is returned as the result "
+"of the comparison.  For these purposes an empty string (which can only occur "
+"at the end of one or both version strings being compared) counts as zero."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:104
+msgid ""
+"These two steps (comparing and removing initial non-digit strings and "
+"initial digit strings) are repeated until a difference is found or both "
+"strings are exhausted."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:112
+msgid ""
+"Note that the purpose of epochs is to allow us to leave behind mistakes in "
+"version numbering, and to cope with situations where the version numbering "
+"scheme changes.  It is B<not> intended to cope with version numbers "
+"containing strings of letters which the package management system cannot "
+"interpret (such as 'ALPHA' or 'pre-'), or with silly orderings."
+msgstr ""
+
+# type: SH
+#: ../../man/deb-version.5:112
+#, no-wrap
+msgid "CAVEATS"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:116
+msgid ""
+"The tilde character and its special sorting properties were introduced in "
+"dpkg, version 1.10 and some parts of dpkg-dev only gained support for it "
+"later in the 1.10.x series."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:120
+#, fuzzy
+msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
+
+# type: SH
+#: ../../man/deb-version.5:120 ../../man/dpkg.1:621
+#: ../../man/dpkg-buildpackage.1:211 ../../man/dpkg-distaddfile.1:47
+#: ../../man/dpkg-genchanges.1:144 ../../man/dpkg-gencontrol.1:137
+#: ../../man/dpkg-parsechangelog.1:48 ../../man/dpkg-shlibdeps.1:284
+#: ../../man/dpkg-source.1:283 ../../man/dselect.1:449
+#: ../../man/start-stop-daemon.8:242
+#, no-wrap
+msgid "AUTHORS"
+msgstr "AUTEURS"
+
+# type: Plain text
+#: ../../man/deb-version.5:122
+msgid "Copyright © 1996,1997,1998 Ian Jackson and Christian Schwarz."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:124
+#, fuzzy
+msgid "Copyright © 2007 Frank Lichtenheld"
+msgstr "Copyright (C) 2000 Wichert Akkerman"
+
 # type: Plain text
 #: ../../man/deb-old.5:1
 #, no-wrap
@@ -3449,16 +3684,6 @@ msgstr ""
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "L'option B<--no-act> ne donne pas assez d'informations utiles."
 
-# type: SH
-#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:211
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
-#: ../../man/dpkg-gencontrol.1:137 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:284 ../../man/dpkg-source.1:283
-#: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
-#, no-wrap
-msgid "AUTHORS"
-msgstr "AUTEURS"
-
 # type: Plain text
 #: ../../man/dpkg.1:623 ../../man/dpkg.cfg.5:20
 msgid ""

man/po/hu.po

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2007-11-29 06:04+0200\n"
+"POT-Creation-Date: 2007-12-04 01:23+0100\n"
 "PO-Revision-Date: 2006-10-05 21:27+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian\n"
@@ -26,8 +26,9 @@ msgstr "2006-02-28"
 
 # type: TH
 #: ../../man/822-date.1:2 ../../man/cleanup-info.8:1 ../../man/deb.5:1
-#: ../../man/deb-control.5:3 ../../man/deb-old.5:1 ../../man/deb-override.5:16
-#: ../../man/deb-shlibs.5:16 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/deb-control.5:3 ../../man/deb-version.5:5 ../../man/deb-old.5:1
+#: ../../man/deb-override.5:16 ../../man/deb-shlibs.5:16
+#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
 #: ../../man/dpkg-architecture.1:1 ../../man/dpkg.cfg.5:1
 #: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
 #: ../../man/dpkg-distaddfile.1:1 ../../man/dpkg-deb.1:1
@@ -62,8 +63,9 @@ msgstr "dpkg készlet"
 
 # type: SH
 #: ../../man/822-date.1:3 ../../man/cleanup-info.8:2 ../../man/deb.5:2
-#: ../../man/deb-control.5:4 ../../man/deb-old.5:2 ../../man/deb-override.5:17
-#: ../../man/deb-shlibs.5:17 ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
+#: ../../man/deb-control.5:4 ../../man/deb-version.5:6 ../../man/deb-old.5:2
+#: ../../man/deb-override.5:17 ../../man/deb-shlibs.5:17
+#: ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
 #: ../../man/dpkg-architecture.1:2 ../../man/dpkg.cfg.5:2
 #: ../../man/dpkg-buildpackage.1:2 ../../man/dpkg-checkbuilddeps.1:2
 #: ../../man/dpkg-distaddfile.1:2 ../../man/dpkg-deb.1:2
@@ -86,8 +88,9 @@ msgstr ""
 
 # type: SH
 #: ../../man/822-date.1:6 ../../man/cleanup-info.8:5 ../../man/deb.5:4
-#: ../../man/deb-control.5:7 ../../man/deb-old.5:5 ../../man/deb-override.5:20
-#: ../../man/deb-shlibs.5:20 ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
+#: ../../man/deb-control.5:7 ../../man/deb-version.5:9 ../../man/deb-old.5:5
+#: ../../man/deb-override.5:20 ../../man/deb-shlibs.5:20
+#: ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
 #: ../../man/dpkg-architecture.1:5 ../../man/dpkg-buildpackage.1:5
 #: ../../man/dpkg-checkbuilddeps.1:5 ../../man/dpkg-distaddfile.1:5
 #: ../../man/dpkg-deb.1:5 ../../man/dpkg-divert.8:5
@@ -110,7 +113,7 @@ msgstr ""
 
 # type: SH
 #: ../../man/822-date.1:9 ../../man/cleanup-info.8:11 ../../man/deb.5:6
-#: ../../man/deb-control.5:10 ../../man/deb-old.5:8
+#: ../../man/deb-control.5:10 ../../man/deb-version.5:11 ../../man/deb-old.5:8
 #: ../../man/deb-override.5:23 ../../man/deb-shlibs.5:23
 #: ../../man/deb-substvars.5:9 ../../man/dpkg.1:19
 #: ../../man/dpkg-architecture.1:11 ../../man/dpkg.cfg.5:5
@@ -183,18 +186,18 @@ msgstr ""
 
 # type: SH
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
-#: ../../man/deb-control.5:227 ../../man/deb-old.5:51
-#: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608
-#: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-buildpackage.1:204 ../../man/dpkg-deb.1:238
-#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:98
-#: ../../man/dpkg-query.1:157 ../../man/dpkg-scanpackages.1:100
-#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:279
-#: ../../man/dpkg-source.1:278 ../../man/dpkg-split.1:226
-#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
-#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
-#: ../../man/update-alternatives.8:403
+#: ../../man/deb-control.5:227 ../../man/deb-version.5:116
+#: ../../man/deb-old.5:51 ../../man/deb-override.5:67
+#: ../../man/deb-shlibs.5:29 ../../man/deb-substvars.5:129
+#: ../../man/dpkg.1:608 ../../man/dpkg-architecture.1:268
+#: ../../man/dpkg.cfg.5:21 ../../man/dpkg-buildpackage.1:204
+#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
+#: ../../man/dpkg-name.1:98 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-scanpackages.1:100 ../../man/dpkg-scansources.1:65
+#: ../../man/dpkg-shlibdeps.1:279 ../../man/dpkg-source.1:278
+#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
+#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
+#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "LÁSD MÉG"
@@ -395,15 +398,16 @@ msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr ""
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
-#: ../../man/dpkg-buildpackage.1:219 ../../man/dpkg-checkbuilddeps.1:35
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
-#: ../../man/dpkg-gencontrol.1:145 ../../man/dpkg-name.1:110
-#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:156
-#: ../../man/dpkg-shlibdeps.1:294 ../../man/dpkg-source.1:289
-#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:85
-#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
+#: ../../man/cleanup-info.8:58 ../../man/deb-version.5:126
+#: ../../man/deb-substvars.5:142 ../../man/dpkg-buildpackage.1:219
+#: ../../man/dpkg-checkbuilddeps.1:35 ../../man/dpkg-distaddfile.1:53
+#: ../../man/dpkg-deb.1:248 ../../man/dpkg-divert.8:125
+#: ../../man/dpkg-genchanges.1:150 ../../man/dpkg-gencontrol.1:145
+#: ../../man/dpkg-name.1:110 ../../man/dpkg-parsechangelog.1:54
+#: ../../man/dpkg-query.1:156 ../../man/dpkg-shlibdeps.1:294
+#: ../../man/dpkg-source.1:289 ../../man/dpkg-split.1:236
+#: ../../man/dpkg-statoverride.8:85 ../../man/install-info.8:295
+#: ../../man/update-alternatives.8:397
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
@@ -428,8 +432,8 @@ msgid "2006-02-28"
 msgstr "2006-02-28"
 
 # type: TH
-#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-old.5:1
-#: ../../man/dselect.1:1
+#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-version.5:5
+#: ../../man/deb-old.5:1 ../../man/dselect.1:1
 #, no-wrap
 msgid "Debian"
 msgstr "Debian"
@@ -604,12 +608,12 @@ msgstr "B<Version:> E<lt>verzióE<gt>"
 
 # type: Plain text
 #: ../../man/deb-control.5:37
+#, fuzzy
 msgid ""
 "Typically, this is the original package's version number in whatever form "
 "the program's author uses. It may also include a Debian revision number (for "
-"non-native packages). If both version and revision are supplied, they are "
-"separated by a hyphen, `-'. For this reason, the original version may not "
-"have a hyphen in its version number."
+"non-native packages). The exact format and sorting algorithm are described "
+"in B<deb-version>(5)."
 msgstr ""
 "Ez általában az eredeti csomag verzió szám, a program szerzője által "
 "használt formában. Debian revízió számot is tartalmazhat (nem-natív "
@@ -1058,11 +1062,240 @@ msgstr ""
 " will run more slowly, however.)\n"
 
 # type: Plain text
-#: ../../man/deb-control.5:231
+#: ../../man/deb-control.5:232
 #, fuzzy
-msgid "B<deb>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+msgid ""
+"B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
+# type: TP
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "deb-version"
+msgstr "B<--version>"
+
+# type: TH
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "2007-10-06"
+msgstr "2006-02-28"
+
+# type: Plain text
+#: ../../man/deb-version.5:8
+#, fuzzy
+msgid "deb-version - Debian package version number format"
+msgstr "deb-control - Debian csomag fő kontroll fájl formátum"
+
+# type: Plain text
+#: ../../man/deb-version.5:11
+msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:14
+msgid ""
+"Version numbers as used for Debian binary and source packages consist of "
+"three components. These are:"
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:14
+#, no-wrap
+msgid "I<epoch>"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:20
+msgid ""
+"This is a single (generally small) unsigned integer.  It may be omitted, in "
+"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"may not contain any colons."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:24
+msgid ""
+"It is provided to allow mistakes in the version numbers of older versions of "
+"a package, and also a package's previous version numbering schemes, to be "
+"left behind."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:24
+#, fuzzy, no-wrap
+msgid "I<upstream_version>"
+msgstr "B<--version>"
+
+# type: Plain text
+#: ../../man/deb-version.5:34
+msgid ""
+"This is the main part of the version number.  It is usually the version "
+"number of the original (\"upstream\")  package from which the I<.deb> file "
+"has been made, if this is applicable.  Usually this will be in the same "
+"format as that specified by the upstream author(s); however, it may need to "
+"be reformatted to fit into the package management system's format and "
+"comparison scheme."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:39
+msgid ""
+"The comparison behavior of the package management system with respect to the "
+"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"the version number is mandatory."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:48
+msgid ""
+"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
+"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"then hyphens are not allowed; if there is no I<epoch> then colons are not "
+"allowed."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:48
+#, fuzzy, no-wrap
+msgid "I<debian_revision>"
+msgstr "B<--version>"
+
+# type: Plain text
+#: ../../man/deb-version.5:57
+msgid ""
+"This part of the version number specifies the version of the Debian package "
+"based on the upstream version.  It may contain only alphanumerics and the "
+"characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
+"same way as the I<upstream_version> is."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:64
+msgid ""
+"It is optional; if it isn't present then the I<upstream_version> may not "
+"contain a hyphen.  This format represents the case where a piece of software "
+"was written specifically to be turned into a Debian package, and so there is "
+"only one \"debianisation\" of it and therefore no revision indication is "
+"required."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:68
+msgid ""
+"It is conventional to restart the I<debian_revision> at '1' each time time "
+"the I<upstream_version> is increased."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:76
+msgid ""
+"Dpkg will break the version number apart at the last hyphen in the string "
+"(if there is one) to determine the I<upstream_version> and "
+"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
+"than the presence of one (but note that the I<debian_revision> is the least "
+"significant part of the version number)."
+msgstr ""
+
+# type: SS
+#: ../../man/deb-version.5:76
+#, no-wrap
+msgid "Sorting Algorithm"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:80
+msgid ""
+"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"package management system using the same algorithm:"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:82
+msgid "The strings are compared from left to right."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:92
+msgid ""
+"First the initial part of each string consisting entirely of non-digit "
+"characters is determined.  These two parts (one of which may be empty) are "
+"compared lexically.  If a difference is found it is returned.  The lexical "
+"comparison is a comparison of ASCII values modified so that all the letters "
+"sort earlier than all the non-letters and so that a tilde sorts before "
+"anything, even the end of a part.  For example, the following parts are in "
+"sorted order: '~~', '~~a', '~', the empty part, 'a'."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:100
+msgid ""
+"Then the initial part of the remainder of each string which consists "
+"entirely of digit characters is determined.  The numerical values of these "
+"two parts are compared, and any difference found is returned as the result "
+"of the comparison.  For these purposes an empty string (which can only occur "
+"at the end of one or both version strings being compared) counts as zero."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:104
+msgid ""
+"These two steps (comparing and removing initial non-digit strings and "
+"initial digit strings) are repeated until a difference is found or both "
+"strings are exhausted."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:112
+msgid ""
+"Note that the purpose of epochs is to allow us to leave behind mistakes in "
+"version numbering, and to cope with situations where the version numbering "
+"scheme changes.  It is B<not> intended to cope with version numbers "
+"containing strings of letters which the package management system cannot "
+"interpret (such as 'ALPHA' or 'pre-'), or with silly orderings."
+msgstr ""
+
+# type: SH
+#: ../../man/deb-version.5:112
+#, no-wrap
+msgid "CAVEATS"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:116
+msgid ""
+"The tilde character and its special sorting properties were introduced in "
+"dpkg, version 1.10 and some parts of dpkg-dev only gained support for it "
+"later in the 1.10.x series."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:120
+#, fuzzy
+msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+
+# type: SH
+#: ../../man/deb-version.5:120 ../../man/dpkg.1:621
+#: ../../man/dpkg-buildpackage.1:211 ../../man/dpkg-distaddfile.1:47
+#: ../../man/dpkg-genchanges.1:144 ../../man/dpkg-gencontrol.1:137
+#: ../../man/dpkg-parsechangelog.1:48 ../../man/dpkg-shlibdeps.1:284
+#: ../../man/dpkg-source.1:283 ../../man/dselect.1:449
+#: ../../man/start-stop-daemon.8:242
+#, fuzzy, no-wrap
+msgid "AUTHORS"
+msgstr "SZERZŐ"
+
+# type: Plain text
+#: ../../man/deb-version.5:122
+msgid "Copyright © 1996,1997,1998 Ian Jackson and Christian Schwarz."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:124
+msgid "Copyright © 2007 Frank Lichtenheld"
+msgstr ""
+
 # type: Plain text
 #: ../../man/deb-old.5:1
 #, fuzzy, no-wrap
@@ -2926,16 +3159,6 @@ msgstr ""
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr ""
 
-# type: SH
-#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:211
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
-#: ../../man/dpkg-gencontrol.1:137 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:284 ../../man/dpkg-source.1:283
-#: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
-#, fuzzy, no-wrap
-msgid "AUTHORS"
-msgstr "SZERZŐ"
-
 # type: Plain text
 #: ../../man/dpkg.1:623 ../../man/dpkg.cfg.5:20
 msgid ""

man/po/ja.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-11-29 06:04+0200\n"
+"POT-Creation-Date: 2007-12-04 01:23+0100\n"
 "PO-Revision-Date: 2006-09-19 20:31+0900\n"
 "Last-Translator: KISE Hiroshi <kise@fuyuneko.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -28,8 +28,9 @@ msgstr "2006-02-28"
 
 # type: TH
 #: ../../man/822-date.1:2 ../../man/cleanup-info.8:1 ../../man/deb.5:1
-#: ../../man/deb-control.5:3 ../../man/deb-old.5:1 ../../man/deb-override.5:16
-#: ../../man/deb-shlibs.5:16 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/deb-control.5:3 ../../man/deb-version.5:5 ../../man/deb-old.5:1
+#: ../../man/deb-override.5:16 ../../man/deb-shlibs.5:16
+#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
 #: ../../man/dpkg-architecture.1:1 ../../man/dpkg.cfg.5:1
 #: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
 #: ../../man/dpkg-distaddfile.1:1 ../../man/dpkg-deb.1:1
@@ -64,8 +65,9 @@ msgstr "dpkg utilities"
 
 # type: SH
 #: ../../man/822-date.1:3 ../../man/cleanup-info.8:2 ../../man/deb.5:2
-#: ../../man/deb-control.5:4 ../../man/deb-old.5:2 ../../man/deb-override.5:17
-#: ../../man/deb-shlibs.5:17 ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
+#: ../../man/deb-control.5:4 ../../man/deb-version.5:6 ../../man/deb-old.5:2
+#: ../../man/deb-override.5:17 ../../man/deb-shlibs.5:17
+#: ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
 #: ../../man/dpkg-architecture.1:2 ../../man/dpkg.cfg.5:2
 #: ../../man/dpkg-buildpackage.1:2 ../../man/dpkg-checkbuilddeps.1:2
 #: ../../man/dpkg-distaddfile.1:2 ../../man/dpkg-deb.1:2
@@ -93,8 +95,9 @@ msgstr "822-date - RFC822フォーマットの日付と時間の表示"
 
 # type: SH
 #: ../../man/822-date.1:6 ../../man/cleanup-info.8:5 ../../man/deb.5:4
-#: ../../man/deb-control.5:7 ../../man/deb-old.5:5 ../../man/deb-override.5:20
-#: ../../man/deb-shlibs.5:20 ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
+#: ../../man/deb-control.5:7 ../../man/deb-version.5:9 ../../man/deb-old.5:5
+#: ../../man/deb-override.5:20 ../../man/deb-shlibs.5:20
+#: ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
 #: ../../man/dpkg-architecture.1:5 ../../man/dpkg-buildpackage.1:5
 #: ../../man/dpkg-checkbuilddeps.1:5 ../../man/dpkg-distaddfile.1:5
 #: ../../man/dpkg-deb.1:5 ../../man/dpkg-divert.8:5
@@ -117,7 +120,7 @@ msgstr "B<822-date>"
 
 # type: SH
 #: ../../man/822-date.1:9 ../../man/cleanup-info.8:11 ../../man/deb.5:6
-#: ../../man/deb-control.5:10 ../../man/deb-old.5:8
+#: ../../man/deb-control.5:10 ../../man/deb-version.5:11 ../../man/deb-old.5:8
 #: ../../man/deb-override.5:23 ../../man/deb-shlibs.5:23
 #: ../../man/deb-substvars.5:9 ../../man/dpkg.1:19
 #: ../../man/dpkg-architecture.1:11 ../../man/dpkg.cfg.5:5
@@ -193,18 +196,18 @@ msgstr "この機能は実際には B<date>(1) の一部であるべきである
 
 # type: SH
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
-#: ../../man/deb-control.5:227 ../../man/deb-old.5:51
-#: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608
-#: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-buildpackage.1:204 ../../man/dpkg-deb.1:238
-#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:98
-#: ../../man/dpkg-query.1:157 ../../man/dpkg-scanpackages.1:100
-#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:279
-#: ../../man/dpkg-source.1:278 ../../man/dpkg-split.1:226
-#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
-#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
-#: ../../man/update-alternatives.8:403
+#: ../../man/deb-control.5:227 ../../man/deb-version.5:116
+#: ../../man/deb-old.5:51 ../../man/deb-override.5:67
+#: ../../man/deb-shlibs.5:29 ../../man/deb-substvars.5:129
+#: ../../man/dpkg.1:608 ../../man/dpkg-architecture.1:268
+#: ../../man/dpkg.cfg.5:21 ../../man/dpkg-buildpackage.1:204
+#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
+#: ../../man/dpkg-name.1:98 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-scanpackages.1:100 ../../man/dpkg-scansources.1:65
+#: ../../man/dpkg-shlibdeps.1:279 ../../man/dpkg-source.1:278
+#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
+#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
+#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
@@ -425,15 +428,16 @@ msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr "Copyright (C) 1996 Kim-Minh Kaplan."
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
-#: ../../man/dpkg-buildpackage.1:219 ../../man/dpkg-checkbuilddeps.1:35
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
-#: ../../man/dpkg-gencontrol.1:145 ../../man/dpkg-name.1:110
-#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:156
-#: ../../man/dpkg-shlibdeps.1:294 ../../man/dpkg-source.1:289
-#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:85
-#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
+#: ../../man/cleanup-info.8:58 ../../man/deb-version.5:126
+#: ../../man/deb-substvars.5:142 ../../man/dpkg-buildpackage.1:219
+#: ../../man/dpkg-checkbuilddeps.1:35 ../../man/dpkg-distaddfile.1:53
+#: ../../man/dpkg-deb.1:248 ../../man/dpkg-divert.8:125
+#: ../../man/dpkg-genchanges.1:150 ../../man/dpkg-gencontrol.1:145
+#: ../../man/dpkg-name.1:110 ../../man/dpkg-parsechangelog.1:54
+#: ../../man/dpkg-query.1:156 ../../man/dpkg-shlibdeps.1:294
+#: ../../man/dpkg-source.1:289 ../../man/dpkg-split.1:236
+#: ../../man/dpkg-statoverride.8:85 ../../man/install-info.8:295
+#: ../../man/update-alternatives.8:397
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
@@ -456,8 +460,8 @@ msgid "2006-02-28"
 msgstr "2006-02-28"
 
 # type: TH
-#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-old.5:1
-#: ../../man/dselect.1:1
+#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-version.5:5
+#: ../../man/deb-old.5:1 ../../man/dselect.1:1
 #, no-wrap
 msgid "Debian"
 msgstr "Debian"
@@ -667,12 +671,12 @@ msgstr "B<Version:> E<lt>バージョン文字列E<gt>"
 
 # type: Plain text
 #: ../../man/deb-control.5:37
+#, fuzzy
 msgid ""
 "Typically, this is the original package's version number in whatever form "
 "the program's author uses. It may also include a Debian revision number (for "
-"non-native packages). If both version and revision are supplied, they are "
-"separated by a hyphen, `-'. For this reason, the original version may not "
-"have a hyphen in its version number."
+"non-native packages). The exact format and sorting algorithm are described "
+"in B<deb-version>(5)."
 msgstr ""
 "普通は、これはパッケージのプログラムの作者が利用しているパッケージのバージョ"
 "ン番号である。(Debian 独自のパッケージでない場合は) Debian リビジョン番号が追"
@@ -1133,11 +1137,242 @@ msgstr ""
 " will run more slowly, however).\n"
 
 # type: Plain text
-#: ../../man/deb-control.5:231
+#: ../../man/deb-control.5:232
 #, fuzzy
-msgid "B<deb>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+msgid ""
+"B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
+# type: TP
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "deb-version"
+msgstr "B<--version>"
+
+# type: TH
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "2007-10-06"
+msgstr "2006-02-28"
+
+# type: Plain text
+#: ../../man/deb-version.5:8
+#, fuzzy
+msgid "deb-version - Debian package version number format"
+msgstr ""
+"deb-control - Debian パッケージのマスターコントロールファイルフォーマット"
+
+# type: Plain text
+#: ../../man/deb-version.5:11
+msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:14
+msgid ""
+"Version numbers as used for Debian binary and source packages consist of "
+"three components. These are:"
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:14
+#, no-wrap
+msgid "I<epoch>"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:20
+msgid ""
+"This is a single (generally small) unsigned integer.  It may be omitted, in "
+"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"may not contain any colons."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:24
+msgid ""
+"It is provided to allow mistakes in the version numbers of older versions of "
+"a package, and also a package's previous version numbering schemes, to be "
+"left behind."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:24
+#, fuzzy, no-wrap
+msgid "I<upstream_version>"
+msgstr "B<dpkg --version>"
+
+# type: Plain text
+#: ../../man/deb-version.5:34
+msgid ""
+"This is the main part of the version number.  It is usually the version "
+"number of the original (\"upstream\")  package from which the I<.deb> file "
+"has been made, if this is applicable.  Usually this will be in the same "
+"format as that specified by the upstream author(s); however, it may need to "
+"be reformatted to fit into the package management system's format and "
+"comparison scheme."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:39
+msgid ""
+"The comparison behavior of the package management system with respect to the "
+"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"the version number is mandatory."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:48
+msgid ""
+"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
+"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"then hyphens are not allowed; if there is no I<epoch> then colons are not "
+"allowed."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:48
+#, fuzzy, no-wrap
+msgid "I<debian_revision>"
+msgstr "B<--version>"
+
+# type: Plain text
+#: ../../man/deb-version.5:57
+msgid ""
+"This part of the version number specifies the version of the Debian package "
+"based on the upstream version.  It may contain only alphanumerics and the "
+"characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
+"same way as the I<upstream_version> is."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:64
+msgid ""
+"It is optional; if it isn't present then the I<upstream_version> may not "
+"contain a hyphen.  This format represents the case where a piece of software "
+"was written specifically to be turned into a Debian package, and so there is "
+"only one \"debianisation\" of it and therefore no revision indication is "
+"required."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:68
+msgid ""
+"It is conventional to restart the I<debian_revision> at '1' each time time "
+"the I<upstream_version> is increased."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:76
+msgid ""
+"Dpkg will break the version number apart at the last hyphen in the string "
+"(if there is one) to determine the I<upstream_version> and "
+"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
+"than the presence of one (but note that the I<debian_revision> is the least "
+"significant part of the version number)."
+msgstr ""
+
+# type: SS
+#: ../../man/deb-version.5:76
+#, no-wrap
+msgid "Sorting Algorithm"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:80
+msgid ""
+"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"package management system using the same algorithm:"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:82
+msgid "The strings are compared from left to right."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:92
+msgid ""
+"First the initial part of each string consisting entirely of non-digit "
+"characters is determined.  These two parts (one of which may be empty) are "
+"compared lexically.  If a difference is found it is returned.  The lexical "
+"comparison is a comparison of ASCII values modified so that all the letters "
+"sort earlier than all the non-letters and so that a tilde sorts before "
+"anything, even the end of a part.  For example, the following parts are in "
+"sorted order: '~~', '~~a', '~', the empty part, 'a'."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:100
+msgid ""
+"Then the initial part of the remainder of each string which consists "
+"entirely of digit characters is determined.  The numerical values of these "
+"two parts are compared, and any difference found is returned as the result "
+"of the comparison.  For these purposes an empty string (which can only occur "
+"at the end of one or both version strings being compared) counts as zero."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:104
+msgid ""
+"These two steps (comparing and removing initial non-digit strings and "
+"initial digit strings) are repeated until a difference is found or both "
+"strings are exhausted."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:112
+msgid ""
+"Note that the purpose of epochs is to allow us to leave behind mistakes in "
+"version numbering, and to cope with situations where the version numbering "
+"scheme changes.  It is B<not> intended to cope with version numbers "
+"containing strings of letters which the package management system cannot "
+"interpret (such as 'ALPHA' or 'pre-'), or with silly orderings."
+msgstr ""
+
+# type: SH
+#: ../../man/deb-version.5:112
+#, no-wrap
+msgid "CAVEATS"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:116
+msgid ""
+"The tilde character and its special sorting properties were introduced in "
+"dpkg, version 1.10 and some parts of dpkg-dev only gained support for it "
+"later in the 1.10.x series."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:120
+#, fuzzy
+msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+
+# type: SH
+#: ../../man/deb-version.5:120 ../../man/dpkg.1:621
+#: ../../man/dpkg-buildpackage.1:211 ../../man/dpkg-distaddfile.1:47
+#: ../../man/dpkg-genchanges.1:144 ../../man/dpkg-gencontrol.1:137
+#: ../../man/dpkg-parsechangelog.1:48 ../../man/dpkg-shlibdeps.1:284
+#: ../../man/dpkg-source.1:283 ../../man/dselect.1:449
+#: ../../man/start-stop-daemon.8:242
+#, no-wrap
+msgid "AUTHORS"
+msgstr "著者"
+
+# type: Plain text
+#: ../../man/deb-version.5:122
+msgid "Copyright © 1996,1997,1998 Ian Jackson and Christian Schwarz."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:124
+#, fuzzy
+msgid "Copyright © 2007 Frank Lichtenheld"
+msgstr "Copyright 2000 Wichert Akkerman"
+
 # type: TH
 #: ../../man/deb-old.5:1
 #, no-wrap
@@ -3318,16 +3553,6 @@ msgstr ""
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "B<--no-act> の提供する情報はたいていの場合、不充分である。"
 
-# type: SH
-#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:211
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
-#: ../../man/dpkg-gencontrol.1:137 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:284 ../../man/dpkg-source.1:283
-#: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
-#, no-wrap
-msgid "AUTHORS"
-msgstr "著者"
-
 # type: Plain text
 #: ../../man/dpkg.1:623 ../../man/dpkg.cfg.5:20
 #, fuzzy

man/po/pl.po

@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.17\n"
-"POT-Creation-Date: 2007-11-29 06:04+0200\n"
+"POT-Creation-Date: 2007-12-04 01:23+0100\n"
 "PO-Revision-Date: 2007-11-12 09:18+0100\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -28,8 +28,9 @@ msgstr "2007-01-24"
 
 # type: TH
 #: ../../man/822-date.1:2 ../../man/cleanup-info.8:1 ../../man/deb.5:1
-#: ../../man/deb-control.5:3 ../../man/deb-old.5:1 ../../man/deb-override.5:16
-#: ../../man/deb-shlibs.5:16 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/deb-control.5:3 ../../man/deb-version.5:5 ../../man/deb-old.5:1
+#: ../../man/deb-override.5:16 ../../man/deb-shlibs.5:16
+#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
 #: ../../man/dpkg-architecture.1:1 ../../man/dpkg.cfg.5:1
 #: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
 #: ../../man/dpkg-distaddfile.1:1 ../../man/dpkg-deb.1:1
@@ -64,8 +65,9 @@ msgstr "u
 
 # type: SH
 #: ../../man/822-date.1:3 ../../man/cleanup-info.8:2 ../../man/deb.5:2
-#: ../../man/deb-control.5:4 ../../man/deb-old.5:2 ../../man/deb-override.5:17
-#: ../../man/deb-shlibs.5:17 ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
+#: ../../man/deb-control.5:4 ../../man/deb-version.5:6 ../../man/deb-old.5:2
+#: ../../man/deb-override.5:17 ../../man/deb-shlibs.5:17
+#: ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
 #: ../../man/dpkg-architecture.1:2 ../../man/dpkg.cfg.5:2
 #: ../../man/dpkg-buildpackage.1:2 ../../man/dpkg-checkbuilddeps.1:2
 #: ../../man/dpkg-distaddfile.1:2 ../../man/dpkg-deb.1:2
@@ -89,8 +91,9 @@ msgstr "822-date - Drukuje dat
 
 # type: SH
 #: ../../man/822-date.1:6 ../../man/cleanup-info.8:5 ../../man/deb.5:4
-#: ../../man/deb-control.5:7 ../../man/deb-old.5:5 ../../man/deb-override.5:20
-#: ../../man/deb-shlibs.5:20 ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
+#: ../../man/deb-control.5:7 ../../man/deb-version.5:9 ../../man/deb-old.5:5
+#: ../../man/deb-override.5:20 ../../man/deb-shlibs.5:20
+#: ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
 #: ../../man/dpkg-architecture.1:5 ../../man/dpkg-buildpackage.1:5
 #: ../../man/dpkg-checkbuilddeps.1:5 ../../man/dpkg-distaddfile.1:5
 #: ../../man/dpkg-deb.1:5 ../../man/dpkg-divert.8:5
@@ -114,7 +117,7 @@ msgstr "B<822-date>"
 
 # type: SH
 #: ../../man/822-date.1:9 ../../man/cleanup-info.8:11 ../../man/deb.5:6
-#: ../../man/deb-control.5:10 ../../man/deb-old.5:8
+#: ../../man/deb-control.5:10 ../../man/deb-version.5:11 ../../man/deb-old.5:8
 #: ../../man/deb-override.5:23 ../../man/deb-shlibs.5:23
 #: ../../man/deb-substvars.5:9 ../../man/dpkg.1:19
 #: ../../man/dpkg-architecture.1:11 ../../man/dpkg.cfg.5:5
@@ -195,18 +198,18 @@ msgstr "To polecenie powinno by
 
 # type: SH
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
-#: ../../man/deb-control.5:227 ../../man/deb-old.5:51
-#: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608
-#: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-buildpackage.1:204 ../../man/dpkg-deb.1:238
-#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:98
-#: ../../man/dpkg-query.1:157 ../../man/dpkg-scanpackages.1:100
-#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:279
-#: ../../man/dpkg-source.1:278 ../../man/dpkg-split.1:226
-#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
-#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
-#: ../../man/update-alternatives.8:403
+#: ../../man/deb-control.5:227 ../../man/deb-version.5:116
+#: ../../man/deb-old.5:51 ../../man/deb-override.5:67
+#: ../../man/deb-shlibs.5:29 ../../man/deb-substvars.5:129
+#: ../../man/dpkg.1:608 ../../man/dpkg-architecture.1:268
+#: ../../man/dpkg.cfg.5:21 ../../man/dpkg-buildpackage.1:204
+#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
+#: ../../man/dpkg-name.1:98 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-scanpackages.1:100 ../../man/dpkg-scansources.1:65
+#: ../../man/dpkg-shlibdeps.1:279 ../../man/dpkg-source.1:278
+#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
+#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
+#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "ZOBACZ TAK¯E"
@@ -427,15 +430,16 @@ msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr "Copyright (C) 1996 Kim-Minh Kaplan"
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
-#: ../../man/dpkg-buildpackage.1:219 ../../man/dpkg-checkbuilddeps.1:35
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
-#: ../../man/dpkg-gencontrol.1:145 ../../man/dpkg-name.1:110
-#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:156
-#: ../../man/dpkg-shlibdeps.1:294 ../../man/dpkg-source.1:289
-#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:85
-#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
+#: ../../man/cleanup-info.8:58 ../../man/deb-version.5:126
+#: ../../man/deb-substvars.5:142 ../../man/dpkg-buildpackage.1:219
+#: ../../man/dpkg-checkbuilddeps.1:35 ../../man/dpkg-distaddfile.1:53
+#: ../../man/dpkg-deb.1:248 ../../man/dpkg-divert.8:125
+#: ../../man/dpkg-genchanges.1:150 ../../man/dpkg-gencontrol.1:145
+#: ../../man/dpkg-name.1:110 ../../man/dpkg-parsechangelog.1:54
+#: ../../man/dpkg-query.1:156 ../../man/dpkg-shlibdeps.1:294
+#: ../../man/dpkg-source.1:289 ../../man/dpkg-split.1:236
+#: ../../man/dpkg-statoverride.8:85 ../../man/install-info.8:295
+#: ../../man/update-alternatives.8:397
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO WARRANTY."
@@ -458,8 +462,8 @@ msgid "2006-02-28"
 msgstr "2006-02-28"
 
 # type: TH
-#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-old.5:1
-#: ../../man/dselect.1:1
+#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-version.5:5
+#: ../../man/deb-old.5:1 ../../man/dselect.1:1
 #, no-wrap
 msgid "Debian"
 msgstr "Debian"
@@ -673,12 +677,12 @@ msgstr "B<Version:> E<lt>oznaczenie wersjiE<gt>"
 
 # type: Plain text
 #: ../../man/deb-control.5:37
+#, fuzzy
 msgid ""
 "Typically, this is the original package's version number in whatever form "
 "the program's author uses. It may also include a Debian revision number (for "
-"non-native packages). If both version and revision are supplied, they are "
-"separated by a hyphen, `-'. For this reason, the original version may not "
-"have a hyphen in its version number."
+"non-native packages). The exact format and sorting algorithm are described "
+"in B<deb-version>(5)."
 msgstr ""
 "Zazwyczaj, jest to oryginalna wersja pakietu w takiej postaci, jakiej u¿ywa "
 "autor pakietu. Mo¿e tak¿e zwieraæ wersjê zmian pakietu Debiana (dla pakietów "
@@ -1153,10 +1157,243 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../man/deb-control.5:231
-msgid "B<deb>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+#: ../../man/deb-control.5:232
+#, fuzzy
+msgid ""
+"B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr "B<deb>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 
+# type: TP
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "deb-version"
+msgstr "B<--version>"
+
+# type: TH
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "2007-10-06"
+msgstr "2007-10-08"
+
+# type: Plain text
+#
+#: ../../man/deb-version.5:8
+#, fuzzy
+msgid "deb-version - Debian package version number format"
+msgstr "deb-control - format g³ównego pliku pakietu Debiana"
+
+# type: Plain text
+#: ../../man/deb-version.5:11
+msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:14
+msgid ""
+"Version numbers as used for Debian binary and source packages consist of "
+"three components. These are:"
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:14
+#, no-wrap
+msgid "I<epoch>"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:20
+msgid ""
+"This is a single (generally small) unsigned integer.  It may be omitted, in "
+"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"may not contain any colons."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:24
+msgid ""
+"It is provided to allow mistakes in the version numbers of older versions of "
+"a package, and also a package's previous version numbering schemes, to be "
+"left behind."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:24
+#, fuzzy, no-wrap
+msgid "I<upstream_version>"
+msgstr "B<source:Upstream-Version>"
+
+# type: Plain text
+#: ../../man/deb-version.5:34
+msgid ""
+"This is the main part of the version number.  It is usually the version "
+"number of the original (\"upstream\")  package from which the I<.deb> file "
+"has been made, if this is applicable.  Usually this will be in the same "
+"format as that specified by the upstream author(s); however, it may need to "
+"be reformatted to fit into the package management system's format and "
+"comparison scheme."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:39
+msgid ""
+"The comparison behavior of the package management system with respect to the "
+"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"the version number is mandatory."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:48
+msgid ""
+"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
+"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"then hyphens are not allowed; if there is no I<epoch> then colons are not "
+"allowed."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:48
+#, fuzzy, no-wrap
+msgid "I<debian_revision>"
+msgstr "B<binary:Version>"
+
+# type: Plain text
+#: ../../man/deb-version.5:57
+msgid ""
+"This part of the version number specifies the version of the Debian package "
+"based on the upstream version.  It may contain only alphanumerics and the "
+"characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
+"same way as the I<upstream_version> is."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:64
+msgid ""
+"It is optional; if it isn't present then the I<upstream_version> may not "
+"contain a hyphen.  This format represents the case where a piece of software "
+"was written specifically to be turned into a Debian package, and so there is "
+"only one \"debianisation\" of it and therefore no revision indication is "
+"required."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:68
+msgid ""
+"It is conventional to restart the I<debian_revision> at '1' each time time "
+"the I<upstream_version> is increased."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:76
+msgid ""
+"Dpkg will break the version number apart at the last hyphen in the string "
+"(if there is one) to determine the I<upstream_version> and "
+"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
+"than the presence of one (but note that the I<debian_revision> is the least "
+"significant part of the version number)."
+msgstr ""
+
+# type: SS
+#: ../../man/deb-version.5:76
+#, no-wrap
+msgid "Sorting Algorithm"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:80
+msgid ""
+"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"package management system using the same algorithm:"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:82
+msgid "The strings are compared from left to right."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:92
+msgid ""
+"First the initial part of each string consisting entirely of non-digit "
+"characters is determined.  These two parts (one of which may be empty) are "
+"compared lexically.  If a difference is found it is returned.  The lexical "
+"comparison is a comparison of ASCII values modified so that all the letters "
+"sort earlier than all the non-letters and so that a tilde sorts before "
+"anything, even the end of a part.  For example, the following parts are in "
+"sorted order: '~~', '~~a', '~', the empty part, 'a'."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:100
+msgid ""
+"Then the initial part of the remainder of each string which consists "
+"entirely of digit characters is determined.  The numerical values of these "
+"two parts are compared, and any difference found is returned as the result "
+"of the comparison.  For these purposes an empty string (which can only occur "
+"at the end of one or both version strings being compared) counts as zero."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:104
+msgid ""
+"These two steps (comparing and removing initial non-digit strings and "
+"initial digit strings) are repeated until a difference is found or both "
+"strings are exhausted."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:112
+msgid ""
+"Note that the purpose of epochs is to allow us to leave behind mistakes in "
+"version numbering, and to cope with situations where the version numbering "
+"scheme changes.  It is B<not> intended to cope with version numbers "
+"containing strings of letters which the package management system cannot "
+"interpret (such as 'ALPHA' or 'pre-'), or with silly orderings."
+msgstr ""
+
+# type: SH
+#: ../../man/deb-version.5:112
+#, no-wrap
+msgid "CAVEATS"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:116
+msgid ""
+"The tilde character and its special sorting properties were introduced in "
+"dpkg, version 1.10 and some parts of dpkg-dev only gained support for it "
+"later in the 1.10.x series."
+msgstr ""
+
+# type: Plain text
+#
+#: ../../man/deb-version.5:120
+#, fuzzy
+msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
+
+# type: SH
+#: ../../man/deb-version.5:120 ../../man/dpkg.1:621
+#: ../../man/dpkg-buildpackage.1:211 ../../man/dpkg-distaddfile.1:47
+#: ../../man/dpkg-genchanges.1:144 ../../man/dpkg-gencontrol.1:137
+#: ../../man/dpkg-parsechangelog.1:48 ../../man/dpkg-shlibdeps.1:284
+#: ../../man/dpkg-source.1:283 ../../man/dselect.1:449
+#: ../../man/start-stop-daemon.8:242
+#, no-wrap
+msgid "AUTHORS"
+msgstr "AUTORZY"
+
+# type: Plain text
+#: ../../man/deb-version.5:122
+msgid "Copyright © 1996,1997,1998 Ian Jackson and Christian Schwarz."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:124
+#, fuzzy
+msgid "Copyright © 2007 Frank Lichtenheld"
+msgstr "Copyright (C) 2007 Frank Lichtenheld"
+
 # type: TH
 #: ../../man/deb-old.5:1
 #, no-wrap
@@ -3524,16 +3761,6 @@ msgstr ""
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "B<--no-act> podaje raczej zbyt ma³o pomocnych informacji."
 
-# type: SH
-#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:211
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
-#: ../../man/dpkg-gencontrol.1:137 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:284 ../../man/dpkg-source.1:283
-#: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
-#, no-wrap
-msgid "AUTHORS"
-msgstr "AUTORZY"
-
 # type: Plain text
 #: ../../man/dpkg.1:623 ../../man/dpkg.cfg.5:20
 msgid ""

man/po/po4a.cfg

@@ -33,6 +33,11 @@
            add_$lang:$(srcdir)/po/$lang.add
 
 
+[type:man] $(srcdir)/deb-version.5              \
+           $lang:$lang/deb-version.5            \
+           add_$lang:$(srcdir)/po/$lang.add
+
+
 [type:man] $(srcdir)/deb-old.5                  \
            $lang:$lang/deb-old.5                \
            add_$lang:$(srcdir)/po/$lang.add

man/po/pt_BR.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-11-29 06:04+0200\n"
+"POT-Creation-Date: 2007-12-04 01:23+0100\n"
 "PO-Revision-Date: 2005-07-03 15:04+0200\n"
 "Last-Translator: Unknown translator\n"
 "Language-Team: Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -28,8 +28,9 @@ msgstr "2006-04-09"
 
 # type: TH
 #: ../../man/822-date.1:2 ../../man/cleanup-info.8:1 ../../man/deb.5:1
-#: ../../man/deb-control.5:3 ../../man/deb-old.5:1 ../../man/deb-override.5:16
-#: ../../man/deb-shlibs.5:16 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/deb-control.5:3 ../../man/deb-version.5:5 ../../man/deb-old.5:1
+#: ../../man/deb-override.5:16 ../../man/deb-shlibs.5:16
+#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
 #: ../../man/dpkg-architecture.1:1 ../../man/dpkg.cfg.5:1
 #: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
 #: ../../man/dpkg-distaddfile.1:1 ../../man/dpkg-deb.1:1
@@ -64,8 +65,9 @@ msgstr "utilit
 
 # type: SH
 #: ../../man/822-date.1:3 ../../man/cleanup-info.8:2 ../../man/deb.5:2
-#: ../../man/deb-control.5:4 ../../man/deb-old.5:2 ../../man/deb-override.5:17
-#: ../../man/deb-shlibs.5:17 ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
+#: ../../man/deb-control.5:4 ../../man/deb-version.5:6 ../../man/deb-old.5:2
+#: ../../man/deb-override.5:17 ../../man/deb-shlibs.5:17
+#: ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
 #: ../../man/dpkg-architecture.1:2 ../../man/dpkg.cfg.5:2
 #: ../../man/dpkg-buildpackage.1:2 ../../man/dpkg-checkbuilddeps.1:2
 #: ../../man/dpkg-distaddfile.1:2 ../../man/dpkg-deb.1:2
@@ -88,8 +90,9 @@ msgstr ""
 
 # type: SH
 #: ../../man/822-date.1:6 ../../man/cleanup-info.8:5 ../../man/deb.5:4
-#: ../../man/deb-control.5:7 ../../man/deb-old.5:5 ../../man/deb-override.5:20
-#: ../../man/deb-shlibs.5:20 ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
+#: ../../man/deb-control.5:7 ../../man/deb-version.5:9 ../../man/deb-old.5:5
+#: ../../man/deb-override.5:20 ../../man/deb-shlibs.5:20
+#: ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
 #: ../../man/dpkg-architecture.1:5 ../../man/dpkg-buildpackage.1:5
 #: ../../man/dpkg-checkbuilddeps.1:5 ../../man/dpkg-distaddfile.1:5
 #: ../../man/dpkg-deb.1:5 ../../man/dpkg-divert.8:5
@@ -113,7 +116,7 @@ msgstr "B<--test>"
 
 # type: SH
 #: ../../man/822-date.1:9 ../../man/cleanup-info.8:11 ../../man/deb.5:6
-#: ../../man/deb-control.5:10 ../../man/deb-old.5:8
+#: ../../man/deb-control.5:10 ../../man/deb-version.5:11 ../../man/deb-old.5:8
 #: ../../man/deb-override.5:23 ../../man/deb-shlibs.5:23
 #: ../../man/deb-substvars.5:9 ../../man/dpkg.1:19
 #: ../../man/dpkg-architecture.1:11 ../../man/dpkg.cfg.5:5
@@ -186,18 +189,18 @@ msgstr ""
 
 # type: SH
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
-#: ../../man/deb-control.5:227 ../../man/deb-old.5:51
-#: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608
-#: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-buildpackage.1:204 ../../man/dpkg-deb.1:238
-#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:98
-#: ../../man/dpkg-query.1:157 ../../man/dpkg-scanpackages.1:100
-#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:279
-#: ../../man/dpkg-source.1:278 ../../man/dpkg-split.1:226
-#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
-#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
-#: ../../man/update-alternatives.8:403
+#: ../../man/deb-control.5:227 ../../man/deb-version.5:116
+#: ../../man/deb-old.5:51 ../../man/deb-override.5:67
+#: ../../man/deb-shlibs.5:29 ../../man/deb-substvars.5:129
+#: ../../man/dpkg.1:608 ../../man/dpkg-architecture.1:268
+#: ../../man/dpkg.cfg.5:21 ../../man/dpkg-buildpackage.1:204
+#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
+#: ../../man/dpkg-name.1:98 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-scanpackages.1:100 ../../man/dpkg-scansources.1:65
+#: ../../man/dpkg-shlibdeps.1:279 ../../man/dpkg-source.1:278
+#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
+#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
+#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VEJA TAMBÉM"
@@ -398,15 +401,16 @@ msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr ""
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
-#: ../../man/dpkg-buildpackage.1:219 ../../man/dpkg-checkbuilddeps.1:35
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
-#: ../../man/dpkg-gencontrol.1:145 ../../man/dpkg-name.1:110
-#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:156
-#: ../../man/dpkg-shlibdeps.1:294 ../../man/dpkg-source.1:289
-#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:85
-#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
+#: ../../man/cleanup-info.8:58 ../../man/deb-version.5:126
+#: ../../man/deb-substvars.5:142 ../../man/dpkg-buildpackage.1:219
+#: ../../man/dpkg-checkbuilddeps.1:35 ../../man/dpkg-distaddfile.1:53
+#: ../../man/dpkg-deb.1:248 ../../man/dpkg-divert.8:125
+#: ../../man/dpkg-genchanges.1:150 ../../man/dpkg-gencontrol.1:145
+#: ../../man/dpkg-name.1:110 ../../man/dpkg-parsechangelog.1:54
+#: ../../man/dpkg-query.1:156 ../../man/dpkg-shlibdeps.1:294
+#: ../../man/dpkg-source.1:289 ../../man/dpkg-split.1:236
+#: ../../man/dpkg-statoverride.8:85 ../../man/install-info.8:295
+#: ../../man/update-alternatives.8:397
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
@@ -430,8 +434,8 @@ msgid "2006-02-28"
 msgstr "2006-04-09"
 
 # type: TH
-#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-old.5:1
-#: ../../man/dselect.1:1
+#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-version.5:5
+#: ../../man/deb-old.5:1 ../../man/dselect.1:1
 #, fuzzy, no-wrap
 msgid "Debian"
 msgstr "Projeto Debian"
@@ -600,9 +604,8 @@ msgstr ""
 msgid ""
 "Typically, this is the original package's version number in whatever form "
 "the program's author uses. It may also include a Debian revision number (for "
-"non-native packages). If both version and revision are supplied, they are "
-"separated by a hyphen, `-'. For this reason, the original version may not "
-"have a hyphen in its version number."
+"non-native packages). The exact format and sorting algorithm are described "
+"in B<deb-version>(5)."
 msgstr ""
 
 # type: TP
@@ -961,13 +964,243 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../../man/deb-control.5:231
+#: ../../man/deb-control.5:232
+#, fuzzy
+msgid ""
+"B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+msgstr ""
+"B<dselect>(8), B<dpkg-deb>(1), B<deb>(5), B<deb-control>(5), e B<dpkg-"
+"reconfigure>(8)"
+
+# type: TP
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "deb-version"
+msgstr "B<--version>"
+
+# type: TH
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "2007-10-06"
+msgstr "2006-04-09"
+
+# type: Plain text
+#: ../../man/deb-version.5:8
+msgid "deb-version - Debian package version number format"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:11
+msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:14
+msgid ""
+"Version numbers as used for Debian binary and source packages consist of "
+"three components. These are:"
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:14
+#, no-wrap
+msgid "I<epoch>"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:20
+msgid ""
+"This is a single (generally small) unsigned integer.  It may be omitted, in "
+"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"may not contain any colons."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:24
+msgid ""
+"It is provided to allow mistakes in the version numbers of older versions of "
+"a package, and also a package's previous version numbering schemes, to be "
+"left behind."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:24
+#, fuzzy, no-wrap
+msgid "I<upstream_version>"
+msgstr "B<dpkg --version>"
+
+# type: Plain text
+#: ../../man/deb-version.5:34
+msgid ""
+"This is the main part of the version number.  It is usually the version "
+"number of the original (\"upstream\")  package from which the I<.deb> file "
+"has been made, if this is applicable.  Usually this will be in the same "
+"format as that specified by the upstream author(s); however, it may need to "
+"be reformatted to fit into the package management system's format and "
+"comparison scheme."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:39
+msgid ""
+"The comparison behavior of the package management system with respect to the "
+"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"the version number is mandatory."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:48
+msgid ""
+"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
+"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"then hyphens are not allowed; if there is no I<epoch> then colons are not "
+"allowed."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:48
+#, fuzzy, no-wrap
+msgid "I<debian_revision>"
+msgstr "B<--version>"
+
+# type: Plain text
+#: ../../man/deb-version.5:57
+msgid ""
+"This part of the version number specifies the version of the Debian package "
+"based on the upstream version.  It may contain only alphanumerics and the "
+"characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
+"same way as the I<upstream_version> is."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:64
+msgid ""
+"It is optional; if it isn't present then the I<upstream_version> may not "
+"contain a hyphen.  This format represents the case where a piece of software "
+"was written specifically to be turned into a Debian package, and so there is "
+"only one \"debianisation\" of it and therefore no revision indication is "
+"required."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:68
+msgid ""
+"It is conventional to restart the I<debian_revision> at '1' each time time "
+"the I<upstream_version> is increased."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:76
+msgid ""
+"Dpkg will break the version number apart at the last hyphen in the string "
+"(if there is one) to determine the I<upstream_version> and "
+"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
+"than the presence of one (but note that the I<debian_revision> is the least "
+"significant part of the version number)."
+msgstr ""
+
+# type: SS
+#: ../../man/deb-version.5:76
+#, no-wrap
+msgid "Sorting Algorithm"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:80
+msgid ""
+"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"package management system using the same algorithm:"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:82
+msgid "The strings are compared from left to right."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:92
+msgid ""
+"First the initial part of each string consisting entirely of non-digit "
+"characters is determined.  These two parts (one of which may be empty) are "
+"compared lexically.  If a difference is found it is returned.  The lexical "
+"comparison is a comparison of ASCII values modified so that all the letters "
+"sort earlier than all the non-letters and so that a tilde sorts before "
+"anything, even the end of a part.  For example, the following parts are in "
+"sorted order: '~~', '~~a', '~', the empty part, 'a'."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:100
+msgid ""
+"Then the initial part of the remainder of each string which consists "
+"entirely of digit characters is determined.  The numerical values of these "
+"two parts are compared, and any difference found is returned as the result "
+"of the comparison.  For these purposes an empty string (which can only occur "
+"at the end of one or both version strings being compared) counts as zero."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:104
+msgid ""
+"These two steps (comparing and removing initial non-digit strings and "
+"initial digit strings) are repeated until a difference is found or both "
+"strings are exhausted."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:112
+msgid ""
+"Note that the purpose of epochs is to allow us to leave behind mistakes in "
+"version numbering, and to cope with situations where the version numbering "
+"scheme changes.  It is B<not> intended to cope with version numbers "
+"containing strings of letters which the package management system cannot "
+"interpret (such as 'ALPHA' or 'pre-'), or with silly orderings."
+msgstr ""
+
+# type: SH
+#: ../../man/deb-version.5:112
+#, no-wrap
+msgid "CAVEATS"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:116
+msgid ""
+"The tilde character and its special sorting properties were introduced in "
+"dpkg, version 1.10 and some parts of dpkg-dev only gained support for it "
+"later in the 1.10.x series."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:120
 #, fuzzy
-msgid "B<deb>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
 msgstr ""
 "B<dselect>(8), B<dpkg-deb>(1), B<deb>(5), B<deb-control>(5), e B<dpkg-"
 "reconfigure>(8)"
 
+# type: SH
+#: ../../man/deb-version.5:120 ../../man/dpkg.1:621
+#: ../../man/dpkg-buildpackage.1:211 ../../man/dpkg-distaddfile.1:47
+#: ../../man/dpkg-genchanges.1:144 ../../man/dpkg-gencontrol.1:137
+#: ../../man/dpkg-parsechangelog.1:48 ../../man/dpkg-shlibdeps.1:284
+#: ../../man/dpkg-source.1:283 ../../man/dselect.1:449
+#: ../../man/start-stop-daemon.8:242
+#, no-wrap
+msgid "AUTHORS"
+msgstr "AUTORES"
+
+# type: Plain text
+#: ../../man/deb-version.5:122
+msgid "Copyright © 1996,1997,1998 Ian Jackson and Christian Schwarz."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:124
+msgid "Copyright © 2007 Frank Lichtenheld"
+msgstr ""
+
 # type: TH
 #: ../../man/deb-old.5:1
 #, no-wrap
@@ -3149,16 +3382,6 @@ msgstr ""
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "B<--no-act> normalmente dá menos informação do que seria útil."
 
-# type: SH
-#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:211
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
-#: ../../man/dpkg-gencontrol.1:137 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:284 ../../man/dpkg-source.1:283
-#: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
-#, no-wrap
-msgid "AUTHORS"
-msgstr "AUTORES"
-
 # type: Plain text
 #: ../../man/dpkg.1:623 ../../man/dpkg.cfg.5:20
 #, fuzzy

man/po/ru.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-11-29 06:04+0200\n"
+"POT-Creation-Date: 2007-12-04 01:23+0100\n"
 "PO-Revision-Date: 2006-04-08 13:50+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -29,8 +29,9 @@ msgstr "2006-02-28"
 
 # type: TH
 #: ../../man/822-date.1:2 ../../man/cleanup-info.8:1 ../../man/deb.5:1
-#: ../../man/deb-control.5:3 ../../man/deb-old.5:1 ../../man/deb-override.5:16
-#: ../../man/deb-shlibs.5:16 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/deb-control.5:3 ../../man/deb-version.5:5 ../../man/deb-old.5:1
+#: ../../man/deb-override.5:16 ../../man/deb-shlibs.5:16
+#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
 #: ../../man/dpkg-architecture.1:1 ../../man/dpkg.cfg.5:1
 #: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
 #: ../../man/dpkg-distaddfile.1:1 ../../man/dpkg-deb.1:1
@@ -65,8 +66,9 @@ msgstr "утилиты dpkg"
 
 # type: SH
 #: ../../man/822-date.1:3 ../../man/cleanup-info.8:2 ../../man/deb.5:2
-#: ../../man/deb-control.5:4 ../../man/deb-old.5:2 ../../man/deb-override.5:17
-#: ../../man/deb-shlibs.5:17 ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
+#: ../../man/deb-control.5:4 ../../man/deb-version.5:6 ../../man/deb-old.5:2
+#: ../../man/deb-override.5:17 ../../man/deb-shlibs.5:17
+#: ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
 #: ../../man/dpkg-architecture.1:2 ../../man/dpkg.cfg.5:2
 #: ../../man/dpkg-buildpackage.1:2 ../../man/dpkg-checkbuilddeps.1:2
 #: ../../man/dpkg-distaddfile.1:2 ../../man/dpkg-deb.1:2
@@ -90,8 +92,9 @@ msgstr "822-date -- выводит дату и время в формате RFC8
 
 # type: SH
 #: ../../man/822-date.1:6 ../../man/cleanup-info.8:5 ../../man/deb.5:4
-#: ../../man/deb-control.5:7 ../../man/deb-old.5:5 ../../man/deb-override.5:20
-#: ../../man/deb-shlibs.5:20 ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
+#: ../../man/deb-control.5:7 ../../man/deb-version.5:9 ../../man/deb-old.5:5
+#: ../../man/deb-override.5:20 ../../man/deb-shlibs.5:20
+#: ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
 #: ../../man/dpkg-architecture.1:5 ../../man/dpkg-buildpackage.1:5
 #: ../../man/dpkg-checkbuilddeps.1:5 ../../man/dpkg-distaddfile.1:5
 #: ../../man/dpkg-deb.1:5 ../../man/dpkg-divert.8:5
@@ -114,7 +117,7 @@ msgstr "B<822-date>"
 
 # type: SH
 #: ../../man/822-date.1:9 ../../man/cleanup-info.8:11 ../../man/deb.5:6
-#: ../../man/deb-control.5:10 ../../man/deb-old.5:8
+#: ../../man/deb-control.5:10 ../../man/deb-version.5:11 ../../man/deb-old.5:8
 #: ../../man/deb-override.5:23 ../../man/deb-shlibs.5:23
 #: ../../man/deb-substvars.5:9 ../../man/dpkg.1:19
 #: ../../man/dpkg-architecture.1:11 ../../man/dpkg.cfg.5:5
@@ -191,18 +194,18 @@ msgstr "На самом деле эту задачу должна выполня
 
 # type: SH
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
-#: ../../man/deb-control.5:227 ../../man/deb-old.5:51
-#: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608
-#: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-buildpackage.1:204 ../../man/dpkg-deb.1:238
-#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:98
-#: ../../man/dpkg-query.1:157 ../../man/dpkg-scanpackages.1:100
-#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:279
-#: ../../man/dpkg-source.1:278 ../../man/dpkg-split.1:226
-#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
-#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
-#: ../../man/update-alternatives.8:403
+#: ../../man/deb-control.5:227 ../../man/deb-version.5:116
+#: ../../man/deb-old.5:51 ../../man/deb-override.5:67
+#: ../../man/deb-shlibs.5:29 ../../man/deb-substvars.5:129
+#: ../../man/dpkg.1:608 ../../man/dpkg-architecture.1:268
+#: ../../man/dpkg.cfg.5:21 ../../man/dpkg-buildpackage.1:204
+#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
+#: ../../man/dpkg-name.1:98 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-scanpackages.1:100 ../../man/dpkg-scansources.1:65
+#: ../../man/dpkg-shlibdeps.1:279 ../../man/dpkg-source.1:278
+#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
+#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
+#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
 #, fuzzy, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -408,15 +411,16 @@ msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr ""
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
-#: ../../man/dpkg-buildpackage.1:219 ../../man/dpkg-checkbuilddeps.1:35
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
-#: ../../man/dpkg-gencontrol.1:145 ../../man/dpkg-name.1:110
-#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:156
-#: ../../man/dpkg-shlibdeps.1:294 ../../man/dpkg-source.1:289
-#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:85
-#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
+#: ../../man/cleanup-info.8:58 ../../man/deb-version.5:126
+#: ../../man/deb-substvars.5:142 ../../man/dpkg-buildpackage.1:219
+#: ../../man/dpkg-checkbuilddeps.1:35 ../../man/dpkg-distaddfile.1:53
+#: ../../man/dpkg-deb.1:248 ../../man/dpkg-divert.8:125
+#: ../../man/dpkg-genchanges.1:150 ../../man/dpkg-gencontrol.1:145
+#: ../../man/dpkg-name.1:110 ../../man/dpkg-parsechangelog.1:54
+#: ../../man/dpkg-query.1:156 ../../man/dpkg-shlibdeps.1:294
+#: ../../man/dpkg-source.1:289 ../../man/dpkg-split.1:236
+#: ../../man/dpkg-statoverride.8:85 ../../man/install-info.8:295
+#: ../../man/update-alternatives.8:397
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
@@ -440,8 +444,8 @@ msgid "2006-02-28"
 msgstr "2006-02-28"
 
 # type: TH
-#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-old.5:1
-#: ../../man/dselect.1:1
+#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-version.5:5
+#: ../../man/deb-old.5:1 ../../man/dselect.1:1
 #, no-wrap
 msgid "Debian"
 msgstr "Debian"
@@ -620,9 +624,8 @@ msgstr "B<Version:> E<lt>строка с версиейE<gt>"
 msgid ""
 "Typically, this is the original package's version number in whatever form "
 "the program's author uses. It may also include a Debian revision number (for "
-"non-native packages). If both version and revision are supplied, they are "
-"separated by a hyphen, `-'. For this reason, the original version may not "
-"have a hyphen in its version number."
+"non-native packages). The exact format and sorting algorithm are described "
+"in B<deb-version>(5)."
 msgstr ""
 "Обычно в этом поле указывается оригинальный номер версии пакета в той форме, "
 "которую использует автор программы. Версия может также включать номер "
@@ -1092,11 +1095,241 @@ msgstr ""
 " will run more slowly, however).\n"
 
 # type: Plain text
-#: ../../man/deb-control.5:231
+#: ../../man/deb-control.5:232
+#, fuzzy
+msgid ""
+"B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
+
+# type: TP
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "deb-version"
+msgstr "B<dpkg --version>"
+
+# type: TH
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "2007-10-06"
+msgstr "2006-02-28"
+
+# type: Plain text
+#: ../../man/deb-version.5:8
+#, fuzzy
+msgid "deb-version - Debian package version number format"
+msgstr "deb-control -- формат мастер файла control пакетов Debian"
+
+# type: Plain text
+#: ../../man/deb-version.5:11
+msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:14
+msgid ""
+"Version numbers as used for Debian binary and source packages consist of "
+"three components. These are:"
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:14
+#, no-wrap
+msgid "I<epoch>"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:20
+msgid ""
+"This is a single (generally small) unsigned integer.  It may be omitted, in "
+"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"may not contain any colons."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:24
+msgid ""
+"It is provided to allow mistakes in the version numbers of older versions of "
+"a package, and also a package's previous version numbering schemes, to be "
+"left behind."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:24
+#, fuzzy, no-wrap
+msgid "I<upstream_version>"
+msgstr "B<dpkg --version>"
+
+# type: Plain text
+#: ../../man/deb-version.5:34
+msgid ""
+"This is the main part of the version number.  It is usually the version "
+"number of the original (\"upstream\")  package from which the I<.deb> file "
+"has been made, if this is applicable.  Usually this will be in the same "
+"format as that specified by the upstream author(s); however, it may need to "
+"be reformatted to fit into the package management system's format and "
+"comparison scheme."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:39
+msgid ""
+"The comparison behavior of the package management system with respect to the "
+"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"the version number is mandatory."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:48
+msgid ""
+"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
+"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"then hyphens are not allowed; if there is no I<epoch> then colons are not "
+"allowed."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:48
+#, fuzzy, no-wrap
+msgid "I<debian_revision>"
+msgstr "B<config-files>"
+
+# type: Plain text
+#: ../../man/deb-version.5:57
+msgid ""
+"This part of the version number specifies the version of the Debian package "
+"based on the upstream version.  It may contain only alphanumerics and the "
+"characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
+"same way as the I<upstream_version> is."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:64
+msgid ""
+"It is optional; if it isn't present then the I<upstream_version> may not "
+"contain a hyphen.  This format represents the case where a piece of software "
+"was written specifically to be turned into a Debian package, and so there is "
+"only one \"debianisation\" of it and therefore no revision indication is "
+"required."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:68
+msgid ""
+"It is conventional to restart the I<debian_revision> at '1' each time time "
+"the I<upstream_version> is increased."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:76
+msgid ""
+"Dpkg will break the version number apart at the last hyphen in the string "
+"(if there is one) to determine the I<upstream_version> and "
+"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
+"than the presence of one (but note that the I<debian_revision> is the least "
+"significant part of the version number)."
+msgstr ""
+
+# type: SS
+#: ../../man/deb-version.5:76
+#, no-wrap
+msgid "Sorting Algorithm"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:80
+msgid ""
+"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"package management system using the same algorithm:"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:82
+msgid "The strings are compared from left to right."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:92
+msgid ""
+"First the initial part of each string consisting entirely of non-digit "
+"characters is determined.  These two parts (one of which may be empty) are "
+"compared lexically.  If a difference is found it is returned.  The lexical "
+"comparison is a comparison of ASCII values modified so that all the letters "
+"sort earlier than all the non-letters and so that a tilde sorts before "
+"anything, even the end of a part.  For example, the following parts are in "
+"sorted order: '~~', '~~a', '~', the empty part, 'a'."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:100
+msgid ""
+"Then the initial part of the remainder of each string which consists "
+"entirely of digit characters is determined.  The numerical values of these "
+"two parts are compared, and any difference found is returned as the result "
+"of the comparison.  For these purposes an empty string (which can only occur "
+"at the end of one or both version strings being compared) counts as zero."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:104
+msgid ""
+"These two steps (comparing and removing initial non-digit strings and "
+"initial digit strings) are repeated until a difference is found or both "
+"strings are exhausted."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:112
+msgid ""
+"Note that the purpose of epochs is to allow us to leave behind mistakes in "
+"version numbering, and to cope with situations where the version numbering "
+"scheme changes.  It is B<not> intended to cope with version numbers "
+"containing strings of letters which the package management system cannot "
+"interpret (such as 'ALPHA' or 'pre-'), or with silly orderings."
+msgstr ""
+
+# type: SH
+#: ../../man/deb-version.5:112
+#, no-wrap
+msgid "CAVEATS"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:116
+msgid ""
+"The tilde character and its special sorting properties were introduced in "
+"dpkg, version 1.10 and some parts of dpkg-dev only gained support for it "
+"later in the 1.10.x series."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:120
 #, fuzzy
-msgid "B<deb>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
+# type: SH
+#: ../../man/deb-version.5:120 ../../man/dpkg.1:621
+#: ../../man/dpkg-buildpackage.1:211 ../../man/dpkg-distaddfile.1:47
+#: ../../man/dpkg-genchanges.1:144 ../../man/dpkg-gencontrol.1:137
+#: ../../man/dpkg-parsechangelog.1:48 ../../man/dpkg-shlibdeps.1:284
+#: ../../man/dpkg-source.1:283 ../../man/dselect.1:449
+#: ../../man/start-stop-daemon.8:242
+#, no-wrap
+msgid "AUTHORS"
+msgstr "АВТОРЫ"
+
+# type: Plain text
+#: ../../man/deb-version.5:122
+msgid "Copyright © 1996,1997,1998 Ian Jackson and Christian Schwarz."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:124
+#, fuzzy
+msgid "Copyright © 2007 Frank Lichtenheld"
+msgstr "Copyright 2001 Joey Hess"
+
 # type: Plain text
 #: ../../man/deb-old.5:1
 #, fuzzy, no-wrap
@@ -3262,16 +3495,6 @@ msgstr ""
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "B<--no-act> обычно дает меньше информации, чем могло бы быть полезным."
 
-# type: SH
-#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:211
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
-#: ../../man/dpkg-gencontrol.1:137 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:284 ../../man/dpkg-source.1:283
-#: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
-#, no-wrap
-msgid "AUTHORS"
-msgstr "АВТОРЫ"
-
 # type: Plain text
 #: ../../man/dpkg.1:623 ../../man/dpkg.cfg.5:20
 #, fuzzy

man/po/sv.po

@@ -5,13 +5,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-29 06:04+0200\n"
+"POT-Creation-Date: 2007-12-04 01:23+0100\n"
 "PO-Revision-Date: 2007-11-30 20:27+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"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Plain text
 #: ../../man/822-date.1:2
@@ -27,8 +27,9 @@ msgstr "2007-01-24"
 
 # type: TH
 #: ../../man/822-date.1:2 ../../man/cleanup-info.8:1 ../../man/deb.5:1
-#: ../../man/deb-control.5:3 ../../man/deb-old.5:1 ../../man/deb-override.5:16
-#: ../../man/deb-shlibs.5:16 ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
+#: ../../man/deb-control.5:3 ../../man/deb-version.5:5 ../../man/deb-old.5:1
+#: ../../man/deb-override.5:16 ../../man/deb-shlibs.5:16
+#: ../../man/deb-substvars.5:2 ../../man/dpkg.1:1
 #: ../../man/dpkg-architecture.1:1 ../../man/dpkg.cfg.5:1
 #: ../../man/dpkg-buildpackage.1:1 ../../man/dpkg-checkbuilddeps.1:1
 #: ../../man/dpkg-distaddfile.1:1 ../../man/dpkg-deb.1:1
@@ -63,8 +64,9 @@ msgstr "dpkg-verktygen"
 
 # type: SH
 #: ../../man/822-date.1:3 ../../man/cleanup-info.8:2 ../../man/deb.5:2
-#: ../../man/deb-control.5:4 ../../man/deb-old.5:2 ../../man/deb-override.5:17
-#: ../../man/deb-shlibs.5:17 ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
+#: ../../man/deb-control.5:4 ../../man/deb-version.5:6 ../../man/deb-old.5:2
+#: ../../man/deb-override.5:17 ../../man/deb-shlibs.5:17
+#: ../../man/deb-substvars.5:3 ../../man/dpkg.1:2
 #: ../../man/dpkg-architecture.1:2 ../../man/dpkg.cfg.5:2
 #: ../../man/dpkg-buildpackage.1:2 ../../man/dpkg-checkbuilddeps.1:2
 #: ../../man/dpkg-distaddfile.1:2 ../../man/dpkg-deb.1:2
@@ -87,8 +89,9 @@ msgstr "822-date - Skriv datum och tid i RFC2822-format"
 
 # type: SH
 #: ../../man/822-date.1:6 ../../man/cleanup-info.8:5 ../../man/deb.5:4
-#: ../../man/deb-control.5:7 ../../man/deb-old.5:5 ../../man/deb-override.5:20
-#: ../../man/deb-shlibs.5:20 ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
+#: ../../man/deb-control.5:7 ../../man/deb-version.5:9 ../../man/deb-old.5:5
+#: ../../man/deb-override.5:20 ../../man/deb-shlibs.5:20
+#: ../../man/deb-substvars.5:6 ../../man/dpkg.1:5
 #: ../../man/dpkg-architecture.1:5 ../../man/dpkg-buildpackage.1:5
 #: ../../man/dpkg-checkbuilddeps.1:5 ../../man/dpkg-distaddfile.1:5
 #: ../../man/dpkg-deb.1:5 ../../man/dpkg-divert.8:5
@@ -111,7 +114,7 @@ msgstr "B<822-date>"
 
 # type: SH
 #: ../../man/822-date.1:9 ../../man/cleanup-info.8:11 ../../man/deb.5:6
-#: ../../man/deb-control.5:10 ../../man/deb-old.5:8
+#: ../../man/deb-control.5:10 ../../man/deb-version.5:11 ../../man/deb-old.5:8
 #: ../../man/deb-override.5:23 ../../man/deb-shlibs.5:23
 #: ../../man/deb-substvars.5:9 ../../man/dpkg.1:19
 #: ../../man/dpkg-architecture.1:11 ../../man/dpkg.cfg.5:5
@@ -189,18 +192,18 @@ msgstr "Funktionen borde ing
 
 # type: SH
 #: ../../man/822-date.1:28 ../../man/cleanup-info.8:51 ../../man/deb.5:67
-#: ../../man/deb-control.5:227 ../../man/deb-old.5:51
-#: ../../man/deb-override.5:67 ../../man/deb-shlibs.5:29
-#: ../../man/deb-substvars.5:129 ../../man/dpkg.1:608
-#: ../../man/dpkg-architecture.1:268 ../../man/dpkg.cfg.5:21
-#: ../../man/dpkg-buildpackage.1:204 ../../man/dpkg-deb.1:238
-#: ../../man/dpkg-divert.8:118 ../../man/dpkg-name.1:98
-#: ../../man/dpkg-query.1:157 ../../man/dpkg-scanpackages.1:100
-#: ../../man/dpkg-scansources.1:65 ../../man/dpkg-shlibdeps.1:279
-#: ../../man/dpkg-source.1:278 ../../man/dpkg-split.1:226
-#: ../../man/dpkg-statoverride.8:78 ../../man/dselect.1:443
-#: ../../man/dselect.cfg.5:21 ../../man/install-info.8:287
-#: ../../man/update-alternatives.8:403
+#: ../../man/deb-control.5:227 ../../man/deb-version.5:116
+#: ../../man/deb-old.5:51 ../../man/deb-override.5:67
+#: ../../man/deb-shlibs.5:29 ../../man/deb-substvars.5:129
+#: ../../man/dpkg.1:608 ../../man/dpkg-architecture.1:268
+#: ../../man/dpkg.cfg.5:21 ../../man/dpkg-buildpackage.1:204
+#: ../../man/dpkg-deb.1:238 ../../man/dpkg-divert.8:118
+#: ../../man/dpkg-name.1:98 ../../man/dpkg-query.1:157
+#: ../../man/dpkg-scanpackages.1:100 ../../man/dpkg-scansources.1:65
+#: ../../man/dpkg-shlibdeps.1:279 ../../man/dpkg-source.1:278
+#: ../../man/dpkg-split.1:226 ../../man/dpkg-statoverride.8:78
+#: ../../man/dselect.1:443 ../../man/dselect.cfg.5:21
+#: ../../man/install-info.8:287 ../../man/update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SE ÄVEN"
@@ -418,15 +421,16 @@ msgid "Copyright (C) 1996 Kim-Minh Kaplan"
 msgstr "Upphovsrättsskyddat © 1996 Kim-Minh Kaplan"
 
 # type: Plain text
-#: ../../man/cleanup-info.8:58 ../../man/deb-substvars.5:142
-#: ../../man/dpkg-buildpackage.1:219 ../../man/dpkg-checkbuilddeps.1:35
-#: ../../man/dpkg-distaddfile.1:53 ../../man/dpkg-deb.1:248
-#: ../../man/dpkg-divert.8:125 ../../man/dpkg-genchanges.1:150
-#: ../../man/dpkg-gencontrol.1:145 ../../man/dpkg-name.1:110
-#: ../../man/dpkg-parsechangelog.1:54 ../../man/dpkg-query.1:156
-#: ../../man/dpkg-shlibdeps.1:294 ../../man/dpkg-source.1:289
-#: ../../man/dpkg-split.1:236 ../../man/dpkg-statoverride.8:85
-#: ../../man/install-info.8:295 ../../man/update-alternatives.8:397
+#: ../../man/cleanup-info.8:58 ../../man/deb-version.5:126
+#: ../../man/deb-substvars.5:142 ../../man/dpkg-buildpackage.1:219
+#: ../../man/dpkg-checkbuilddeps.1:35 ../../man/dpkg-distaddfile.1:53
+#: ../../man/dpkg-deb.1:248 ../../man/dpkg-divert.8:125
+#: ../../man/dpkg-genchanges.1:150 ../../man/dpkg-gencontrol.1:145
+#: ../../man/dpkg-name.1:110 ../../man/dpkg-parsechangelog.1:54
+#: ../../man/dpkg-query.1:156 ../../man/dpkg-shlibdeps.1:294
+#: ../../man/dpkg-source.1:289 ../../man/dpkg-split.1:236
+#: ../../man/dpkg-statoverride.8:85 ../../man/install-info.8:295
+#: ../../man/update-alternatives.8:397
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO WARRANTY."
@@ -448,8 +452,8 @@ msgid "2006-02-28"
 msgstr "2006-02-28"
 
 # type: TH
-#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-old.5:1
-#: ../../man/dselect.1:1
+#: ../../man/deb.5:1 ../../man/deb-control.5:3 ../../man/deb-version.5:5
+#: ../../man/deb-old.5:1 ../../man/dselect.1:1
 #, no-wrap
 msgid "Debian"
 msgstr "Debian"
@@ -654,12 +658,12 @@ msgstr "B<Version:> E<lt>versionsstr
 
 # type: Plain text
 #: ../../man/deb-control.5:37
+#, fuzzy
 msgid ""
 "Typically, this is the original package's version number in whatever form "
 "the program's author uses. It may also include a Debian revision number (for "
-"non-native packages). If both version and revision are supplied, they are "
-"separated by a hyphen, `-'. For this reason, the original version may not "
-"have a hyphen in its version number."
+"non-native packages). The exact format and sorting algorithm are described "
+"in B<deb-version>(5)."
 msgstr ""
 "Vanligtvis är detta det ursprungliga paketets versionsnummer på den form "
 "programmets författare använder. Den kan även innehålla ett "
@@ -1129,10 +1133,241 @@ msgstr ""
 " will run more slowly, however.)\n"
 
 # type: Plain text
-#: ../../man/deb-control.5:231
-msgid "B<deb>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+#: ../../man/deb-control.5:232
+#, fuzzy
+msgid ""
+"B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr "B<deb>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 
+# type: TP
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "deb-version"
+msgstr "B<--version>"
+
+# type: TH
+#: ../../man/deb-version.5:5
+#, fuzzy, no-wrap
+msgid "2007-10-06"
+msgstr "2007-10-08"
+
+# type: Plain text
+#: ../../man/deb-version.5:8
+#, fuzzy
+msgid "deb-version - Debian package version number format"
+msgstr "deb-control - Debians filformat för paketstyrfiler"
+
+# type: Plain text
+#: ../../man/deb-version.5:11
+msgid "[ I<epoch>:] I<upstream_version> [-I<debian_revision> ]"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:14
+msgid ""
+"Version numbers as used for Debian binary and source packages consist of "
+"three components. These are:"
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:14
+#, no-wrap
+msgid "I<epoch>"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:20
+msgid ""
+"This is a single (generally small) unsigned integer.  It may be omitted, in "
+"which case zero is assumed.  If it is omitted then the I<upstream_version> "
+"may not contain any colons."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:24
+msgid ""
+"It is provided to allow mistakes in the version numbers of older versions of "
+"a package, and also a package's previous version numbering schemes, to be "
+"left behind."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:24
+#, fuzzy, no-wrap
+msgid "I<upstream_version>"
+msgstr "B<source:Upstream-Version>"
+
+# type: Plain text
+#: ../../man/deb-version.5:34
+msgid ""
+"This is the main part of the version number.  It is usually the version "
+"number of the original (\"upstream\")  package from which the I<.deb> file "
+"has been made, if this is applicable.  Usually this will be in the same "
+"format as that specified by the upstream author(s); however, it may need to "
+"be reformatted to fit into the package management system's format and "
+"comparison scheme."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:39
+msgid ""
+"The comparison behavior of the package management system with respect to the "
+"I<upstream_version> is described below.  The I<upstream_version> portion of "
+"the version number is mandatory."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:48
+msgid ""
+"The I<upstream_version> may contain only alphanumerics (\"A-Za-z0-9\") and "
+"the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, "
+"tilde) and should start with a digit.  If there is no I<debian_revision> "
+"then hyphens are not allowed; if there is no I<epoch> then colons are not "
+"allowed."
+msgstr ""
+
+# type: TP
+#: ../../man/deb-version.5:48
+#, fuzzy, no-wrap
+msgid "I<debian_revision>"
+msgstr "B<binary:Version>"
+
+# type: Plain text
+#: ../../man/deb-version.5:57
+msgid ""
+"This part of the version number specifies the version of the Debian package "
+"based on the upstream version.  It may contain only alphanumerics and the "
+"characters B<+> B<.> B<~> (plus, full stop, tilde) and is compared in the "
+"same way as the I<upstream_version> is."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:64
+msgid ""
+"It is optional; if it isn't present then the I<upstream_version> may not "
+"contain a hyphen.  This format represents the case where a piece of software "
+"was written specifically to be turned into a Debian package, and so there is "
+"only one \"debianisation\" of it and therefore no revision indication is "
+"required."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:68
+msgid ""
+"It is conventional to restart the I<debian_revision> at '1' each time time "
+"the I<upstream_version> is increased."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:76
+msgid ""
+"Dpkg will break the version number apart at the last hyphen in the string "
+"(if there is one) to determine the I<upstream_version> and "
+"I<debian_revision>.  The absence of a I<debian_revision> compares earlier "
+"than the presence of one (but note that the I<debian_revision> is the least "
+"significant part of the version number)."
+msgstr ""
+
+# type: SS
+#: ../../man/deb-version.5:76
+#, no-wrap
+msgid "Sorting Algorithm"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:80
+msgid ""
+"The I<upstream_version> and I<debian_revision> parts are compared by the "
+"package management system using the same algorithm:"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:82
+msgid "The strings are compared from left to right."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:92
+msgid ""
+"First the initial part of each string consisting entirely of non-digit "
+"characters is determined.  These two parts (one of which may be empty) are "
+"compared lexically.  If a difference is found it is returned.  The lexical "
+"comparison is a comparison of ASCII values modified so that all the letters "
+"sort earlier than all the non-letters and so that a tilde sorts before "
+"anything, even the end of a part.  For example, the following parts are in "
+"sorted order: '~~', '~~a', '~', the empty part, 'a'."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:100
+msgid ""
+"Then the initial part of the remainder of each string which consists "
+"entirely of digit characters is determined.  The numerical values of these "
+"two parts are compared, and any difference found is returned as the result "
+"of the comparison.  For these purposes an empty string (which can only occur "
+"at the end of one or both version strings being compared) counts as zero."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:104
+msgid ""
+"These two steps (comparing and removing initial non-digit strings and "
+"initial digit strings) are repeated until a difference is found or both "
+"strings are exhausted."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:112
+msgid ""
+"Note that the purpose of epochs is to allow us to leave behind mistakes in "
+"version numbering, and to cope with situations where the version numbering "
+"scheme changes.  It is B<not> intended to cope with version numbers "
+"containing strings of letters which the package management system cannot "
+"interpret (such as 'ALPHA' or 'pre-'), or with silly orderings."
+msgstr ""
+
+# type: SH
+#: ../../man/deb-version.5:112
+#, no-wrap
+msgid "CAVEATS"
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:116
+msgid ""
+"The tilde character and its special sorting properties were introduced in "
+"dpkg, version 1.10 and some parts of dpkg-dev only gained support for it "
+"later in the 1.10.x series."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:120
+#, fuzzy
+msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
+
+# type: SH
+#: ../../man/deb-version.5:120 ../../man/dpkg.1:621
+#: ../../man/dpkg-buildpackage.1:211 ../../man/dpkg-distaddfile.1:47
+#: ../../man/dpkg-genchanges.1:144 ../../man/dpkg-gencontrol.1:137
+#: ../../man/dpkg-parsechangelog.1:48 ../../man/dpkg-shlibdeps.1:284
+#: ../../man/dpkg-source.1:283 ../../man/dselect.1:449
+#: ../../man/start-stop-daemon.8:242
+#, no-wrap
+msgid "AUTHORS"
+msgstr "FÖRFATTARE"
+
+# type: Plain text
+#: ../../man/deb-version.5:122
+msgid "Copyright © 1996,1997,1998 Ian Jackson and Christian Schwarz."
+msgstr ""
+
+# type: Plain text
+#: ../../man/deb-version.5:124
+#, fuzzy
+msgid "Copyright © 2007 Frank Lichtenheld"
+msgstr "Upphovsrättsskyddat © 2007 Frank Lichtenheld"
+
 # type: TH
 #: ../../man/deb-old.5:1
 #, no-wrap
@@ -3342,16 +3577,6 @@ msgstr ""
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "B<--no-act> ger oftast mindre information än vad som vore hjälpsamt."
 
-# type: SH
-#: ../../man/dpkg.1:621 ../../man/dpkg-buildpackage.1:211
-#: ../../man/dpkg-distaddfile.1:47 ../../man/dpkg-genchanges.1:144
-#: ../../man/dpkg-gencontrol.1:137 ../../man/dpkg-parsechangelog.1:48
-#: ../../man/dpkg-shlibdeps.1:284 ../../man/dpkg-source.1:283
-#: ../../man/dselect.1:449 ../../man/start-stop-daemon.8:242
-#, no-wrap
-msgid "AUTHORS"
-msgstr "FÖRFATTARE"
-
 # type: Plain text
 #: ../../man/dpkg.1:623 ../../man/dpkg.cfg.5:20
 msgid ""
@@ -6053,8 +6278,8 @@ msgstr ""
 "I<E<lt>paketE<gt>_E<lt>versionE<gt>_E<lt>arkitekturE<gt>.E<lt>pakettyp<gt>> "
 "och anges av control-filen i paketet. I<E<lt>VersionE<gt>>-delen av "
 "filnamnet består av uppströmsversionsinformation och kan eventuellt följas "
-"av ett bindestreck och revisionsinformationen. I<E<lt>PakettypE<gt>>-"
-"delen kommer från fältet I<package_type> om det finns, annars B<deb>."
+"av ett bindestreck och revisionsinformationen. I<E<lt>PakettypE<gt>>-delen "
+"kommer från fältet I<package_type> om det finns, annars B<deb>."
 
 # type: TP
 #: ../../man/dpkg-name.1:30
@@ -7454,8 +7679,7 @@ msgstr ""
 #: ../../man/dpkg-shlibdeps.1:226
 #, no-wrap
 msgid "B<couldn't find library >I<library-soname>B< needed by >I<binary>B< (its RPATH is '>I<rpath>B<')>"
-msgstr "B<hittade inte biblioteket> I<bibliotek-sonamn> B<som behövs för> "
-"I<binär> B<(dess RPATH är \">I<rpath>B<\")>"
+msgstr "B<hittade inte biblioteket> I<bibliotek-sonamn> B<som behövs för> I<binär> B<(dess RPATH är \">I<rpath>B<\")>"
 
 # type: Plain text
 #: ../../man/dpkg-shlibdeps.1:240
@@ -7471,16 +7695,16 @@ msgid ""
 "in the root directory. If the library is not found in any of those "
 "directories, then you get this error."
 msgstr ""
-"I<Binär> använder ett bilbiotek som heter I<bibliotek-sonamn>, men "
-"B<dpkg-shlibdeps> kunde inte hitta biblioteket. B<dpkg-shlibdeps> skapar "
-"en lista över kataloger det ser i på följande sätt: katalogerna som "
-"beskrivs i RPATH i binären, kataloger som beskrivs i /etc/ld.so.conf, "
-"kataloger i miljövariabeln LD_LIBRARY_PATH, och vanliga öppna kataloger "
-"(/lib, /usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Därefter ser "
-"det i motsvarande kataloger i byggträdet för paketet som innehåller "
-"binären som analyseras, i andra pakets byggträd som innehåller en "
-"DEBIAN/shlibs-fil och slutligen i rotkatalogen. Om biblioteket inte "
-"hittas i någon av dessa kataloger får du det här felmeddelandet."
+"I<Binär> använder ett bilbiotek som heter I<bibliotek-sonamn>, men B<dpkg-"
+"shlibdeps> kunde inte hitta biblioteket. B<dpkg-shlibdeps> skapar en lista "
+"över kataloger det ser i på följande sätt: katalogerna som beskrivs i RPATH "
+"i binären, kataloger som beskrivs i /etc/ld.so.conf, kataloger i "
+"miljövariabeln LD_LIBRARY_PATH, och vanliga öppna kataloger (/lib, /usr/"
+"lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Därefter ser det i motsvarande "
+"kataloger i byggträdet för paketet som innehåller binären som analyseras, i "
+"andra pakets byggträd som innehåller en DEBIAN/shlibs-fil och slutligen i "
+"rotkatalogen. Om biblioteket inte hittas i någon av dessa kataloger får du "
+"det här felmeddelandet."
 
 # type: Plain text
 #: ../../man/dpkg-shlibdeps.1:246
@@ -7493,15 +7717,15 @@ msgid ""
 msgstr ""
 "Om biblioteket som inte hittades ligger i en privat katalog i samma paket "
 "bör du lägga till katalogen i LD_LIBRARY_PATH. Om det finns i ett annat "
-"binärpaket som byggs bör du se till att shlibs-filen för paketet redan "
-"har skapats och att LD_LIBRARY_PATH innehåller korrekt katalog som det "
-"också ligger i en privat katalog."
+"binärpaket som byggs bör du se till att shlibs-filen för paketet redan har "
+"skapats och att LD_LIBRARY_PATH innehåller korrekt katalog som det också "
+"ligger i en privat katalog."
 
 # type: TP
 #: ../../man/dpkg-shlibdeps.1:246
 #, no-wrap
 msgid "B<no dependency information found for >I<library-file>B< (used by >I<binary>B<).>"
-msgstr "B<hittade ingen beroendeinformation för> I<biblioteksfil> B<(använd av) I<binär>B<).>"
+msgstr "B<hittade ingen beroendeinformation för> I<biblioteksfil> B<(använd av> I<binär>B<).>"
 
 # type: Plain text
 #: ../../man/dpkg-shlibdeps.1:259
@@ -7513,13 +7737,12 @@ msgid ""
 "file>.  Then it checked the corresponding shlibs and symbols files in /var/"
 "lib/dpkg/info/, and in the various package's build trees (debian/*/DEBIAN/)."
 msgstr ""
-"Biblioteket som behövs av I<binär> hittades i I<biblioteksfil> av "
-"B<dpkg-shlibdeps>, men B<dpkg-shlibdeps> kunde inte hitta någon "
-"beroendeinformation för biblioteket. För att hitta beroendet har det "
-"försökt koppla biblioteket mot ett Debianpaket med hjälp av B<dpkg -S> "
-"I<biblioteksfil>. Därefter såg det i motsvarande shlibs- och symbols-filer "
-"i /var/lib/dpkg/info/, samt i de olika paketens byggträd "
-"(debian/*/DEBIAN/)."
+"Biblioteket som behövs av I<binär> hittades i I<biblioteksfil> av B<dpkg-"
+"shlibdeps>, men B<dpkg-shlibdeps> kunde inte hitta någon beroendeinformation "
+"för biblioteket. För att hitta beroendet har det försökt koppla biblioteket "
+"mot ett Debianpaket med hjälp av B<dpkg -S> I<biblioteksfil>. Därefter såg "
+"det i motsvarande shlibs- och symbols-filer i /var/lib/dpkg/info/, samt i de "
+"olika paketens byggträd (debian/*/DEBIAN/)."
 
 # type: Plain text
 #: ../../man/dpkg-shlibdeps.1:273
@@ -7539,12 +7762,12 @@ msgstr ""
 "filer i bibliotekets paket. Det kan även inträffa om biblioteket byggts i "
 "samma källkodspaket och om shlibs-filen ännu inte har skapats (då måste du "
 "fixa debian/rules så att det skapar shlibs-filen innan det anropar B<dpkg-"
-"shlibdeps>). Felaktig RPATH kan också leda till att biblioteket hittas "
-"under ett icke-kanoniskt namn (till exempel: /usr/lib/gcc/i486-linux-gnu/"
-"4.2.3/../../../../lib/libssl.so.9.8 istället för /usr/lib/libssl.so.0.9.8) "
-"som inte associeras till något paket, B<dpkg-shlibdeps> försöker gå runt "
-"detta genom att falla tillbaka på ett kanoniskt namn (med B<realpath>(3)), "
-"men det fungerar kanske inte alltid. Det är alltid bäst att städa upp "
+"shlibdeps>). Felaktig RPATH kan också leda till att biblioteket hittas under "
+"ett icke-kanoniskt namn (till exempel: /usr/lib/gcc/i486-linux-"
+"gnu/4.2.3/../../../../lib/libssl.so.9.8 istället för /usr/lib/libssl."
+"so.0.9.8) som inte associeras till något paket, B<dpkg-shlibdeps> försöker "
+"gå runt detta genom att falla tillbaka på ett kanoniskt namn (med B<realpath>"
+"(3)), men det fungerar kanske inte alltid. Det är alltid bäst att städa upp "
 "RPATH i binären för att undvika problem."
 
 # type: Plain text
@@ -11686,16 +11909,17 @@ msgstr "B<ln>(1), FHS, Filesystem Hierarchy Standard."
 #~ "directory, thus causing them to be unnecessarily included in every .diff."
 #~ "gz, unless you use the B<-i> switch."
 #~ msgstr ""
-#~ "Detta är väldigt bra för att ta bort överflödiga filer som dyker upp i ."
-#~ "diff.gz-filen, t.ex \"debian/BUGS_TODO/*\" eller \"debian/RCS/*,v\". Om "
-#~ "du, till exempel, underhåller ett paket som du spårar via en fjärr-CVS, "
-#~ "där du inte har åtkomstbehörighet för att sända in debianstyrfilerna och "
-#~ "märka upp dem för I<cvs-buildpackage>(1) är det nödvändigt att utföra en "
-#~ "ytterligare utcheckning/uppdatering i en katalog för att hålla den ren, "
-#~ "till att generera .orig.tar.gz från. Den katalogen kommer att ha en CVS/"
-#~ "Entries-fil som innehåller tidsstämplingar som skiljer sig från dem i din "
-#~ "arbetskatalog, vilket innebär att de kommer inkluderas i alla .diff.gz-"
-#~ "filer utan att det behövs, såvida du inte använder flaggan B<-i>."
+#~ "Detta är väldigt bra för att ta bort överflödiga filer som dyker upp "
+#~ "i .diff.gz-filen, t.ex \"debian/BUGS_TODO/*\" eller \"debian/RCS/*,v\". "
+#~ "Om du, till exempel, underhåller ett paket som du spårar via en fjärr-"
+#~ "CVS, där du inte har åtkomstbehörighet för att sända in "
+#~ "debianstyrfilerna och märka upp dem för I<cvs-buildpackage>(1) är det "
+#~ "nödvändigt att utföra en ytterligare utcheckning/uppdatering i en "
+#~ "katalog för att hålla den ren, till att generera .orig.tar.gz från. "
+#~ "Den katalogen kommer att ha en CVS/Entries-fil som innehÃ¥ller tidsstÃ"
+#~ "¤mplingar som skiljer sig frÃ¥n dem i din arbetskatalog, vilket innebär "
+#~ "att de kommer inkluderas i alla .diff.gz-filer utan att det behövs, sÃ"
+#~ "¥vida du inte använder flaggan B<-i>."
 
 # type: TH
 #~ msgid "2007-05-15"

scripts/Makefile.am

@@ -66,7 +66,9 @@ EXTRA_DIST = \
 	t/200_Dpkg_Shlibs/objdump.libc6-2.3 \
 	t/200_Dpkg_Shlibs/objdump.libc6-2.6 \
 	t/200_Dpkg_Shlibs/objdump.dbd-pg \
-	t/200_Dpkg_Shlibs/objdump.ls
+	t/200_Dpkg_Shlibs/objdump.ls \
+	t/300_Dpkg_BuildOptions.t \
+	t/400_Dpkg_Deps.t
 
 CLEANFILES = \
 	$(bin_SCRIPTS) $(sbin_SCRIPTS) $(changelog_SCRIPTS) \