summaryrefslogtreecommitdiff
path: root/dpkg-deb
diff options
context:
space:
mode:
authorScott James Remnant <keybuk@debian.org>2004-06-02 18:24:33 +0000
committerScott James Remnant <keybuk@debian.org>2004-06-02 18:24:33 +0000
commitfa89b718a13b9d3b0bba475d8646f4e39da2c27b (patch)
treec60f28c1689ce394491ec4c7bb12d8d583e6a8b4 /dpkg-deb
parent1910e3480669dd32a751de420e3bec7f02f1f8dc (diff)
downloaddpkg-fa89b718a13b9d3b0bba475d8646f4e39da2c27b.tar.gz
Release 1.10.22
Patches applied: * scott@netsplit.com--2004/dpkg--devo--1.10--base-0 tag of scott@netsplit.com--2004/dpkg--cvs--1.10--patch-222 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-1 make start-stop-daemon work on hurd * scott@netsplit.com--2004/dpkg--devo--1.10--patch-2 merge changes from svn * scott@netsplit.com--2004/dpkg--devo--1.10--patch-3 use colouring to break dep cycles * scott@netsplit.com--2004/dpkg--devo--1.10--patch-4 fix some *really* bad missing brace errors * scott@netsplit.com--2004/dpkg--devo--1.10--patch-5 add archtable support for GNU/kNetBSD and fix GNU/kFreeBSD. * scott@netsplit.com--2004/dpkg--devo--1.10--patch-6 add missing debian/changelog entries * scott@netsplit.com--2004/dpkg--devo--1.10--patch-7 more changelog fixing * scott@netsplit.com--2004/dpkg--devo--1.10--patch-8 fix some compiler warnings * scott@netsplit.com--2004/dpkg--devo--1.10--patch-9 change amd64 to x86-64 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-10 update italian translation * scott@netsplit.com--2004/dpkg--devo--1.10--patch-11 reformatted debian/changelog * scott@netsplit.com--2004/dpkg--devo--1.10--patch-12 updated spanish dpkg-divert.8 manpage * scott@netsplit.com--2004/dpkg--devo--1.10--patch-13 new german start-stop-daemon manpage * scott@netsplit.com--2004/dpkg--devo--1.10--patch-14 updated russian manpage * scott@netsplit.com--2004/dpkg--devo--1.10--patch-15 update japanese manpages * scott@netsplit.com--2004/dpkg--devo--1.10--patch-16 fix wrong bug# * scott@netsplit.com--2004/dpkg--devo--1.10--patch-17 quote LDFLAGS in debian/rules * scott@netsplit.com--2004/dpkg--devo--1.10--patch-18 document dpkg:Version and dpkg:UpstreamVersion substvars. * scott@netsplit.com--2004/dpkg--devo--1.10--patch-19 allow dpkg-shlibdeps to run as root by guarding chown * scott@netsplit.com--2004/dpkg--devo--1.10--patch-20 move dpkg-scanpackages(8) and dpkg-scansources(8) into (1) * scott@netsplit.com--2004/dpkg--devo--1.10--patch-21 Release 1.10.22 * scott@netsplit.com--2004/dpkg--svn--1.10--patch-95 (merge patch logs from dpkg--cvs--1.10) * scott@netsplit.com--2004/dpkg--svn--1.10--patch-97 main/packages.c: Apply patch from Daniel Kobras to disappear empty pac... * scott@netsplit.com--2004/dpkg--svn--1.10--patch-98 spelling error fix * scripts/Makefile.in: Move dpkg-scanpackages and dpkg-scansources manpages to section 1. * scripts/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted reference to dpkg-scansources. * scripts/dpkg-scansources.pl: Adjusted reference to dpkg-scanpackages. * dselect/dselect.8: Adjusted reference to dpkg-scanpackages. * man/es/Makefile.in: Move dpkg-scanpackages and dpkg-scansources manpages to section 1. * man/es/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted reference to dpkg-scansources. * man/es/dpkg-scansources.8: Renamed to dpkg-scansources.1, * man/fr/Makefile.in: Move dpkg-scanpackages and dpkg-scansources manpages to section 1. * man/fr/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted reference to dpkg-scansources. * man/fr/dpkg-scansources.8: Renamed to dpkg-scansources.1 * man/ja/Makefile.in: Move dpkg-scanpackages and dpkg-scansources manpages to section 1. * man/ja/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted refence to dpkg-scansources. * man/ja/dpkg-scansources.8: Renamed to dpkg-scansources.1, adjusted reference to dpkg-scanpackages. * man/ja/dselect.8: Adjusted references to dpkg-scanpackages. * man/pt_BR/dselect.8: Adjusted reference to dpkg-scanpackages. * man/sv/.check.pl: Adjusted reference to dpkg-scanpackages. * man/sv/dselect.8: Adjusted reference to dpkg-scanpackages. * scripts/dpkg-shlibdeps.pl: Guard chown call with a check that we're running as root, if we're not, it's not necessary. * script/dpkg-source.1: Documented dpkg:Version and dpkg:UpstreamVersion substvars. * man/ja/dpkg-checkbuilddeps.1: Updated. * man/ja/dpkg-divert.8: Updated. * po/ru.po: Updated. * man/de/start-stop-daemon.8: New translation. * man/de/Makefile.in: Added new manpage. * man/es/dpkg-divert.8: Updated. * po/it.po: Updated. * archtable: Change amd64 to x86-64 or x86_64 to match the GNU strings until someone better than me makes a real decision about this. * scripts/dpkg-architecture.pl: Likewise. * dpkg-deb/extract.c: Swap %zi and %ld in printf expression. * split/info.c: Correct %zi and %lu in printf expression. * split/main.c: Include missing sys/types.h and sys/stat.h headers. * archtable: Change i386-kfreebsd-gnu to kfreebsd-i386 and add i386-knetbsd-gnu. * scripts/dpkg-archtable.pl: Return i386-freebsd for freebsd-i386 and i386-kfreebsd-gnu for kfreebsd-i386 instead. Add knetbsd-i386. * configure.in: Identify knetbsd-gnu. * main/depcon.c: Colour packages as we check them for break cycles to reduce the amount of recursion required to break a cycle. * include/dpkg-deb.h, lib/database.c: Add colour to the package structure. * main/main.h, main/configure.c, main/remove.c: Remove second argument from findbreakcycle() function. * utils/start-stop-daemon.c: On hurd, proc_stat_set_flags may return NULL as Hurd can have processes with no uid, replace ihash_iterate with HURD_IHASH_ITERATE. * utils/md5sum.1: s/asterix/asterisk/. Thanks to Matt Zimmermann for noticing this. * main/packages.c: Apply patch from Daniel Kobras to disappear empty packages that are replaced in the same run.
Diffstat (limited to 'dpkg-deb')
-rw-r--r--dpkg-deb/extract.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c
index caa6fc97f..8f3b4464f 100644
--- a/dpkg-deb/extract.c
+++ b/dpkg-deb/extract.c
@@ -191,7 +191,7 @@ void extracthalf(const char *debar, const char *directory,
if (admininfo >= 2)
if (printf(_(" old debian package, version %s.\n"
- " size %ld bytes: control archive= %ld, main archive= %zi.\n"),
+ " size %ld bytes: control archive= %zi, main archive= %ld.\n"),
versionbuf, (long)stab.st_size, ctrllennum,
(long) (stab.st_size - ctrllennum - strlen(ctrllenbuf) - l)) == EOF ||
fflush(stdout)) werr("stdout");