From: Scott James Remnant Date: Fri, 18 Mar 2005 16:21:32 +0000 (+0000) Subject: dpkg (1.13.2) experimental; urgency=low X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00e5640a99be03aba40c9e08a663b90d8f8aa797;p=dpkg dpkg (1.13.2) experimental; urgency=low * md5sum has been removed, the coreutils or textutils version will be diverted to /usr/bin/md5sum. Closes: #6633, #136110. The following bugs are filed against the dpkg md5sum, so no longer apply. Closes: #95755, #193877, #223381, #264195, #270241, #286632, * Take Replaces into account when installing packages; don't issue a "trying to overwrite" error if the file that already exists is in a package that Replaces the one being installed. Closes: #164595, #184635, #277890. * Allow actions and status changes to be logged to a file. Disabled by default, uncomment line in /etc/dpkg/dpkg.cfg to enable. Closes: #957, #53376, #77109, #143882, #284499. * Don't truncate output of 'dpkg -l' when stdout is not a tty. Closes: #92263, #253860, #258608, #261822, #282790. * Fix further compilation problems with gcc 4.0. Closes: #299699 * Handle tar files without trailing slash in directory names. Closes: #287152. * Output arguments to maintainer scripts with -D2. Closes: #237684, #296030. * Architecture Support: - Added ppc64. Closes: #263743. - Split archtable into cputable and ostable, archtable is retained for compatibility with other packages that might use it only. - dpkg-architecture no longer canonises -t argument. Closes: #173205. - dpkg-architecture output includes new DEB_*_ARCH_OS and DEB_*_ARCH_CPU variables that contain the Debian system and CPU names respectively. - dpkg-architecture outputs (mostly) correct GNU system names now, in particular this means that it will output "linux-gnu" instead of "linux". You should use the new _ARCH_OS variables instead. * Documentation: - Add examples to dpkg-divert(8). Closes: #291816. - Correct typo in dpkg-architecture(1). Closes: #299090. -- Scott James Remnant Fri, 18 Mar 2005 16:21:32 +0000 --- diff --git a/ChangeLog b/ChangeLog index 91b97987..c5a39fcb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,160 @@ +2005-03-18 Scott James Remnant + + * configure.ac: Release 1.13.2. + + * src/query.c (getwidth): Return -1 if we're not on a tty. + (list1package): Take a package list as well, and if getwidth() + returns -1 determine the longest name, version and description + and use those for output. + (listpackages): Pass the package list and length to both + calls to list1package to allow them to go wide. + + * lib/dbmodify.c (modstatdb_note): Every time we'd output a + status change to the status-fd, also output a log message to + the log-fd if we have one. + * lib/dpkg-db.h: Add definition of log_pipes. + * src/help.c (log_action): Write an action line to the log-fd. + * src/processarc.c (process_archive): Log installation and + upgrade actions. + * src/remove.c (removal_bulk_remove_configfiles): Log purge + action. + (deferred_remove) Log remove action. + * src/main.c (setfile): Take a filename, open it and add the + file descriptor to a list of pipes. + (cmdinfos): Add log command-line option that takes a filename + and adds it to log_pipes. + (usage): Add --log= usage. + * man/C/dpkg.1: Document --log=filename. + * debian/dpkg.cfg: Include a commented-out log option. + +2005-03-18 Peter van Dijk + + * lib/tarfn.c (TarExtractor): Only remove the last character + from directory names if it's a trailing slash. + +2005-03-18 Scott James Remnant + + * man/C/dpkg-divert.8: Add an EXAMPLES section giving the two + most common uses of dpkg-divert, for both add and remove. + + * man/C/dpkg-architecture.1: Update (should have done this with + the changes below, really). + + * src/help.c (preexecscript): The first member of argv is always + NULL because it's filled in by the return value of this function, + so increment argv first when debug-outputting maintainer script + arguments. + + * utils/md5sum.c: Remove file. + * lib/dpkg.h (MD5SUM): Remove definition of md5sum program name. + * utils/Makefile.am (bin_PROGRAMS): Remove md5sum. + * man/C/md5sum.1: Remove manual page. + * man/C/Makefile.am (dist_man_MANS): Remove md5sum.1. + * man/de/md5sum.1: Remove manual page. + * man/de/Makefile.am (dist_man_MANS): Remove md5sum.1. + * man/es/md5sum.1: Remove manual page. + * man/es/Makefile.am (dist_man_MANS): Remove md5sum.1. + * man/ja/md5sum.1: Remove manual page. + * man/ja/Makefile.am (dist_man_MANS): Remove md5sum.1. + * man/sv/md5sum.1: Remove manual page. + * man/sv/Makefile.am (dist_man_MANS): Remove md5sum.1. + * debian/dpkg.postinst (divert_md5sum): Divert the version of + md5sum installed by textutils or coreutils to the place where we + used to put our copy, include its manual page. + * debian/control ([dpkg]Depends): Depend on coreutils, which has + always included md5sum, or the version of textutils that has. + * debian/dpkg.install: Remove md5sum-related files. + * debian/copyright: Remove mentions of utils/md5sum.c. + * debian/pseudo-tags: Remove md5sum tag; no point filing bugs on + a non-existant program. + + * ostable (netbsd): Restore missing "*" on the end of the regex. + + Take a further step towards having separate CPU and system names + instead of just a joined architecture name; in particular add + support to dpkg-architecture. + + * cputable: Create new table of cpu names with canonical GNU + names and a regex to match against config.guess output. + * ostable: Create new table of operating system names with + canonical GNU names and a regex to match against config.guess + output. + * archtable: Move to debian directory. + * debian/archtable: Reduce to a simple set of architecture names + in Debian's sid distribution. + * scripts/dpkg-architecture.pl: Add support for split cputable + and ostable, including new DEB_*_ARCH_OS and DEB_*_ARCH_CPU + variables containing the Debian system and cpu names appropriately. + (usageversion): Remove list of known architectures, as we can't + easily compute this anymore (cputable * ostable). + (read_archtable): Removed function, we no longer touch archtable. + (read_cputable): Add function to parse cputable. + (read_ostable): Add function to parse ostable. + (split_debian): Add function to split a Debian "os-cpu" name. + (debian_to_gnu): Add function to split and look up the GNU names + for the Debian os and cpu, and return the joined GNU name. + (split_gnu): Add function to split a GNU triplet/quartet. + (gnu_to_debian): Add function to split and look up the Debian + names for the GNU os and cpu (by regex), and return the joined + Debian name. + (rewrite_gnu): Removed, replaced by regexes in the tables. + * m4/arch.m4 (DPKG_CPU_TYPE): Use awk to parse the new cputable + and define an ARCHITECTURE_CPU macro with the result. + (DPKG_OS_TYPE): Use awk to parse the new ostable and define an + ARCHITECTURE_OS macro with the result. + (DPKG_ARCHITECTURE): Simply join the os and cpu names together, + or omit the os name if "linux". + * Makefile.am (dist_pkgdata_DATA): Remove archtable, add + cputable and ostable instead. + (EXTRA_DIST): Add debian/archtable. + * debian/dpkg.install: Install debian/archtable in /usr/share/dpkg + for packages that still want it. + * debian/pseudo-tags: Replace mention of archtable. + + * archtable: Add ppc64 for powerpc-linux. + * scripts/dpkg-architecture.pl (rewrite_gnu): Rewrite powerpc64 + and ppc64 into powerpc64 for archtable. + +2005-03-17 Scott James Remnant + + * debian/dpkg.preinst (confirm_dselect_split): Check that dselect + is running before bitching; it's easy to do and will stop this + question more often than not. + +2005-03-17 Scott James Remnant , + Anthony Towns + + * src/archives.c (tarobject): Detect when installing a file that + exists in a package that replaces the one being installed. Leave + that on the disk and remove the file from the list for the package + being installed. + +2005-03-16 Scott James Remnant + + * lib/parsedump.h: Move definitions of fieldinfos and nicknames + arrays to the bottom of the file, to ensure we know the size of + the arrays we're declaring. + * lib/mlib.c (buffer_write): Cast unsigned char * to plain old + char * when calling sprintf. + +2005-03-12 Frank S. Thomas + + * man/C/dpkg-architecture.1: Correct typo (variales -> variables). + +2005-03-08 Scott James Remnant + + * Makefile.am (package): Remove rule, as it is only really + required outside of arch (otherwise you have a tarball). + * Makefile.maint: New file holding the package rule. + 2005-03-03 Scott James Remnant + * archtable: Describe column 2 as the value returned by + dpkg --print-architecture not --print-installation-architecture + which we deprecated in the last release. + + * configure.ac: Bump version to 1.13.2~. + * configure.ac: Release 1.13.1. 2005-03-03 Michael Vogt diff --git a/Makefile.am b/Makefile.am index 63cb767a..77e1e617 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,9 +22,10 @@ SUBDIRS = \ ACLOCAL_AMFLAGS = -I m4 -dist_pkgdata_DATA = archtable +dist_pkgdata_DATA = cputable ostable EXTRA_DIST = \ + debian/archtable \ debian/changelog \ debian/compat \ debian/control \ @@ -43,31 +44,3 @@ EXTRA_DIST = \ debian/rules \ debian/shlibs.default \ debian/shlibs.override - - -GAIN_ROOT_COMMAND=fakeroot -TARGET_ARGS= -DPKG_BUILDPACKAGE_ARGS= -LINTIAN_ARGS= - -package: distdir - cd $(distdir) && dpkg-buildpackage \ - -r$(GAIN_ROOT_COMMAND) \ - $(TARGET_ARGS) $(DPKG_BUILDPACKAGE_ARGS) - $(am__remove_distdir) - @set -e; \ - if test "x$(TARGET_ARGS)" = "x-S"; then \ - arch=source; \ - else \ - arch=`dpkg-architecture $(TARGET_ARGS) -qDEB_HOST_ARCH`; \ - fi; \ - changes=$(PACKAGE)_$(VERSION)_$$arch.changes; \ - test -f $$changes || { echo $$changes missing; exit 1;}; \ - if which lintian >/dev/null; then \ - echo lintian $(LINTIAN_ARGS) $$changes; \ - lintian $(LINTIAN_ARGS) $$changes || true; \ - fi; \ - (echo "$(distdir) package files ready for upload: "; \ - echo $$changes; \ - sed -e '1,/^Files:/d;/^$$/,$$d;s/.* //g' $$changes) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' diff --git a/Makefile.in b/Makefile.in index 22af3c33..3b6e0ee7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -241,8 +241,9 @@ SUBDIRS = \ man ACLOCAL_AMFLAGS = -I m4 -dist_pkgdata_DATA = archtable +dist_pkgdata_DATA = cputable ostable EXTRA_DIST = \ + debian/archtable \ debian/changelog \ debian/compat \ debian/control \ @@ -262,10 +263,6 @@ EXTRA_DIST = \ debian/shlibs.default \ debian/shlibs.override -GAIN_ROOT_COMMAND = fakeroot -TARGET_ARGS = -DPKG_BUILDPACKAGE_ARGS = -LINTIAN_ARGS = all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -701,28 +698,6 @@ uninstall-info: uninstall-info-recursive uninstall uninstall-am uninstall-dist_pkgdataDATA \ uninstall-info-am - -package: distdir - cd $(distdir) && dpkg-buildpackage \ - -r$(GAIN_ROOT_COMMAND) \ - $(TARGET_ARGS) $(DPKG_BUILDPACKAGE_ARGS) - $(am__remove_distdir) - @set -e; \ - if test "x$(TARGET_ARGS)" = "x-S"; then \ - arch=source; \ - else \ - arch=`dpkg-architecture $(TARGET_ARGS) -qDEB_HOST_ARCH`; \ - fi; \ - changes=$(PACKAGE)_$(VERSION)_$$arch.changes; \ - test -f $$changes || { echo $$changes missing; exit 1;}; \ - if which lintian >/dev/null; then \ - echo lintian $(LINTIAN_ARGS) $$changes; \ - lintian $(LINTIAN_ARGS) $$changes || true; \ - fi; \ - (echo "$(distdir) package files ready for upload: "; \ - echo $$changes; \ - sed -e '1,/^Files:/d;/^$$/,$$d;s/.* //g' $$changes) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/archtable b/archtable deleted file mode 100644 index 2ad462f0..00000000 --- a/archtable +++ /dev/null @@ -1,36 +0,0 @@ -# This file contains the table of known architecture strings. -# -# Column 1 is determined by dpkg's configure script based on the output -# of the config.guess script. -# Column 2 contains the Debian name for the architecture, which is returned -# by ‘dpkg --print-installation-architecture’. -# -# -i386-linux i386 -ia64-linux ia64 -alpha-linux alpha -x86_64-linux amd64 -arm-linux arm -hppa-linux hppa -m32r-linux m32r -m68k-linux m68k -mips-linux mips -mipsel-linux mipsel -powerpc-linux powerpc -s390-linux s390 -s390x-linux s390x -sh3-linux sh3 -sh3eb-linux sh3eb -sh4-linux sh4 -sh4eb-linux sh4eb -sparc-linux sparc - -i386-darwin darwin-i386 -powerpc-darwin darwin-powerpc -i386-freebsd freebsd-i386 -i386-gnu hurd-i386 -i386-kfreebsd-gnu kfreebsd-i386 -x86_64-kfreebsd-gnu kfreebsd-amd64 -i386-knetbsd-gnu knetbsd-i386 -i386-netbsd netbsd-i386 -i386-openbsd openbsd-i386 diff --git a/config.h.in b/config.h.in index 6f74f0c0..93d7d926 100644 --- a/config.h.in +++ b/config.h.in @@ -1,8 +1,14 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Set this to the canonical Debian architecture string for this CPU type. */ +/* Set this to the canonical dpkg architecture name. */ #undef ARCHITECTURE +/* Set this to the canonical dpkg CPU name. */ +#undef ARCHITECTURE_CPU + +/* Set this to the canonical dpkg system name. */ +#undef ARCHITECTURE_OS + /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ diff --git a/configure b/configure index d104a618..7de48daf 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for dpkg 1.13.1. +# Generated by GNU Autoconf 2.59 for dpkg 1.13.2. # # Report bugs to . # @@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='dpkg' PACKAGE_TARNAME='dpkg' -PACKAGE_VERSION='1.13.1' -PACKAGE_STRING='dpkg 1.13.1' +PACKAGE_VERSION='1.13.2' +PACKAGE_STRING='dpkg 1.13.2' PACKAGE_BUGREPORT='debian-dpkg@lists.debian.org' ac_unique_file="lib/dpkg.h" @@ -816,7 +816,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dpkg 1.13.1 to adapt to many kinds of systems. +\`configure' configures dpkg 1.13.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -883,7 +883,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dpkg 1.13.1:";; + short | recursive ) echo "Configuration of dpkg 1.13.2:";; esac cat <<\_ACEOF @@ -1037,7 +1037,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -dpkg configure 1.13.1 +dpkg configure 1.13.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1051,7 +1051,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dpkg $as_me 1.13.1, which was +It was created by dpkg $as_me 1.13.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1513,6 +1513,59 @@ cat >>confdefs.h <<\_ACEOF _ACEOF +echo "$as_me:$LINENO: checking dpkg cpu type" >&5 +echo $ECHO_N "checking dpkg cpu type... $ECHO_C" >&6 +cpu_type="`awk \"! /^(#.*)?\\$/ { if (match(\\\"$target_cpu\\\", \\\"^\\\"\\$3\\\"\\$\\\")) { print \\$1; exit; } }\" $srcdir/cputable`" +if test "x$cpu_type" = "x"; then + cpu_type=$target_cpu + echo "$as_me:$LINENO: result: $cpu_type" >&5 +echo "${ECHO_T}$cpu_type" >&6 + { echo "$as_me:$LINENO: WARNING: $target_cpu not found in cputable" >&5 +echo "$as_me: WARNING: $target_cpu not found in cputable" >&2;} +else + echo "$as_me:$LINENO: result: $cpu_type" >&5 +echo "${ECHO_T}$cpu_type" >&6 +fi + +cat >>confdefs.h <<_ACEOF +#define ARCHITECTURE_CPU "${cpu_type}" +_ACEOF + + +echo "$as_me:$LINENO: checking dpkg operating system type" >&5 +echo $ECHO_N "checking dpkg operating system type... $ECHO_C" >&6 +os_type="`awk \"! /^(#.*)?\\$/ { if (match(\\\"$target_os\\\", \\\"^\\\"\\$3\\\"\\$\\\")) { print \\$1; exit; } }\" $srcdir/ostable`" +if test "x$os_type" = "x"; then + os_type=$target_os + echo "$as_me:$LINENO: result: $os_type" >&5 +echo "${ECHO_T}$os_type" >&6 + { echo "$as_me:$LINENO: WARNING: $target_os not found in ostable" >&5 +echo "$as_me: WARNING: $target_os not found in ostable" >&2;} +else + echo "$as_me:$LINENO: result: $os_type" >&5 +echo "${ECHO_T}$os_type" >&6 +fi + +cat >>confdefs.h <<_ACEOF +#define ARCHITECTURE_OS "${os_type}" +_ACEOF + + +echo "$as_me:$LINENO: checking dpkg architecture name" >&5 +echo $ECHO_N "checking dpkg architecture name... $ECHO_C" >&6 +if test "x$os_type" = "xlinux"; then + dpkg_arch=$cpu_type +else + dpkg_arch="$os_type-$cpu_type" +fi +echo "$as_me:$LINENO: result: $dpkg_arch" >&5 +echo "${ECHO_T}$dpkg_arch" >&6 + +cat >>confdefs.h <<_ACEOF +#define ARCHITECTURE "${dpkg_arch}" +_ACEOF + + am__api_version="1.8" # Find a good install program. We prefer a C program (faster), @@ -1788,7 +1841,7 @@ fi # Define the identity of the package. PACKAGE='dpkg' - VERSION='1.13.1' + VERSION='1.13.2' cat >>confdefs.h <<_ACEOF @@ -11724,88 +11777,6 @@ fi rm -f conftest* fi -echo "$as_me:$LINENO: checking cpu type" >&5 -echo $ECHO_N "checking cpu type... $ECHO_C" >&6 -case "$target_cpu" in - i386|i486|i586|i686|pentium) - cpu_type="i386" - ;; - alpha*) - cpu_type="alpha" - ;; - arm*) - cpu_type="arm" - ;; - hppa*) - cpu_type="hppa" - ;; - sparc|sparc64) - cpu_type="sparc" - ;; - mips|mipseb) - cpu_type="mips" - ;; - powerpc|ppc) - cpu_type="powerpc" - ;; - *) - cpu_type=$target_cpu - ;; -esac -echo "$as_me:$LINENO: result: $cpu_type" >&5 -echo "${ECHO_T}$cpu_type" >&6 - -echo "$as_me:$LINENO: checking operating system type" >&5 -echo $ECHO_N "checking operating system type... $ECHO_C" >&6 -case "$target_os" in - linux*-gnu*) - os_type="linux" - ;; - darwin*) - os_type="darwin" - ;; - freebsd*) - os_type="freebsd" - ;; - gnu*) - os_type="gnu" - ;; - kfreebsd*-gnu*) - os_type="kfreebsd-gnu" - ;; - knetbsd*-gnu*) - os_type="knetbsd-gnu" - ;; - netbsd*) - os_type="netbsd" - ;; - openbsd*) - os_type="openbsd" - ;; - *) - os_type=$target_os - ;; -esac -echo "$as_me:$LINENO: result: $os_type" >&5 -echo "${ECHO_T}$os_type" >&6 - -echo "$as_me:$LINENO: checking Debian architecture name" >&5 -echo $ECHO_N "checking Debian architecture name... $ECHO_C" >&6 -dpkg_archset="`awk '$1 == "'$cpu_type-$os_type'" { print $2 }' $srcdir/archtable`" -if test "x$dpkg_archset" = "x"; then - dpkg_archset=$cpu_type-$os_type - echo "$as_me:$LINENO: result: $dpkg_archset, but not found in archtable" >&5 -echo "${ECHO_T}$dpkg_archset, but not found in archtable" >&6 -else - echo "$as_me:$LINENO: result: $dpkg_archset" >&5 -echo "${ECHO_T}$dpkg_archset" >&6 -fi - -cat >>confdefs.h <<_ACEOF -#define ARCHITECTURE "${dpkg_archset}" -_ACEOF - - # Checks for libraries. @@ -15417,7 +15388,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by dpkg $as_me 1.13.1, which was +This file was extended by dpkg $as_me 1.13.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15480,7 +15451,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -dpkg config.status 1.13.1 +dpkg config.status 1.13.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index cc08a7b0..13631176 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,13 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([dpkg], [1.13.1], [debian-dpkg@lists.debian.org]) +AC_INIT([dpkg], [1.13.2], [debian-dpkg@lists.debian.org]) AC_CONFIG_SRCDIR([lib/dpkg.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_SYSTEM AC_GNU_SOURCE +DPKG_ARCHITECTURE AM_INIT_AUTOMAKE([1.8 gnu]) @@ -56,7 +57,6 @@ DPKG_PROG_PERL # Checks for operating system services and capabilities. AC_SYS_LARGEFILE -DPKG_ARCHITECTURE # Checks for libraries. DPKG_LIB_ZLIB diff --git a/cputable b/cputable new file mode 100644 index 00000000..42c4ee4a --- /dev/null +++ b/cputable @@ -0,0 +1,34 @@ +# This file contains the table of known CPU names. +# +# Architecture names are formed as a combination of the system name +# (from ostable) and CPU name (from this table). A list of architecture +# names in the Debian ‘sid’ distribution can be found in the archtable +# file. +# +# Column 1 is the Debian name for the CPU, used to form the architecture +# name. +# Column 2 is the GNU name for the CPU, used to output build and host +# targets in ‘dpkg-architecture’. +# Column 3 is an extended regular expression used to match against the +# CPU part of the output of the GNU config.guess script. +# +# +i386 i386 (i[3456]86|pentium) +ia64 ia64 ia64 +alpha alpha alpha.* +amd64 x86_64 x86_64 +arm arm arm.* +hppa hppa hppa.* +m32r m32r m32r +m68k m68k m68k +mips mips mips(eb)? +mipsel mipsel mipsel +powerpc powerpc (powerpc|ppc) +ppc64 powerpc64 (powerpc|ppc)64 +s390 s390 s390 +s390x s390x s390x +sh3 sh3 sh3 +sh3eb sh3eb sh3eb +sh4 sh4 sh4 +sh4eb sh4eb sh4eb +sparc sparc sparc(64)? diff --git a/debian/archtable b/debian/archtable new file mode 100644 index 00000000..63e56664 --- /dev/null +++ b/debian/archtable @@ -0,0 +1,26 @@ +# This file contains the list of architecture names in Debian's ‘sid’ +# distribution. +# +# Architecture names are formed as a combination of the system name +# (from ostable) and CPU name (from cputable). Support for new +# architectures in dpkg is added in those files, architecture names +# are only added to this file when added to the distribution. +# +# Column 1 is present for historical reasons only, and should be ignored. +# Column 2 contains the Debian name for the architecture, which is returned +# by ‘dpkg --print-architecture’. +# +# +i386-linux-gnu i386 +ia64-linux-gnu ia64 +alpha-linux-gnu alpha +arm-linux-gnu arm +hppa-linux-gnu hppa +m68k-linux-gnu m68k +mips-linux-gnu mips +mipsel-linux-gnu mipsel +powerpc-linux-gnu powerpc +s390-linux-gnu s390 +sh-linux-gnu sh +sparc-linux-gnu sparc +i386-gnu hurd-i386 diff --git a/debian/changelog b/debian/changelog index 5f618e88..71db8dd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,40 @@ -dpkg (1.13.1.0.1) experimental; urgency=low - - * Bin-MU; recompile against Debian unstable, to make dselect actually - installable. +dpkg (1.13.2) experimental; urgency=low + + * md5sum has been removed, the coreutils or textutils version will be + diverted to /usr/bin/md5sum. Closes: #6633, #136110. + The following bugs are filed against the dpkg md5sum, so no longer apply. + Closes: #95755, #193877, #223381, #264195, #270241, #286632, + * Take Replaces into account when installing packages; don't issue a + "trying to overwrite" error if the file that already exists is in + a package that Replaces the one being installed. + Closes: #164595, #184635, #277890. + * Allow actions and status changes to be logged to a file. Disabled by + default, uncomment line in /etc/dpkg/dpkg.cfg to enable. + Closes: #957, #53376, #77109, #143882, #284499. + * Don't truncate output of 'dpkg -l' when stdout is not a tty. + Closes: #92263, #253860, #258608, #261822, #282790. + * Fix further compilation problems with gcc 4.0. Closes: #299699 + * Handle tar files without trailing slash in directory names. + Closes: #287152. + * Output arguments to maintainer scripts with -D2. Closes: #237684, + #296030. + + * Architecture Support: + - Added ppc64. Closes: #263743. + - Split archtable into cputable and ostable, archtable is retained + for compatibility with other packages that might use it only. + - dpkg-architecture no longer canonises -t argument. Closes: #173205. + - dpkg-architecture output includes new DEB_*_ARCH_OS and + DEB_*_ARCH_CPU variables that contain the Debian system and CPU + names respectively. + - dpkg-architecture outputs (mostly) correct GNU system names now, + in particular this means that it will output "linux-gnu" instead + of "linux". You should use the new _ARCH_OS variables instead. + * Documentation: + - Add examples to dpkg-divert(8). Closes: #291816. + - Correct typo in dpkg-architecture(1). Closes: #299090. - -- Scott James Remnant Fri, 11 Mar 2005 09:00:14 +0000 + -- Scott James Remnant Fri, 18 Mar 2005 16:21:32 +0000 dpkg (1.13.1) experimental; urgency=low @@ -13,6 +44,7 @@ dpkg (1.13.1) experimental; urgency=low defined by dpkg-architecture instead. * Soft-deprecated dpkg --print-installation-architecture. Use dpkg --print-architecture instead, which now does the same thing. + * dpkg --print-architecture no longer calls c-compiler. Closes: #164863. * Removed third field from /usr/share/dpkg/archtable. * Now we no-longer pre-depend on dselect, check the upgrade will work @@ -31,7 +63,7 @@ dpkg (1.13.1) experimental; urgency=low * Fix start-stop-daemon's support for GNU/kFreeBSD. Closes: #258051. * Architecture Support: - - Added kfreebsd-amd64. Closes: #280693. + - Added kfreebsd-amd64. Closes: #280963. - Added m32r. Closes: #280710. - Clean up of archtable. Closes: #118910, #286898. - Clean up of dpkg-architecture. Closes: #256323. @@ -52,8 +84,8 @@ dpkg (1.13.0) experimental; urgency=low * Correct bashism in disk method update script. Closes: #260568. * Scorched-earth reimplementation of the build process and control files - with debhelper and automake. Closes: #217946, #229629, #260568, #266995, - #283640, #292973, #293041. + with debhelper and automake. Closes: #217946, #229629, #256589, #260568, + #266995, #283640, #292973, #293041. * Remove SGML and POD documentation formats due to both licensing and sanity issues. Closes: #285086. * The dpkg-doc and dpkg-static packages are no more. diff --git a/debian/control b/debian/control index 15f47fcb..0b688cd9 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,7 @@ Package: dpkg Architecture: any Essential: yes Pre-Depends: ${shlibs:Depends} +Depends: coreutils | textutils (>= 2.0-3) Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11), dpkg-static, dpkg-dev (<< 1.10) Replaces: dpkg-doc-ja, dpkg-static, manpages-de (<= 0.4-3) Suggests: apt diff --git a/debian/copyright b/debian/copyright index 3781b4be..924a463f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -27,7 +27,6 @@ Copyright © 1994 Ian Murdock Includes public domain MD5 code: lib/md5.c and lib/md5.h originally written by Colin Plumb, - utils/md5sum.c originally written by Branko Lankester. Includes code from ‘getopt’ and ‘gettext’: Copyright © 1984-2002 Free Software Foundation, Inc. @@ -48,10 +47,3 @@ General Public License for more details. On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in ‘/usr/share/common-licenses/GPL’ or in the dpkg source as the file ‘COPYING’ - - -/usr/bin/md5sum is compiled from md5.[ch] (written by Colin Plumb in -1993 and modified by Ian Jackson in 1995) and md5sum.c (written by -Branko Lankester in 1993 and modified by Colin Plumb in 1993 and Ian -Jackson in 1995). The sources and the binary are all in the public -domain. diff --git a/debian/dpkg.cfg b/debian/dpkg.cfg index a4bba7e3..5970eccb 100644 --- a/debian/dpkg.cfg +++ b/debian/dpkg.cfg @@ -4,3 +4,6 @@ # options are allowed. Values can be specified by putting them after # the option, separated by whitespace and/or an `=' sign. # + +# Log status changes and actions to a file. +#log /var/log/dpkg.log diff --git a/debian/dpkg.install b/debian/dpkg.install index 64fac28c..b9f80aaa 100644 --- a/debian/dpkg.install +++ b/debian/dpkg.install @@ -1,4 +1,5 @@ ../dpkg.cfg etc/dpkg +../archtable usr/share/dpkg etc/alternatives etc/dpkg/origins @@ -6,7 +7,6 @@ usr/bin/dpkg usr/bin/dpkg-deb usr/bin/dpkg-query usr/bin/dpkg-split -usr/bin/md5sum usr/lib/dpkg/enoent usr/lib/dpkg/mksplit usr/sbin/start-stop-daemon sbin @@ -31,8 +31,6 @@ usr/share/man/*/*/dpkg.1 usr/share/man/*/dpkg.1 usr/share/man/*/*/install-info.8 usr/share/man/*/install-info.8 -usr/share/man/*/*/md5sum.1 -usr/share/man/*/md5sum.1 usr/share/man/*/*/start-stop-daemon.8 usr/share/man/*/start-stop-daemon.8 usr/share/man/*/*/update-alternatives.8 diff --git a/debian/dpkg.postinst b/debian/dpkg.postinst index 25babadd..3aeda563 100755 --- a/debian/dpkg.postinst +++ b/debian/dpkg.postinst @@ -137,6 +137,19 @@ Shall I remove these links ? [y/n] " } +# Divert textutils/coreutils md5sum now that we no longer provide it +divert_md5sum() { + if [ -f /usr/bin/md5sum.textutils ] && [ ! -f /usr/bin/md5sum ]; then + dpkg-divert --divert /usr/bin/md5sum --rename /usr/bin/md5sum.textutils + fi + if [ -f /usr/share/man/man1/md5sum.textutils.1.gz ] \ + && [ ! -f /usr/share/man/man1/md5sum.1.gz ]; then + dpkg-divert --divert /usr/share/man/man1/md5sum.1.gz --rename \ + /usr/share/man/man1/md5sum.textutils.1.gz + fi +} + + case "$1" in configure) case "$2" in @@ -151,6 +164,7 @@ case "$1" in create_database move_info_directory remove_info_symlink + divert_md5sum ;; abort-upgrade|abort-deconfigure|abort-remove) diff --git a/debian/dpkg.preinst b/debian/dpkg.preinst index 005b1873..7d3a00a8 100755 --- a/debian/dpkg.preinst +++ b/debian/dpkg.preinst @@ -95,6 +95,8 @@ Are you installing only the dpkg upgrade in this dpkg run ? [y/n] " # Confirm that dselect got split into it's own package confirm_dselect_split() { + ps -C dselect >/dev/null || return + if ! grep "^Package: *dselect$" /var/lib/dpkg/status >/dev/null; then echo -n " IMPORTANT - if you are upgrading this package from within dselect you diff --git a/debian/pseudo-tags b/debian/pseudo-tags index 71c61caf..9a7b5203 100644 --- a/debian/pseudo-tags +++ b/debian/pseudo-tags @@ -12,8 +12,8 @@ When filing bugs, please do the same to aid triage. [PERF] Performance problems. [DOC] Documentation bugs, including --help and manpages. [UTF-8] Conversion to the UTF-8 encoding. -[ARCH] Updates to ‘archtable’ and porting patches. Include - the dpkg architecture name in the tag, +[ARCH] Updates to ‘cputable’, ‘ostable’ and porting patches. + Include the dpkg architecture name in the tag, e.g. [ARCH:sparc] [INTL] New or updated translations and bugs affecting translation. Include the language code in the tag, @@ -29,7 +29,6 @@ dpkg: [DPKG-QUERY] [DPKG-SPLIT] [DPKG-STATOVERRIDE] -[MD5SUM] [S-S-D] start-stop-daemon [CLEANUP-INFO] [INSTALL-INFO] diff --git a/lib/dbmodify.c b/lib/dbmodify.c index 48896137..a1676716 100644 --- a/lib/dbmodify.c +++ b/lib/dbmodify.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -229,6 +230,7 @@ void modstatdb_shutdown(void) { } struct pipef *status_pipes= NULL; +struct pipef *log_pipes= NULL; void modstatdb_note(struct pkginfo *pkg) { assert(cstatus >= msdbrw_write); @@ -250,6 +252,26 @@ void modstatdb_note(struct pkginfo *pkg) { pipef= pipef->next; } } + if (log_pipes) { + static struct varbuf *log= NULL; + struct pipef *pipef= log_pipes; + char time_str[20]; + time_t now; + int r; + if (log == NULL) { + log = nfmalloc(sizeof(struct varbuf)); + varbufinit(log); + } else + varbufreset(log); + time(&now); + strftime(time_str, sizeof(time_str), "%Y-%m-%d %H:%M:%S", gmtime(&now)); + r= varbufprintf(log, "%s status %s %s %s\n", time_str, statusinfos[pkg->status].name, + pkg->name, versiondescribe(&pkg->installed.version, vdew_nonambig)); + while (pipef) { + write(pipef->fd, log->buf, r); + pipef= pipef->next; + } + } varbufreset(&uvb); varbufrecord(&uvb, pkg, &pkg->installed); if (fwrite(uvb.buf, 1, uvb.used, importanttmp) != uvb.used) diff --git a/lib/dpkg-db.h b/lib/dpkg-db.h index e8ba9a8b..72c1f974 100644 --- a/lib/dpkg-db.h +++ b/lib/dpkg-db.h @@ -164,7 +164,7 @@ struct pipef { int fd; struct pipef *next; }; -extern struct pipef *status_pipes; +extern struct pipef *status_pipes, *log_pipes; enum modstatdb_rw modstatdb_init(const char *admindir, enum modstatdb_rw reqrwflags); void modstatdb_note(struct pkginfo *pkg); diff --git a/lib/dpkg.h b/lib/dpkg.h index e115e2df..a12e637c 100644 --- a/lib/dpkg.h +++ b/lib/dpkg.h @@ -132,7 +132,6 @@ #define BACKEND "dpkg-deb" #define DPKGQUERY "dpkg-query" #define SPLITTER "dpkg-split" -#define MD5SUM "md5sum" #define DSELECT "dselect" #define DPKG "dpkg" #define DEBSIGVERIFY "/usr/bin/debsig-verify" diff --git a/lib/mlib.c b/lib/mlib.c index f8c4877d..d74d25a5 100644 --- a/lib/mlib.c +++ b/lib/mlib.c @@ -176,7 +176,7 @@ off_t buffer_write(buffer_data_t data, void *buf, off_t length, const char *desc unsigned char *hash = *ctx->hash = malloc(33); MD5Final(digest, &ctx->ctx); for (i = 0; i < 16; ++i) { - sprintf(hash, "%02x", *p++); + sprintf((char *)hash, "%02x", *p++); hash += 2; } *hash = 0; diff --git a/lib/parsedump.h b/lib/parsedump.h index 58390b7e..f767b299 100644 --- a/lib/parsedump.h +++ b/lib/parsedump.h @@ -25,15 +25,6 @@ struct fieldinfo; -struct nickname { - const char *nick; - const char *canon; -}; - -extern const struct fieldinfo fieldinfos[]; -extern const struct nickname nicknames[]; -extern const int nfields; /* = elements in fieldinfos, including the sentinels */ - #define PKGIFPOFF(f) ((char*)(&(((struct pkginfoperfile *)0x1000)->f)) - \ (char*)(struct pkginfoperfile *)0x1000) #define PKGPFIELD(pifp,of,type) (*(type*)((char*)(pifp)+(of))) @@ -78,4 +69,13 @@ void parsemustfield(FILE *file, const char *filename, int lno, #define MSDOS_EOF_CHAR '\032' /* ^Z */ +struct nickname { + const char *nick; + const char *canon; +}; + +extern const struct fieldinfo fieldinfos[]; +extern const struct nickname nicknames[]; +extern const int nfields; /* = elements in fieldinfos, including the sentinels */ + #endif /* DPKG_PARSEDUMP_H */ diff --git a/lib/tarfn.c b/lib/tarfn.c index 458d2d98..2112b60d 100644 --- a/lib/tarfn.c +++ b/lib/tarfn.c @@ -185,7 +185,9 @@ TarExtractor( } /* Else, Fall Through */ case Directory: - h.Name[nameLength - 1] = '\0'; + if ( h.Name[nameLength - 1] == '/' ) { + h.Name[nameLength - 1] = '\0'; + } status = (*functions->MakeDirectory)(&h); break; case HardLink: diff --git a/m4/arch.m4 b/m4/arch.m4 index f91686f4..a27ef4ac 100644 --- a/m4/arch.m4 +++ b/m4/arch.m4 @@ -1,90 +1,53 @@ # DPKG_CPU_TYPE # ------------- -# Parse the target cpu name and check it against a list of special cases to -# determine what type it is. +# Parse the target cpu name and check it against the cputable to determine +# the Debian name for it. Sets ARCHITECTURE_CPU. AC_DEFUN([DPKG_CPU_TYPE], -[AC_MSG_CHECKING([cpu type]) -case "$target_cpu" in - i386|i486|i586|i686|pentium) - cpu_type="i386" - ;; - alpha*) - cpu_type="alpha" - ;; - arm*) - cpu_type="arm" - ;; - hppa*) - cpu_type="hppa" - ;; - sparc|sparc64) - cpu_type="sparc" - ;; - mips|mipseb) - cpu_type="mips" - ;; - powerpc|ppc) - cpu_type="powerpc" - ;; - *) +[AC_MSG_CHECKING([dpkg cpu type]) +[cpu_type="`awk \"! /^(#.*)?\\$/ { if (match(\\\"$target_cpu\\\", \\\"^\\\"\\$][3\\\"\\$\\\")) { print \\$][1; exit; } }\" $srcdir/cputable`"] +if test "x$cpu_type" = "x"; then cpu_type=$target_cpu - ;; -esac -AC_MSG_RESULT([$cpu_type]) + AC_MSG_RESULT([$cpu_type]) + AC_MSG_WARN([$target_cpu not found in cputable]) +else + AC_MSG_RESULT([$cpu_type]) +fi +AC_DEFINE_UNQUOTED(ARCHITECTURE_CPU, "${cpu_type}", + [Set this to the canonical dpkg CPU name.]) ])# DPKG_CPU_TYPE # DPKG_OS_TYPE # ------------ # Parse the target operating system name and check it against a list of -# special cases to determine what type it is. +# special cases to determine what type it is. Sets ARCHITECTURE_OS. AC_DEFUN([DPKG_OS_TYPE], -[AC_MSG_CHECKING([operating system type]) -case "$target_os" in - linux*-gnu*) - os_type="linux" - ;; - darwin*) - os_type="darwin" - ;; - freebsd*) - os_type="freebsd" - ;; - gnu*) - os_type="gnu" - ;; - kfreebsd*-gnu*) - os_type="kfreebsd-gnu" - ;; - knetbsd*-gnu*) - os_type="knetbsd-gnu" - ;; - netbsd*) - os_type="netbsd" - ;; - openbsd*) - os_type="openbsd" - ;; - *) +[AC_MSG_CHECKING([dpkg operating system type]) +[os_type="`awk \"! /^(#.*)?\\$/ { if (match(\\\"$target_os\\\", \\\"^\\\"\\$][3\\\"\\$\\\")) { print \\$][1; exit; } }\" $srcdir/ostable`"] +if test "x$os_type" = "x"; then os_type=$target_os - ;; -esac -AC_MSG_RESULT([$os_type]) + AC_MSG_RESULT([$os_type]) + AC_MSG_WARN([$target_os not found in ostable]) +else + AC_MSG_RESULT([$os_type]) +fi +AC_DEFINE_UNQUOTED(ARCHITECTURE_OS, "${os_type}", + [Set this to the canonical dpkg system name.]) ])# DPKG_OS_TYPE # DPKG_ARCHITECTURE # ------------------------ -# Locate the target operating system in the archtable, sets ARCHITECTURE +# Determine the Debian name for the target operating system, +# sets ARCHITECTURE. AC_DEFUN([DPKG_ARCHITECTURE], [DPKG_CPU_TYPE DPKG_OS_TYPE -AC_MSG_CHECKING([Debian architecture name]) -dpkg_archset="`awk '[$]1 == "'$cpu_type-$os_type'" { print [$]2 }' $srcdir/archtable`" -if test "x$dpkg_archset" = "x"; then - dpkg_archset=$cpu_type-$os_type - AC_MSG_RESULT([$dpkg_archset, but not found in archtable]) +AC_MSG_CHECKING([dpkg architecture name]) +if test "x$os_type" = "xlinux"; then + dpkg_arch=$cpu_type else - AC_MSG_RESULT([$dpkg_archset]) + dpkg_arch="$os_type-$cpu_type" fi -AC_DEFINE_UNQUOTED(ARCHITECTURE, "${dpkg_archset}", - [Set this to the canonical Debian architecture string for this CPU type.]) +AC_MSG_RESULT([$dpkg_arch]) +AC_DEFINE_UNQUOTED(ARCHITECTURE, "${dpkg_arch}", + [Set this to the canonical dpkg architecture name.]) ])# DPKG_ARCHITECTURE diff --git a/man/C/Makefile.am b/man/C/Makefile.am index 39ce5616..4ee3d2cc 100644 --- a/man/C/Makefile.am +++ b/man/C/Makefile.am @@ -22,7 +22,6 @@ dist_man_MANS = \ dselect.1 \ dselect.cfg.5 \ install-info.8 \ - md5sum.1 \ start-stop-daemon.8 \ update-alternatives.8 diff --git a/man/C/Makefile.in b/man/C/Makefile.in index 4b393979..785ed43e 100644 --- a/man/C/Makefile.in +++ b/man/C/Makefile.in @@ -222,7 +222,6 @@ dist_man_MANS = \ dselect.1 \ dselect.cfg.5 \ install-info.8 \ - md5sum.1 \ start-stop-daemon.8 \ update-alternatives.8 diff --git a/man/C/dpkg-architecture.1 b/man/C/dpkg-architecture.1 index 3efa8d3f..465f5004 100644 --- a/man/C/dpkg-architecture.1 +++ b/man/C/dpkg-architecture.1 @@ -28,7 +28,7 @@ is sufficient, the value of the other will be set to a usable default. Indeed, it is often better to only specify one, because dpkg-architecture will warn you if your choice doesn't match the default. .PP -The default action is \fB\-l\fR, which prints the environment variales, one each line, +The default action is \fB\-l\fR, which prints the environment variables, one each line, in the format VARIABLE=value. If you are only interested in the value of a single variable, you can use \fB\-q\fR. If you specify \fB\-s\fR, it will output an export command. This can be used to set the environment variables using eval. \fB\-u\fR @@ -54,8 +54,9 @@ The Debian archietcture string, which specifies the binary tree in the \s-1FTP\s archive. Examples: i386, sparc, hurd\-i386. .IP "\s-1GNU\s0 System Type" 4 .IX Item "GNU System Type" -An architecture specification string consisting of two or three parts, -cpu-system or cpu\-vendor\-system. Examples: i386\-linux, sparc\-linux, i386\-gnu. +An architecture specification string consisting of two parts, +cpu-system. Examples: i386\-linux-gnu, sparc\-linux-gnu, i386\-gnu, +x86_64-netbsd. .SH "EXAMPLES" .IX Header "EXAMPLES" dpkg-buildpackage accepts the \fB\-a\fR option and passes it to dpkg\-architecture. @@ -70,6 +71,12 @@ The following variables are set by dpkg\-architecture: .IP "\s-1DEB_BUILD_ARCH\s0" 4 .IX Item "DEB_BUILD_ARCH" The Debian architecture of the build machine. +.IP "\s-1DEB_BUILD_ARCH_OS\s0" 4 +.IX Item "DEB_BUILD_ARCH_OS" +The Debian system name of the build machine. +.IP "\s-1DEB_BUILD_ARCH_CPU\s0" 4 +.IX Item "DEB_BUILD_ARCH_CPU" +The Debian cpu name of the build machine. .IP "\s-1DEB_BUILD_GNU_TYPE\s0" 4 .IX Item "DEB_BUILD_GNU_TYPE" The \s-1GNU\s0 system type of the build machine. @@ -82,6 +89,12 @@ The System part of \s-1DEB_BUILD_GNU_TYPE\s0 .IP "\s-1DEB_HOST_ARCH\s0" 4 .IX Item "DEB_HOST_ARCH" The Debian architecture of the host machine. +.IP "\s-1DEB_HOST_ARCH_OS\s0" 4 +.IX Item "DEB_HOST_ARCH_OS" +The Debian system name of the host machine. +.IP "\s-1DEB_HOST_ARCH_CPU\s0" 4 +.IX Item "DEB_HOST_ARCH_CPU" +The Debian cpu name of the host machine. .IP "\s-1DEB_HOST_GNU_TYPE\s0" 4 .IX Item "DEB_HOST_GNU_TYPE" The \s-1GNU\s0 system type of the host machine. @@ -145,7 +158,7 @@ debian/rules files. The following does the job: ifeq ($(filter\-out hurd\-%,$(\s-1DEB_BUILD_ARCH\s0)),) \s-1DEB_BUILD_GNU_SYSTEM\s0 := gnu else - \s-1DEB_BUILD_GNU_SYSTEM\s0 := linux + \s-1DEB_BUILD_GNU_SYSTEM\s0 := linux-gnu endif DEB_BUILD_GNU_TYPE=$(\s-1DEB_BUILD_GNU_CPU\s0)\-$(\s-1DEB_BUILD_GNU_SYSTEM\s0) .PP diff --git a/man/C/dpkg-divert.8 b/man/C/dpkg-divert.8 index 528e9fc4..b09b397d 100644 --- a/man/C/dpkg-divert.8 +++ b/man/C/dpkg-divert.8 @@ -74,6 +74,25 @@ a symbolic link based on the DT_SONAME field embedded in the library. Because ldconfig doesn't honour diverts (only dpkg does), if a diverted library has the same SONAME as the undiverted one the symlink may end up pointing at the diverted library. +.SH EXAMPLES +To divert all copies of a \fI/usr/bin/example.foo\fR to \fI/usr/bin/example\fR, +performing the rename if required: +.HP +dpkg-divert --divert /usr/bin/example --rename /usr/bin/example.foo +.PP +To remove that diversion: +.HP +dpkg-divert --rename --remove /usr/bin/example.foo + +.PP +To divert any package trying to install \fI/usr/bin/example\fR to +\fI/usr/bin/example.foo\fR, except your own \fIwibble\fR package: +.HP +dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/example +.PP +To remove that diversion: +.HP +dpkg-divert --package wibble --rename --remove /usr/bin/example .SH FILES .TP .I /var/lib/dpkg/diversions diff --git a/man/C/dpkg.1 b/man/C/dpkg.1 index 685b0190..34591a05 100644 --- a/man/C/dpkg.1 +++ b/man/C/dpkg.1 @@ -473,6 +473,14 @@ multiple times. Status updates are of the form `status: : '. Errors are reported as `status: : error: extend-error-message'. Configuration file conflicts are reported as `status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited' +.TP +\fB\-\-log=\fP\fIfilename\fP +Log status change updates and actions to \fIfilename\fP. This can be given +multiple times. Log messages are of the form `YYYY-MM-DD HH:MM:SS status + ' for status change updates and +`YYYY-MM-DD HH:MM:SS +' for actions where \fI\fP is one of install, +upgrade, remove, purge. .SH FILES .TP .I /etc/dpkg/dpkg.cfg diff --git a/man/C/md5sum.1 b/man/C/md5sum.1 deleted file mode 100644 index 2919f6b0..00000000 --- a/man/C/md5sum.1 +++ /dev/null @@ -1,75 +0,0 @@ -.\" Hey, Emacs! This is an -*- nroff -*- source file. -.TH MD5SUM 1 "29th November 1995" "Lankester et al." "Debian GNU/Linux" -.SH NAME -md5sum \- generates or checks MD5 message digests - -.SH SYNOPSIS -.B md5sum -[\-bv] [\-c [file]] | [file...] - -.SH DESCRIPTION -.B md5sum -generates or checks MD5 checksums. The algorithm to generate the -checksum is reasonably fast and strong enough for most cases. Exact -specification of the algorithm is in -.I RFC 1321. - -Normally -.B md5sum -generates checksums of all files given to it as a parameter and prints -the checksums followed by the filenames. If, however, -.B \-c -is specified, only one filename parameter is allowed. This file should -contain checksums and filenames to which these checksums refer to, and -the files listed in that file are checked against the checksums listed -there. See option -.B \-c -for more information. - -.SS OPTIONS -.TP -.B \-b -Use binary mode. In unix environment, only difference between this and -the normal mode is an asterisk preceding the filename in the output. -.TP -.B \-c -Check md5sum of all files listed in -.I file -against the checksum listed in the same file. The actual format of that -file is the same as output of -.B md5sum. -That is, each line in the file describes a file. A line looks like: - -.B - -So, for example, if a file was created and its message digest calculated -like so: - -.B echo foo > md5\-test\-file; md5sum md5\-test\-file - -.B md5sum -would report: - -.B d3b07384d113edec49eaa6238ad5ff00\ md5\-test\-file - -.TP -.B \-v -Be more verbose. Print filenames when checking (with \-c). - -.SH BUGS -The related MD4 message digest algorithm was broken in October 1995. -MD5 isn't looking as secure as it used to. - -This manpage is not quite accurate and has formatting inconsistent -with other manpages. - -.B md5sum -does not accept standard options like -.BR \-\-help . - -.SH AUTHOR - -.B md5sum -was originally written by Branko Lankester, and modified afterwards by -Colin Plumb and Ian Jackson (ijackson@gnu.ai.mit.edu). Manual page was -added by Juho Vuori (javuori@cc.helsinki.fi) diff --git a/man/de/Makefile.am b/man/de/Makefile.am index 62f15d0e..347c3c03 100644 --- a/man/de/Makefile.am +++ b/man/de/Makefile.am @@ -3,6 +3,5 @@ mandir = @mandir@/de dist_man_MANS = \ - md5sum.1 \ start-stop-daemon.8 \ update-alternatives.8 diff --git a/man/de/Makefile.in b/man/de/Makefile.in index 36c02b16..e5dcc1e9 100644 --- a/man/de/Makefile.in +++ b/man/de/Makefile.in @@ -65,9 +65,8 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -man1dir = $(mandir)/man1 -am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" man8dir = $(mandir)/man8 +am__installdirs = "$(DESTDIR)$(man8dir)" NROFF = nroff MANS = $(dist_man_MANS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -200,7 +199,6 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ dist_man_MANS = \ - md5sum.1 \ start-stop-daemon.8 \ update-alternatives.8 @@ -237,51 +235,6 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-man1: $(man1_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ - done -uninstall-man1: - @$(NORMAL_UNINSTALL) - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ - rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ - done install-man8: $(man8_MANS) $(man_MANS) @$(NORMAL_INSTALL) test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" @@ -365,7 +318,7 @@ check-am: all-am check: check-am all-am: Makefile $(MANS) installdirs: - for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \ + for dir in "$(DESTDIR)$(man8dir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -416,7 +369,7 @@ install-exec-am: install-info: install-info-am -install-man: install-man1 install-man8 +install-man: install-man8 installcheck-am: @@ -438,17 +391,16 @@ ps-am: uninstall-am: uninstall-info-am uninstall-man -uninstall-man: uninstall-man1 uninstall-man8 +uninstall-man: uninstall-man8 .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ - install-man1 install-man8 install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-man uninstall-man1 uninstall-man8 + install-man8 install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ + uninstall-am uninstall-info-am uninstall-man uninstall-man8 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/man/de/md5sum.1 b/man/de/md5sum.1 deleted file mode 100644 index a3057bed..00000000 --- a/man/de/md5sum.1 +++ /dev/null @@ -1,74 +0,0 @@ -.\" Hey, Emacs! This is an -*- nroff -*- source file. -.hw ge-knackt -.TH MD5SUM 1 "29. November 1995" "Lankester et al." "Debian GNU/Linux" -.SH NAME -md5sum \- generiert oder überprüft MD5-Prüfsummen - -.SH "ÜBERSICHT" -.B md5sum -[-bv] [-c [datei]] | [datei...] - -.SH BESCHREIBUNG -.B md5sum -generiert oder überprüft MD5-Prüfsummen. Der Algorithmus zur Generierung -der Prüfsummen ist ausreichend schnell und sicher genug für die meisten -Fälle. Die genaue Spezifikation der Algorithmus findet sich in -.I RFC 1321. - -Normalerweise generiert -.B md5sum -Prüfsummen aller als Parameter übergebenen Dateien und gibt die Prüfsummen -gefolgt von den entsprechenden Dateinamen aus. Wenn allerdings -.B -c -angegeben wird, ist nur ein Dateiname erlaubt. Diese Datei sollte Prüfsummen -und zu ihnen gehörende Dateinamen enthalten; die aufgeführten Dateien werden -dann mit den angegebenen Prüfsummen gegengeprüft. Siehe Option -.B -c -für mehr Information. - -.SH OPTIONEN -.TP -.B -b -Binärmodus benutzen. In einer UNIX-Umgebung ist der einzige Unterschied zwischen -diesem und dem Normalmodus ein Sternchen, das dem Dateinamen in der Ausgabe -vorangeht. -.TP -.B -c -Die Prüfsummen aller Dateien, die in -.I datei -aufgeführt sind, nachprüfen. Das Format dieser Datei ist das gleiche wie die -Ausgabe von -.B md5sum. -Es beschreibt also jede Zeile eine Datei. Eine Zeile sieht so aus: - -.B - -Wenn also beispielsweise eine Datei erstellt und ihre Prüfsumme berechnet wird, -etwa so: - -.B echo foo > md5-test-file; md5sum md5-test-file - -dann würde -.B md5sum -Folgendes melden: - -.B d3b07384d113edec49eaa6238ad5ff00\ md5-test-file - -.TP -.B -v -Wortreicher sein. Gibt Dateinamen während der Überprüfung (mit \fB-c\fR) aus. - -.SH BUGS -Der verwandte MD4-Prüfsummen-Algorithmus wurde im Oktober 1995 geknackt. MD5 -sieht nicht mehr so sicher aus wie früher. - -.B md5sum -akzeptiert keine Standardoptionen wie -.BR --help . - -.SH AUTOR - -.B md5sum -wurde ursprünglich von Branko Lankester geschrieben und hiernach von -Colin Plumb und Ian Jackson (ijackson@gnu.ai.mit.edu) geändert. Die Man-Seite -wurde von Juho Vuori (javuori@cc.helsinki.fi) hinzugefügt. diff --git a/man/es/Makefile.am b/man/es/Makefile.am index 2570d5a1..5ce7bde1 100644 --- a/man/es/Makefile.am +++ b/man/es/Makefile.am @@ -19,6 +19,5 @@ dist_man_MANS = \ dpkg-statoverride.8 \ dpkg.1 \ dselect.1 \ - md5sum.1 \ start-stop-daemon.8 \ update-alternatives.8 diff --git a/man/es/Makefile.in b/man/es/Makefile.in index 057e1ee8..2d578fea 100644 --- a/man/es/Makefile.in +++ b/man/es/Makefile.in @@ -217,7 +217,6 @@ dist_man_MANS = \ dpkg-statoverride.8 \ dpkg.1 \ dselect.1 \ - md5sum.1 \ start-stop-daemon.8 \ update-alternatives.8 diff --git a/man/es/md5sum.1 b/man/es/md5sum.1 deleted file mode 100644 index ae82353a..00000000 --- a/man/es/md5sum.1 +++ /dev/null @@ -1,78 +0,0 @@ -.\" Hey, Emacs! This is an -*- nroff -*- source file. -.TH MD5SUM 1 "29 de Noviembre de 1995" "Lankester et al." "Debian GNU/Linux" -.SH NOMBRE -md5sum \- genera o comprueba las sumas de control MD5 - -.SH SINOPSIS -.B md5sum -[\-bv] [\-c [nombre_archivo]] | [nombre_archivo...] - -.SH DESCRIPCIÓN -.B md5sum -genera o comprueba las sumas de control MD5. El algoritmo que genera las -sumas de control es razonablemente rápido y robusto para la mayoría de -los casos. Las especificaciones exactas del algoritmo están en -.I RFC 1321. - -Normalmente -.B md5sum -genera las sumas de control de todos los archivos que se le pasan como -argumentos e imprime las sumas de control seguidas de los nombres de -los archivos. Sin embargo si se especifica el parámetro -.B \-c -, solo un nombre de archivo es permitido como parámetro. -Este fichero debe de contener las sumas de control y los nombres de archivo -a las que estas se refieren, entonces los ficheros listados en el archivo -son comprobados con las sumas de control especificadas. Ver opción -.B \-c -para mas información. - -.SS OPCIONES -.TP -.B \-b -Usar modo binario. En Unix, la única diferencia entre este modo y el normal -es un asterisco que precede al nombre del fichero en la salida de la -ejecución del comando. -.TP -.B \-c -Comprueba la suma de control md5 de todos los archivos listados en el -.I archivo -con la suma de control que aparece listada en el mismo fichero. El -formato actual de este archivo es el mismo que la salida de -.B md5sum. -Esto es, cada linea en el archivo describe un fichero, y tiene -dos campos, que son: - -.B - -Entonces, por ejemplo, si se crea un fichero y se calcula su suma de control como sigue: - -.B echo foo > md5\-fichero\-prueba; md5sum md5\-fichero\-prueba - -.B md5sum -devolverá: - -.B d3b07384d113edec49eaa6238ad5ff00\ md5\-fichero\-prueba - -.TP -.B \-v -Ser mas explicativo. Imprimir nombres de archivo (con \-c). - -.SH FALLOS -El relacionado algoritmo MD4 fue crackeado en octubre de 1995. -MD5 no parece tan seguro como antes. - -Esta pagina del manual no es muy precisa y tiene un formato inconsistente -con otras paginas del manual. - -.B md5sum -no acepta opciones estándar como -.BR \-\-help . - -.SH AUTOR - -.B md5sum -fue originalmente escrito por Branko Lankester, y modificado después por -Colin Plumb y Ian Jackson (ijackson@gnu.ai.mit.edu). La pagina del manual -fue agregada por Juho Vuori (javuori@cc.helsinki.fi) y traducida por Rubén -Porras (nahoo@inicia.es) diff --git a/man/ja/Makefile.am b/man/ja/Makefile.am index 25867bff..c52e6aab 100644 --- a/man/ja/Makefile.am +++ b/man/ja/Makefile.am @@ -21,6 +21,5 @@ dist_man_MANS = \ dpkg.1 \ dselect.1 \ install-info.8 \ - md5sum.1 \ start-stop-daemon.8 \ update-alternatives.8 diff --git a/man/ja/Makefile.in b/man/ja/Makefile.in index fab92b84..2dd72510 100644 --- a/man/ja/Makefile.in +++ b/man/ja/Makefile.in @@ -219,7 +219,6 @@ dist_man_MANS = \ dpkg.1 \ dselect.1 \ install-info.8 \ - md5sum.1 \ start-stop-daemon.8 \ update-alternatives.8 diff --git a/man/ja/md5sum.1 b/man/ja/md5sum.1 deleted file mode 100644 index f8b5b03c..00000000 --- a/man/ja/md5sum.1 +++ /dev/null @@ -1,86 +0,0 @@ -.\" Hey, Emacs! This is an -*- nroff -*- source file. -.\"WORD: message digest ¥á¥Ã¥»¡¼¥¸¥À¥¤¥¸¥§¥¹¥È -.\"WORD: checksum ¥Á¥§¥Ã¥¯¥µ¥à -.\"WORD: check ¾È¹ç -.\"original revision: 1.2 -.TH MD5SUM 1 "29th November 1995" "Lankester et al." "Debian GNU/Linux" -.SH ̾Á° -md5sum \- MD5 ¥á¥Ã¥»¡¼¥¸¥À¥¤¥¸¥§¥¹¥È¤òºîÀ®¡¦¾È¹ç¤¹¤ë¡£ - -.SH ½ñ¼° -.B md5sum -[-bv] [-c [file]] | [file...] - -.SH ÀâÌÀ -.B md5sum -¤Ï¡¢MD5 ¥Á¥§¥Ã¥¯¥µ¥à¤òºîÀ®¡¢¤â¤·¤¯¤Ï MD5 ¥Á¥§¥Ã¥¯¥µ¥à¤Î¾È¹ç¤ò¹Ô¤¦¡£ -¥Á¥§¥Ã¥¯¥µ¥à¤òÀ¸À®¤¹¤ë¥¢¥ë¥´¥ê¥º¥à¤ÏÈæ³ÓŪ¹â®¤Ç¤¢¤ê¡¢¤Û¤È¤ó¤É¤Î -¾ì¹ç¤Ç½½Ê¬·øÏ´¤Ç¤¢¤ë¡£¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤Î¸·Ì©¤Ê»ÅÍͤˤĤ¤¤Æ¤Ï -.I RFC 1321 -¤ò»²¾È¤µ¤ì¤¿¤¤¡£ - -Ä̾ï -.B md5sum -¤Ï¡¢°ú¿ô¤ËÍ¿¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤Î¥Á¥§¥Ã¥¯¥µ¥à¤òºîÀ®¤·¡¢ -¥Á¥§¥Ã¥¯¥µ¥à¤È¤½¤Î¥Õ¥¡¥¤¥ë̾¤ò°ì¹Ô¤º¤Ä½ÐÎϤ¹¤ë¡£¤·¤«¤·¡¢ -.B -c -¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢°ú¿ô¤Ë¤Ï¥Õ¥¡¥¤¥ë̾¤¬¤Ò¤È¤Ä¤À¤±µö¤µ¤ì¤ë¡£ -°ú¿ô¤ËÍ¿¤¨¤é¤ì¤¿¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Á¥§¥Ã¥¯¥µ¥à¤È¤½¤Î¥Õ¥¡¥¤¥ë̾¤¬µ­½Ò¤µ -¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£µ­½Ò¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ËÂФ¹¤ë¼ÂºÝ¤Î¥Á¥§¥Ã¥¯¥µ -¥à¤¬¡¢µ­½Ò¤µ¤ì¤¿¥Á¥§¥Ã¥¯¥µ¥à¤È¾È¹ç¤µ¤ì¤ë¡£¾ÜºÙ¤Ï¥ª¥×¥·¥ç¥ó -.B -c -¤Î¹àÌܤò»²¾È¤µ¤ì¤¿¤¤¡£ - -.SS ¥ª¥×¥·¥ç¥ó -.TP -.B -b -¥Ð¥¤¥Ê¥ê¥â¡¼¥É¤ò»ÈÍѤ¹¤ë¡£UNIX ´Ä¶­¤Ç¤Ï¡¢¥Ð¥¤¥Ê¥ê¥â¡¼¥É¤È¥Î¡¼¥Þ¥ë¥â¡¼ -¥É¤Î°ã¤¤¤Ï¡¢½ÐÎϤµ¤ì¤ë¥Õ¥¡¥¤¥ë̾¤ÎÁ°¤Ë¥¢¥¹¥¿¥ê¥¹¥¯¤¬ÉÕ¤¯¤Î¤ß¤Ç¤¢¤ë¡£ -.TP -.B -c -.I file -Ãæ¤Ëµ­½Ò¤µ¤ì¤¿Á´¤Æ¤Î¥Õ¥¡¥¤¥ë¤Î md5sum ¤ò¼ÂºÝ¤Î¥Á¥§¥Ã¥¯¥µ¥à¤È -¾È¹ç¤¹¤ë¡£°ú¿ô¤ËÍ¿¤¨¤ë¥Õ¥¡¥¤¥ë¤Î·Á¼°¤Ï -.B md5sum -¤Î½ÐÎϤÈƱ¤¸¤Ç¤¢¤ë¡£¤Ä¤Þ¤ê¡¢¥Õ¥¡¥¤¥ëÃæ¤Î³Æ¹Ô¤Ë¤Ä¤­¤Ò¤È¤Ä¤Î¥Õ¥¡¥¤¥ë -¤¬µ­½Ò¤µ¤ì¤ë¡£¤½¤Î·Á¼°¤Ï¡¢ - -.B - -¤Ç¤¢¤ë¡£Î㤨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Æ¡¢¤½¤Î¥á¥Ã¥»¡¼¥¸¥À¥¤¥¸¥§¥¹¥È -¤ò·×»»¤¹¤ë¡£ - -.B echo foo > md5-test-file; md5sum md5-test-file - -¤³¤Î¾ì¹ç¡¢ -.B md5sum -¤Ï¼¡¤Î¤è¤¦¤ÊÊó¹ð¤ò¤¹¤ë¡£ - -.B d3b07384d113edec49eaa6238ad5ff00\ md5-test-file - -.TP -.B -v -¾ÜºÙɽ¼¨¡£(-c ¥ª¥×¥·¥ç¥ó¤Ç)¾È¹ç¤¹¤ë¾ì¹ç¤Ï¥Õ¥¡¥¤¥ë̾¤ò½ÐÎϤ¹¤ë¡£ - -.SH ¥Ð¥° -MD4 ¥á¥Ã¥»¡¼¥¸¥À¥¤¥¸¥§¥¹¥È¥¢¥ë¥´¥ê¥º¥à¤¬ 1995 ǯ 10 ·î¤ËÇˤé¤ì¤¿¡£ -Ʊ·Ï¤Ç¤¢¤ë MD5 ¤â°ÊÁ°¤Û¤É°ÂÁ´¤È¤Ï¸À¤¨¤Ê¤¤¤Ç¤¢¤í¤¦¡£ - -¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ÏÉÔÀµ³Î¤Ç¤¢¤ê¡¢Â¾¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ÈÀ°¹çÀ­ -¤Î¤¢¤ë½ñ¼°¤Ç¤Ê¤¤¡£ - -.B md5sum -¤Ï -.BR --help -¤Î¤è¤¦¤Êɸ½àŪ¤Ê¥ª¥×¥·¥ç¥ó¤¬»È¤¨¤Ê¤¤¡£ - -.SH Ãø¼Ô - -.B md5sum -¤Ï¡¢¸µ¡¹ by Branko Lankester ¤Ë¤è¤ê½ñ¤«¤ì¡¢¤½¤Î¸å Colin Plumb ¤È - Ian Jackson (ijackson@gnu.ai.mit.edu) ¤Ë¤è¤ê½ñ¤­ÊѤ¨¤é¤ì¤¿¡£ -¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï Juho Vuori (javuori@cc.helsinki.fi) ¤Ë¤è¤êÄɲ䵤줿¡£ - -.SH ËÝÌõ¼Ô - -Æéë ±ÉŸ diff --git a/man/sv/Makefile.am b/man/sv/Makefile.am index 4b849044..2e7f2c21 100644 --- a/man/sv/Makefile.am +++ b/man/sv/Makefile.am @@ -14,5 +14,4 @@ dist_man_MANS = \ dpkg.cfg.5 \ dselect.1 \ dselect.cfg.5 \ - md5sum.1 \ start-stop-daemon.8 diff --git a/man/sv/Makefile.in b/man/sv/Makefile.in index 4b7a0f02..70997ec1 100644 --- a/man/sv/Makefile.in +++ b/man/sv/Makefile.in @@ -212,7 +212,6 @@ dist_man_MANS = \ dpkg.cfg.5 \ dselect.1 \ dselect.cfg.5 \ - md5sum.1 \ start-stop-daemon.8 all: all-am diff --git a/man/sv/md5sum.1 b/man/sv/md5sum.1 deleted file mode 100644 index 84e7bb63..00000000 --- a/man/sv/md5sum.1 +++ /dev/null @@ -1,83 +0,0 @@ -.\" Hey, Emacs! This is an -*- nroff -*- source file. -.\" Translation of CVS revision 1.2.18.3 -.TH MD5SUM 1 "29 november 1995" "Lankester m fl" "Debian GNU/Linux" -.SH NAMN -md5sum \- genererar eller kontrollerar MD5-meddelandesamlingar - -.SH SYNOPS -.B md5sum -[\-bv] [\-c [fil]] | [fil...] - -.SH BESKRIVNING -.B md5sum -genererar eller kontrollerar MD5-kontrollsummor. -Algoritmen som genererar kontrollsumman är hyfsat snabb och tillräckligt -stark för de flesta fallen. -En exakt specifikation av algoritmen finns i -.I RFC 1321. - -Normalt genererar -.B md5sum -kontrollsummor för samtliga filer som anges som flaggor och skriver -kontrollsummorna följt av filnamnen. -Om däremot flaggan -.B \-c -anges tillåts endast en filnamnsparameter. -Denna fil innehåller kontrollsummor och tillhörande filnamn, och filerna som -listas i den filen kommer att kontrolleras gentemot kontrollsumman som står -där. -Se flaggan -.B \-c -för ytterligare information. - -.SS FLAGGOR -.TP -.B \-b -Använd binärt läge. -I en unixmiljö är den enda skillnaden mellan detta och det normala läget en -asterisk framför filnamnet i utdata. -.TP -.B \-c -Kontrollera md5-summan för samtliga filer som listas i -.I fil -mot kontrollsummorna som står i filen. -Formatet som används för denna fil är detsamma som utdata för -.B md5sum. -Det betyder att varje rad i filen beskriver en fil, på formen: - -.B - -Så, till exempel, om en fil skapats och dess meddelandesamlingar (message -digest) beräknats enligt - -.B echo foo > md5\-testfil; md5sum md5\-testfil - -kommer -.B md5sum -rapportera: - -.B d3b07384d113edec49eaa6238ad5ff00\ md5\-testfil - -.TP -.B -v -Var mer pratsam. -Skriv ut filnamn när de kontrolleras (med \-c). - -.SH PROGRAMFEL -Den relaterade meddelandesamlingsalgoritmen MD4 knäcktes i oktober 1995. -MD5 verkar inte vara lika säker som den en gång var. - -Denna manualsida är inte helt korrekt och har formatering som inte är -konsistent med andra manualsidor. - -.B md5sum -tillåter inte standardflaggor såsom -.BR \-\-help . - -.SH FÖRFATTARE - -.B md5sum -skrevs ursprungligen av Branko Lankester och modifierades sedan av -Colin Plumb och Ian Jackson (ijackson@gnu.ai.mit.edu). -Manualsidan lades till av Juho Vuori (javuori@cc.helsinki.fi) -och översattes av Peter Karlsson. diff --git a/ostable b/ostable new file mode 100644 index 00000000..837d9418 --- /dev/null +++ b/ostable @@ -0,0 +1,23 @@ +# This file contains the table of known operating system names. +# +# Architecture names are formed as a combination of the system name +# (from this table) and CPU name (from cputable). A list of architecture +# names in the Debian ‘sid’ distribution can be found in the archtable +# file. +# +# Column 1 is the Debian name for the system, used to form the +# architecture name. +# Column 2 is the GNU name for the system, used to output build and host +# targets in ‘dpkg-architecture’. +# Column 3 is an extended regular expression used to match against the +# system part of the output of the GNU config.guess script. +# +# +linux linux-gnu linux[^-]*(-gnu.*)? +darwin darwin darwin[^-]* +freebsd freebsd freebsd[^-]* +hurd gnu gnu[^-]* +kfreebsd kfreebsd-gnu kfreebsd[^-]*(-gnu.*)? +knetbsd knetbsd-gnu knetbsd[^-]*(-gnu.*)? +netbsd netbsd netbsd[^-]* +openbsd openbsd openbsd[^-]* diff --git a/po/ChangeLog b/po/ChangeLog index 3af4c56e..79c43f61 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2005-03-18 Scott James Remnant + + * POTFILES.in: Removed utils/md5sum.c now it no longer exists. + 2005-03-03 Arief S Fitrianto * id.po: First version. diff --git a/po/POTFILES.in b/po/POTFILES.in index 3f3070dc..b6f80893 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -70,5 +70,4 @@ dpkg-split/queue.c dpkg-split/split.c utils/enoent.c -utils/md5sum.c utils/start-stop-daemon.c diff --git a/po/bs.gmo b/po/bs.gmo index d2d23b38..6ee232a3 100644 Binary files a/po/bs.gmo and b/po/bs.gmo differ diff --git a/po/bs.po b/po/bs.po index 1e895304..961c4619 100644 --- a/po/bs.po +++ b/po/bs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2005-03-03 12:14+0000\n" +"POT-Creation-Date: 2005-03-18 16:22+0000\n" "PO-Revision-Date: 2004-11-27 01:29+0100\n" "Last-Translator: Safir Å ećerović \n" "Language-Team: Bosnian \n" @@ -141,92 +141,92 @@ msgstr "" msgid "failed write during hashreport" msgstr "" -#: lib/dbmodify.c:58 +#: lib/dbmodify.c:59 #, c-format msgid "" "updates directory contains file `%.250s' whose name is too long (length=%d, " "max=%d)" msgstr "" -#: lib/dbmodify.c:62 +#: lib/dbmodify.c:63 #, c-format msgid "" "updates directory contains files with different length names (both %d and %d)" msgstr "" -#: lib/dbmodify.c:76 +#: lib/dbmodify.c:77 #, c-format msgid "cannot scan updates directory `%.255s'" msgstr "" -#: lib/dbmodify.c:92 +#: lib/dbmodify.c:93 #, c-format msgid "failed to remove incorporated update file %.255s" msgstr "" -#: lib/dbmodify.c:109 +#: lib/dbmodify.c:110 #, c-format msgid "unable to create %.250s" msgstr "" -#: lib/dbmodify.c:113 +#: lib/dbmodify.c:114 #, c-format msgid "unable to fill %.250s with padding" msgstr "" -#: lib/dbmodify.c:115 +#: lib/dbmodify.c:116 #, c-format msgid "unable flush %.250s after padding" msgstr "" -#: lib/dbmodify.c:117 +#: lib/dbmodify.c:118 #, c-format msgid "unable seek to start of %.250s after padding" msgstr "" -#: lib/dbmodify.c:147 +#: lib/dbmodify.c:148 msgid "requested operation requires superuser privilege" msgstr "" -#: lib/dbmodify.c:152 +#: lib/dbmodify.c:153 msgid "unable to access dpkg status area" msgstr "" -#: lib/dbmodify.c:154 +#: lib/dbmodify.c:155 msgid "operation requires read/write access to dpkg status area" msgstr "" -#: lib/dbmodify.c:202 +#: lib/dbmodify.c:203 #, c-format msgid "failed to remove my own update file %.255s" msgstr "" -#: lib/dbmodify.c:256 +#: lib/dbmodify.c:278 #, c-format msgid "unable to write updated status of `%.250s'" msgstr "" -#: lib/dbmodify.c:258 +#: lib/dbmodify.c:280 #, c-format msgid "unable to flush updated status of `%.250s'" msgstr "" -#: lib/dbmodify.c:260 +#: lib/dbmodify.c:282 #, c-format msgid "unable to truncate for updated status of `%.250s'" msgstr "" -#: lib/dbmodify.c:262 +#: lib/dbmodify.c:284 #, c-format msgid "unable to fsync updated status of `%.250s'" msgstr "" -#: lib/dbmodify.c:264 +#: lib/dbmodify.c:286 #, c-format msgid "unable to close updated status of `%.250s'" msgstr "" -#: lib/dbmodify.c:267 +#: lib/dbmodify.c:289 #, c-format msgid "unable to install updated status of `%.250s'" msgstr "" @@ -866,275 +866,285 @@ msgstr "" msgid "error setting timestamps of `%.255s'" msgstr "" -#: src/archives.c:266 src/archives.c:513 +#: src/archives.c:266 src/archives.c:542 #, c-format msgid "error setting ownership of `%.255s'" msgstr "" -#: src/archives.c:268 src/archives.c:516 +#: src/archives.c:268 src/archives.c:545 #, c-format msgid "error setting permissions of `%.255s'" msgstr "" -#: src/archives.c:351 +#: src/archives.c:352 #, c-format msgid "" "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s" "%.100s%.10s" msgstr "" -#: src/archives.c:355 +#: src/archives.c:356 msgid " (package: " msgstr "" -#: src/archives.c:377 +#: src/archives.c:378 #, c-format msgid "unable to stat `%.255s' (which I was about to install)" msgstr "" -#: src/archives.c:385 +#: src/archives.c:386 #, c-format msgid "" "unable to clean up mess surrounding `%.255s' before installing another " "version" msgstr "" -#: src/archives.c:391 +#: src/archives.c:392 #, c-format msgid "unable to stat restored `%.255s' before installing another version" msgstr "" -#: src/archives.c:423 +#: src/archives.c:424 #, c-format msgid "archive contained object `%.255s' of unknown type 0x%x" msgstr "" -#: src/archives.c:454 +#: src/archives.c:461 #, c-format msgid "Replacing files in old package %s ...\n" msgstr "" -#: src/archives.c:458 +#: src/archives.c:464 +#, fuzzy, c-format +msgid "Replaced by files in installed package %s ...\n" +msgstr "Ažurirani instalirani paketi" + +#: src/archives.c:470 #, c-format msgid "" "trying to overwrite directory `%.250s' in package %.250s with nondirectory" msgstr "" -#: src/archives.c:468 +#: src/archives.c:480 #, c-format msgid "trying to overwrite `%.250s', which is also in package %.250s" msgstr "" +#: src/archives.c:505 +#, c-format +msgid "gobble replaced file `%.255s'" +msgstr "" + # Now that we have verified everything its time to actually # * build something. Lets start by making the ar-wrapper. -#: src/archives.c:496 dpkg-deb/build.c:314 +#: src/archives.c:525 dpkg-deb/build.c:314 #, c-format msgid "unable to create `%.255s'" msgstr "" -#: src/archives.c:501 +#: src/archives.c:530 #, c-format msgid "backend dpkg-deb during `%.255s'" msgstr "" -#: src/archives.c:519 +#: src/archives.c:548 #, c-format msgid "error closing/writing `%.255s'" msgstr "" -#: src/archives.c:524 +#: src/archives.c:553 #, c-format msgid "error creating pipe `%.255s'" msgstr "" -#: src/archives.c:530 src/archives.c:536 +#: src/archives.c:559 src/archives.c:565 #, c-format msgid "error creating device `%.255s'" msgstr "" -#: src/archives.c:545 +#: src/archives.c:574 #, c-format msgid "error creating hard link `%.255s'" msgstr "" -#: src/archives.c:552 +#: src/archives.c:581 #, c-format msgid "error creating symbolic link `%.255s'" msgstr "" -#: src/archives.c:561 +#: src/archives.c:590 #, c-format msgid "error setting ownership of symlink `%.255s'" msgstr "" -#: src/archives.c:566 +#: src/archives.c:595 #, c-format msgid "error creating directory `%.255s'" msgstr "" -#: src/archives.c:601 +#: src/archives.c:630 #, c-format msgid "unable to move aside `%.255s' to install new version" msgstr "" -#: src/archives.c:610 +#: src/archives.c:639 #, c-format msgid "unable to read link `%.255s'" msgstr "" -#: src/archives.c:614 +#: src/archives.c:643 #, c-format msgid "unable to make backup symlink for `%.255s'" msgstr "" -#: src/archives.c:620 +#: src/archives.c:649 #, c-format msgid "unable to chown backup symlink for `%.255s'" msgstr "" -#: src/archives.c:624 +#: src/archives.c:653 #, c-format msgid "unable to make backup link of `%.255s' before installing new version" msgstr "" -#: src/archives.c:630 +#: src/archives.c:659 #, c-format msgid "unable to install new version of `%.255s'" msgstr "" -#: src/archives.c:644 +#: src/archives.c:673 #, c-format msgid "" "dpkg: warning - ignoring dependency problem with removal of %s:\n" "%s" msgstr "" -#: src/archives.c:651 +#: src/archives.c:680 #, c-format msgid "" "dpkg: warning - considering deconfiguration of essential\n" " package %s, to enable removal of %s.\n" msgstr "" -#: src/archives.c:655 +#: src/archives.c:684 #, c-format msgid "" "dpkg: no, %s is essential, will not deconfigure\n" " it in order to enable removal of %s.\n" msgstr "" -#: src/archives.c:668 +#: src/archives.c:697 #, c-format msgid "" "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n" "%s" msgstr "" -#: src/archives.c:702 +#: src/archives.c:731 #, c-format msgid "dpkg: considering removing %s in favour of %s ...\n" msgstr "" -#: src/archives.c:706 +#: src/archives.c:735 #, c-format msgid "%s is not properly installed - ignoring any dependencies on it.\n" msgstr "" -#: src/archives.c:733 +#: src/archives.c:762 #, c-format msgid "dpkg: may have trouble removing %s, as it provides %s ...\n" msgstr "" -#: src/archives.c:748 +#: src/archives.c:777 #, c-format msgid "" "dpkg: package %s requires reinstallation, but will remove anyway as you " "request.\n" msgstr "" -#: src/archives.c:751 +#: src/archives.c:780 #, c-format msgid "dpkg: package %s requires reinstallation, will not remove.\n" msgstr "" -#: src/archives.c:764 +#: src/archives.c:793 #, c-format msgid "dpkg: yes, will remove %s in favour of %s.\n" msgstr "" -#: src/archives.c:772 +#: src/archives.c:801 #, c-format msgid "" "dpkg: regarding %s containing %s:\n" "%s" msgstr "" -#: src/archives.c:775 +#: src/archives.c:804 #, c-format msgid "conflicting packages - not installing %.250s" msgstr "" -#: src/archives.c:776 +#: src/archives.c:805 #, c-format msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n" msgstr "" -#: src/archives.c:814 +#: src/archives.c:843 #, c-format msgid "--%s --recursive needs at least one path argument" msgstr "" -#: src/archives.c:844 +#: src/archives.c:873 msgid "failed to exec find for --recursive" msgstr "" -#: src/archives.c:849 +#: src/archives.c:878 msgid "failed to fdopen find's pipe" msgstr "" -#: src/archives.c:855 +#: src/archives.c:884 msgid "error reading find's pipe" msgstr "" -#: src/archives.c:856 +#: src/archives.c:885 msgid "error closing find's pipe" msgstr "" -#: src/archives.c:859 +#: src/archives.c:888 #, c-format msgid "find for --recursive returned unhandled error %i" msgstr "" -#: src/archives.c:862 +#: src/archives.c:891 msgid "searched, but found no packages (files matching *.deb)" msgstr "" -#: src/archives.c:878 +#: src/archives.c:907 #, c-format msgid "--%s needs at least one package archive file argument" msgstr "" -#: src/archives.c:948 +#: src/archives.c:977 #, c-format msgid "Selecting previously deselected package %s.\n" msgstr "" -#: src/archives.c:953 +#: src/archives.c:982 #, c-format msgid "Skipping deselected package %s.\n" msgstr "" -#: src/archives.c:967 +#: src/archives.c:996 #, c-format msgid "Version %.250s of %.250s already installed, skipping.\n" msgstr "" -#: src/archives.c:979 +#: src/archives.c:1008 #, c-format msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n" msgstr "" -#: src/archives.c:985 +#: src/archives.c:1014 #, c-format msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n" msgstr "" @@ -1555,7 +1565,7 @@ msgstr "" msgid " %.250s provides %.250s and is %s.\n" msgstr "" -#: src/enquiry.c:56 src/query.c:96 +#: src/enquiry.c:56 src/query.c:96 src/query.c:139 msgid "(no description available)" msgstr "" @@ -1851,149 +1861,149 @@ msgstr "" msgid "read error in diversions [i]" msgstr "" -#: src/help.c:40 dselect/pkgdisplay.cc:52 +#: src/help.c:41 dselect/pkgdisplay.cc:52 msgid "not installed" msgstr "" -#: src/help.c:41 +#: src/help.c:42 msgid "unpacked but not configured" msgstr "" -#: src/help.c:42 +#: src/help.c:43 msgid "broken due to postinst failure" msgstr "" -#: src/help.c:43 dselect/pkgdisplay.cc:55 +#: src/help.c:44 dselect/pkgdisplay.cc:55 msgid "installed" msgstr "" -#: src/help.c:44 +#: src/help.c:45 msgid "broken due to failed removal" msgstr "" -#: src/help.c:45 +#: src/help.c:46 msgid "not installed but configs remain" msgstr "" -#: src/help.c:86 +#: src/help.c:87 msgid "dpkg - error: PATH is not set.\n" msgstr "" -#: src/help.c:101 +#: src/help.c:102 #, c-format msgid "dpkg: `%s' not found on PATH.\n" msgstr "" -#: src/help.c:108 +#: src/help.c:109 #, c-format msgid "" "%d expected program(s) not found on PATH.\n" "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin." msgstr "" -#: src/help.c:178 +#: src/help.c:179 #, c-format msgid "failed to chroot to `%.250s'" msgstr "" -#: src/help.c:226 +#: src/help.c:227 #, c-format msgid "error un-catching signal %s: %s\n" msgstr "" -#: src/help.c:244 +#: src/help.c:245 #, c-format msgid "unable to ignore signal %s before running script" msgstr "" -#: src/help.c:253 +#: src/help.c:254 #, c-format msgid "unable to set execute permissions on `%.250s'" msgstr "" -#: src/help.c:298 +#: src/help.c:299 #, c-format msgid "unable to stat installed %s script `%.250s'" msgstr "" -#: src/help.c:300 src/help.c:356 src/help.c:376 +#: src/help.c:301 src/help.c:357 src/help.c:377 #, c-format msgid "unable to execute %s" msgstr "" -#: src/help.c:324 +#: src/help.c:325 #, c-format msgid "unable to stat new %s script `%.250s'" msgstr "" -#: src/help.c:326 +#: src/help.c:327 #, c-format msgid "unable to execute new %s" msgstr "" -#: src/help.c:345 +#: src/help.c:346 #, c-format msgid "old %s script" msgstr "" -#: src/help.c:353 +#: src/help.c:354 #, c-format msgid "dpkg: warning - unable to stat %s `%.250s': %s\n" msgstr "" -#: src/help.c:360 +#: src/help.c:361 #, c-format msgid "dpkg - trying script from the new package instead ...\n" msgstr "" -#: src/help.c:367 +#: src/help.c:368 #, c-format msgid "new %s script" msgstr "" -#: src/help.c:371 +#: src/help.c:372 msgid "there is no script in the new version of the package - giving up" msgstr "" -#: src/help.c:373 +#: src/help.c:374 #, c-format msgid "unable to stat %s `%.250s'" msgstr "" -#: src/help.c:377 +#: src/help.c:378 #, c-format msgid "dpkg: ... it looks like that went OK.\n" msgstr "" -#: src/help.c:472 +#: src/help.c:473 #, c-format msgid "failed to rmdir/unlink `%.255s'" msgstr "" -#: src/help.c:476 dpkg-deb/info.c:54 +#: src/help.c:477 dpkg-deb/info.c:54 msgid "failed to exec rm for cleanup" msgstr "" -#: src/main.c:43 +#: src/main.c:44 msgid "Debian GNU/Linux `" msgstr "" -#: src/main.c:45 +#: src/main.c:46 msgid "' package management program version " msgstr "" -#: src/main.c:47 src/query.c:438 +#: src/main.c:48 src/query.c:458 msgid "" "This is free software; see the GNU General Public Licence version 2 or\n" "later for copying conditions. There is NO warranty.\n" "See " msgstr "" -#: src/main.c:49 src/query.c:440 +#: src/main.c:50 src/query.c:460 msgid " --licence for copyright and license details.\n" msgstr "" -#: src/main.c:57 +#: src/main.c:58 #, c-format msgid "" "Usage: \n" @@ -2046,6 +2056,7 @@ msgid "" " -D|--debug= Enable debugging - see -Dhelp or --debug=help\n" " --status-fd Send status change updates to file descriptor " "\n" +" --log= Log status changes and actions to \n" " --ignore-depends=,... Ignore dependencies involving \n" " --force-... Override problems - see --force-help\n" " --no-force-...|--refuse-... Stop when problems encountered\n" @@ -2059,7 +2070,7 @@ msgid "" "Use `dselect' or 'aptitude' for user-friendly package management.\n" msgstr "" -#: src/main.c:117 +#: src/main.c:119 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2073,17 +2084,17 @@ msgid "" "`more' !" msgstr "" -#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 +#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "" -#: src/main.c:187 +#: src/main.c:189 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "" -#: src/main.c:195 +#: src/main.c:197 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2104,26 +2115,31 @@ msgid "" "Note that the meanings and values are subject to change.\n" msgstr "" -#: src/main.c:214 +#: src/main.c:216 msgid "--debug requires an octal argument" msgstr "" -#: src/main.c:238 +#: src/main.c:240 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" -#: src/main.c:244 +#: src/main.c:246 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" -#: src/main.c:260 src/main.c:271 +#: src/main.c:262 src/main.c:273 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "" -#: src/main.c:290 +#: src/main.c:291 +#, c-format +msgid "couldn't open log `%s'" +msgstr "" + +#: src/main.c:310 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2164,47 +2180,47 @@ msgid "" "Forcing options marked [*] are enabled by default.\n" msgstr "" -#: src/main.c:335 +#: src/main.c:355 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "" -#: src/main.c:437 src/main.c:441 +#: src/main.c:458 src/main.c:462 msgid "couldn't malloc in execbackend" msgstr "" -#: src/main.c:439 src/main.c:446 +#: src/main.c:460 src/main.c:467 msgid "couldn't strdup in execbackend" msgstr "" -#: src/main.c:450 +#: src/main.c:471 #, c-format msgid "failed to exec %s" msgstr "" -#: src/main.c:462 +#: src/main.c:483 msgid "--command-fd takes 1 argument, not 0" msgstr "" -#: src/main.c:463 +#: src/main.c:484 msgid "--command-fd only takes 1 argument" msgstr "" -#: src/main.c:465 +#: src/main.c:486 msgid "invalid number for --command-fd" msgstr "" -#: src/main.c:467 +#: src/main.c:488 #, c-format msgid "couldn't open `%i' for stream" msgstr "" -#: src/main.c:492 +#: src/main.c:513 #, c-format msgid "unexpected eof before end of line %d" msgstr "" -#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184 #: dpkg-split/main.c:157 msgid "need an action option" msgstr "" @@ -2214,7 +2230,7 @@ msgstr "" msgid "--%s --pending does not take any non-option arguments" msgstr "" -#: src/packages.c:109 src/query.c:297 +#: src/packages.c:109 src/query.c:317 #, c-format msgid "--%s needs at least one package name argument" msgstr "" @@ -2356,126 +2372,126 @@ msgstr "" msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "" -#: src/processarc.c:283 +#: src/processarc.c:284 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "" -#: src/processarc.c:288 +#: src/processarc.c:289 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "" -#: src/processarc.c:308 +#: src/processarc.c:311 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" -#: src/processarc.c:362 +#: src/processarc.c:365 #, c-format msgid "read error in %.250s" msgstr "" -#: src/processarc.c:364 +#: src/processarc.c:367 #, c-format msgid "error closing %.250s" msgstr "" -#: src/processarc.c:366 +#: src/processarc.c:369 #, c-format msgid "error trying to open %.250s" msgstr "" -#: src/processarc.c:399 +#: src/processarc.c:402 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "" -#: src/processarc.c:457 +#: src/processarc.c:460 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "" -#: src/processarc.c:536 +#: src/processarc.c:539 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "" -#: src/processarc.c:549 +#: src/processarc.c:552 msgid "error reading dpkg-deb tar output" msgstr "" -#: src/processarc.c:551 +#: src/processarc.c:554 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "" -#: src/processarc.c:554 +#: src/processarc.c:557 msgid "dpkg-deb: zap possible trailing zeros" msgstr "" -#: src/processarc.c:660 +#: src/processarc.c:663 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "" -#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 +#: src/processarc.c:685 src/processarc.c:922 src/remove.c:286 msgid "cannot read info directory" msgstr "" -#: src/processarc.c:695 +#: src/processarc.c:698 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" -#: src/processarc.c:707 +#: src/processarc.c:710 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "" -#: src/processarc.c:710 +#: src/processarc.c:713 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "" -#: src/processarc.c:717 +#: src/processarc.c:720 msgid "unable to open temp control directory" msgstr "" -#: src/processarc.c:726 +#: src/processarc.c:729 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" -#: src/processarc.c:731 +#: src/processarc.c:734 #, c-format msgid "package control info contained directory `%.250s'" msgstr "" -#: src/processarc.c:733 +#: src/processarc.c:736 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" -#: src/processarc.c:739 +#: src/processarc.c:742 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "" -#: src/processarc.c:746 +#: src/processarc.c:749 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "" -#: src/processarc.c:899 +#: src/processarc.c:902 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "" -#: src/processarc.c:935 +#: src/processarc.c:938 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "" -#: src/query.c:140 +#: src/query.c:160 msgid "" "Desired=Unknown/Install/Remove/Purge/Hold\n" "| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" @@ -2483,110 +2499,110 @@ msgid "" "uppercase=bad)\n" msgstr "" -#: src/query.c:144 +#: src/query.c:164 msgid "Name" msgstr "Naziv" -#: src/query.c:144 +#: src/query.c:164 msgid "Version" msgstr "Verzija" -#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +#: src/query.c:164 dselect/methlist.cc:122 dselect/pkgtop.cc:297 msgid "Description" msgstr "Opis" -#: src/query.c:200 src/query.c:422 src/select.c:80 +#: src/query.c:220 src/query.c:442 src/select.c:80 #, c-format msgid "No packages found matching %s.\n" msgstr "" -#: src/query.c:216 +#: src/query.c:236 #, c-format msgid "diversion by %s" msgstr "" -#: src/query.c:217 +#: src/query.c:237 #, c-format msgid "local diversion" msgstr "" -#: src/query.c:218 +#: src/query.c:238 msgid "to" msgstr "za" -#: src/query.c:218 +#: src/query.c:238 msgid "from" msgstr "od" -#: src/query.c:251 +#: src/query.c:271 msgid "--search needs at least one file name pattern argument" msgstr "" -#: src/query.c:279 +#: src/query.c:299 #, c-format msgid "dpkg: %s not found.\n" msgstr "" -#: src/query.c:317 +#: src/query.c:337 #, c-format msgid "Package `%s' is not installed and no info is available.\n" msgstr "" -#: src/query.c:326 +#: src/query.c:346 #, c-format msgid "Package `%s' is not available.\n" msgstr "" -#: src/query.c:336 +#: src/query.c:356 #, c-format msgid "Package `%s' is not installed.\n" msgstr "" -#: src/query.c:345 +#: src/query.c:365 #, c-format msgid "Package `%s' does not contain any files (!)\n" msgstr "" -#: src/query.c:351 +#: src/query.c:371 #, c-format msgid "locally diverted" msgstr "" -#: src/query.c:352 +#: src/query.c:372 #, c-format msgid "package diverts others" msgstr "" -#: src/query.c:353 +#: src/query.c:373 #, c-format msgid "diverted by %s" msgstr "" -#: src/query.c:354 +#: src/query.c:374 #, c-format msgid " to: %s\n" msgstr "" -#: src/query.c:373 +#: src/query.c:393 msgid "" "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" msgstr "" -#: src/query.c:434 dpkg-deb/main.c:46 +#: src/query.c:454 dpkg-deb/main.c:46 msgid "Debian `" msgstr "Debian `" -#: src/query.c:436 +#: src/query.c:456 msgid "' package management program query tool\n" msgstr "" -#: src/query.c:448 +#: src/query.c:468 #, c-format msgid "Usage: " msgstr "Upotreba:" -#: src/query.c:449 +#: src/query.c:469 #, c-format msgid "" " [