From: Frank Lichtenheld Date: Wed, 18 Jan 2006 08:30:03 +0000 (+0000) Subject: Import latest release as a temporary trunk which should be X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53696310976b88bb01197796044ae92c571c89c3;p=dpkg Import latest release as a temporary trunk which should be later merged into a branch with the full history from CVS and arch --- diff --git a/ChangeLog b/ChangeLog index 6527c389..6e3d3bf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,153 @@ +2005-08-17 Scott James Remnant + + * configure.ac: Release 1.13.11. + + * scripts/dpkg-source.pl: Re-work the logic that handles the Files + field when unpacking source packages; always remove the revision + component and thereby allow -$rev.orig.tar.gz as well as native + diff.gz or debian.tar.gz; improve the "unrecognised file" error to + give the full filename, not the mangled suffix; check whether the + revision has length, rather than is non-zero ("0" is false in Perl). + +2005-08-17 Frank Lichtenheld + + * scripts/controllib.pl (parsedep): Correct a bug that caused wrong + architecture requirements in some cases, due to only "my"ing the + @arches list in some circumstances. + +2005-08-17 Colin Watson + + * src/processarc.c (process_archive): When copying the forward + dependency tree, blank the version field of unversioned dependencies + rather than leaving them uninitialised. + +2005-08-17 Scott James Remnant + + * scripts/dpkg-source.pl: Fix a few problems found with the + $diff_ignore_default_regexp value; it'd match any path with + DEADJOE in it somewhere (or .cvsignore, etc.), wouldn't match + an initial CVS or {arch}, etc. + Took the opportunity to reformat the string and add some comments, + which get stripped out before it's used. + Added tla/baz junk ",,.*" to the list of filters. + + * lib/dbmodify.c (log_message): Call setcloexec() on the log + file descriptor, otherwise we leak it to our children. + +2005-08-17 Ludovic Rousseau + + * src/filesdb.c: Replace all references to "statusoverride" file + with "statoverride". + +2005-08-17 Scott James Remnant + + * src/query.c (enqperpackage): Only output a newline between + different packages and not after the last one. + + * man/C/dpkg-deb.1: Document -W/--show and --showformat. + +2005-08-14 Bastian Kleineidam + + * man/C/dpkg-architecture.1: Fix typo. + +2005-08-14 Frank Lichtenheld + + * scripts/dpkg-genchanges.pl: Give a warning when one tries + to use -sd on a native Debian package. + + * scripts/dpkg-source.pl: Handle absolute paths in the argument + given for -b. + + * scripts/dpkg-source.pl: give more meaningful error message + if first argument to dpkg-source -x is a directory + + * scripts/controllib.pl (parsecdata): ignore trailing newlines + in single paragraph control files. + + * scripts/controllib.pl (parsedep): give a warning explaining + the problem when failing to parse the dependency. + * scripts/dpkg-checkbuilddeps.pl: Pass the dependency field name + to all calls to &build_depends() and &build_conflicts(), which + both call &check_line(). + (check_line): Take an argument specifying the field name, and + use it to output an error if the dependency list is not + defined (caused by a failure of &parsedep()). + + * scripts/controllib.pl: Remove the %capit map, it's no longer + used and everything uses the &capit() function instead. + (capit): Uppercase all letters that come after a minus ('-'), + +2005-08-14 Moritz Muehlenhoff , + Frank Lichtenheld + * scripts/controllib.pl (parsedep): allow whitespace before + version operators in dependencies. + +2005-08-14 Goswin Brederlow + + * scripts/dpkg-name.sh (stderr): Use shell redirect rather than + /dev/stderr. + +2005-08-14 Scott James Remnant + + * debian/control ([dselect]Description): Remove "a" from the start + of the description synopsis line. + ([dpkg]Description): De-capitalise description synopsis line. + ([dpkg-dev]Description): Likewise. + +2005-08-14 Guillem Jover + + * scripts/dpkg-architecture.pl (usageversion): Correct punctuation + in copyright message and escape the @ so Perl doesn't treat it as + an array reference. Same for initial comment. + +2005-07-17 Scott James Remnant + + * src/remove.c (removal_bulk_remove_files): Call lstat() rather + than stat() when removing a character, block or setuid file so + we change the thing itself and not what the symlink points to. + * src/processarc.c (process_archive): Likewise. + + * src/processarc.c (process_archive): Call ohshit() after finding + out we don't have an errno, not ohshite(). + + * src/cleanup.c (cu_preinstverynew): Blank the status information + of a newly installed package that we aborted the install of, + to avoid having packages in a not-installed state but with a version. + +2005-07-16 Scott James Remnant + + * src/filesdb.h (filenamenode.flags): Add fnnf_placed_on_disk flag + to indicate that the file is now on the disk, and thus needs to be + removed in cleanup if that happens. + * src/cleanup.c (cu_installnew): If .dpkg-tmp did not exist, + and the fnnf_placed_on_disk flag is set, we now remove the newly + created file. + * src/archives.c (tarobject): Set the fnnf_placed_on_disk flag once + the rename to the final destination succeeds. Add additional + comments to the source so we know what's on the disk at each point. + Fix up the #ifdef syntax to not confuse emacs. + + * src/archives.c (filesavespackage): Check whether the file we're + going to install is going to be diverted, before whether it's in the + new archive. + + * src/processarc.c (process_archive): When removing files that + were in the old version of the package only, don't just call + isdirectoryinuse(), actually check whether it's a directory first; + otherwise we won't remove diverted things. + +2005-07-15 Scott James Remnant + + * lib/ehandle.c (run_cleanups): Modify the value of flagset + according to the checkpoint mask and value after processing, + otherwise we'll run handlers we didn't mean to. + (pop_cleanup): Remove the flagset setting, we don't mix + checkpoints and calls anywhere. + 2005-06-28 Scott James Remnant + * configure.ac: Bump version to 1.13.11~. + * configure.ac: Release 1.13.10. * debian/dpkg.preinst (create_logfile): Remove from preinst. @@ -2988,7 +3136,6 @@ Tue May 21 17:20:12 CEST 2002 Wichert Akkerman * debian/dpkg.postinst: remove compat stuff for ancient dpkg versions. This also enables the /usr/info/dir move code which was never reached - Mon May 20 00:58:17 CDT 2002 Adam Heath * main/enquiry.c, main/main.h, utils/md5sum.c, split/dpkg-split.h, diff --git a/configure b/configure index c0c228a9..e35d9243 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.10. +# Generated by GNU Autoconf 2.59 for dpkg 1.13.11. # # 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.10' -PACKAGE_STRING='dpkg 1.13.10' +PACKAGE_VERSION='1.13.11' +PACKAGE_STRING='dpkg 1.13.11' PACKAGE_BUGREPORT='debian-dpkg@lists.debian.org' ac_unique_file="lib/dpkg.h" @@ -812,7 +812,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.10 to adapt to many kinds of systems. +\`configure' configures dpkg 1.13.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -879,7 +879,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dpkg 1.13.10:";; + short | recursive ) echo "Configuration of dpkg 1.13.11:";; esac cat <<\_ACEOF @@ -1032,7 +1032,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -dpkg configure 1.13.10 +dpkg configure 1.13.11 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1046,7 +1046,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.10, which was +It was created by dpkg $as_me 1.13.11, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1844,7 +1844,7 @@ fi # Define the identity of the package. PACKAGE='dpkg' - VERSION='1.13.10' + VERSION='1.13.11' cat >>confdefs.h <<_ACEOF @@ -16098,7 +16098,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by dpkg $as_me 1.13.10, which was +This file was extended by dpkg $as_me 1.13.11, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16161,7 +16161,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -dpkg config.status 1.13.10 +dpkg config.status 1.13.11 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 7252aa7b..46b60db8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([dpkg], [1.13.10], [debian-dpkg@lists.debian.org]) +AC_INIT([dpkg], [1.13.11], [debian-dpkg@lists.debian.org]) AC_CONFIG_SRCDIR([lib/dpkg.h]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/debian/changelog b/debian/changelog index d8954a89..1fadb2b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,70 @@ +dpkg (1.13.11) unstable; urgency=low + + The "Good, clean fun" Release. + + * Fixed the always broken error handling so that only the intended + cleanup handlers are run, rather than ones that we didn't expect. + This corrects the bug when a package's postrm fails and the package is + left in an installed state with no files; the package will now be left + in a half-installed state, as originally intended. Found by Marga + Manterola while documenting the maintainer scripts. Closes: #296026. + * Fixed removal of files involved in diversions during upgrade, caused by + checking whether the "directory" was in use by another package without + actually checking whether or not it was a directory. Closes: #310390. + * Fixed package saving to not disappear packages who divert anything from + the installing package out of the way. Closes: #113626. + * Improved clean-up of unpack failure during install or upgrade, to leave + the system in exactly the same state as it started in. + Closes: #47404, #82407, #121173, #170869, #201848, #236733, #268639. + * Fixed crash when unpacking a package which has an unversioned Replaces + declared on it by another package previously unpacked in the same run + (Colin Watson). Closes: #322595. + + * New install unwinding fixed to ensure we don't leave a version in the + status db for a not-installed package. + * Corrected error call when encountering a corrupted filesystem tarfile + to not print "Success". Closes: #95570. + * Fixed castration of potentially unsafe devices to not follow symlinks. + Closes: #169928. + * Marked log file descriptor as close-on-exec. Closes: #320925. + * Re-worked dpkg-source -x to allow all manner of strange things maintainers + seem to do, unpacking isn't the right place to enforce sanity; we'll + do it in -b later on >:-). Closes: #316470, #317760, #318473, #318745, + #322359, #322361, #322362. + + * Corrected dselect synopsis line to match consensus. Closes: #318659. + * Changed dpkg-name to use a shell redirect rather than the /dev/stderr + device that may not be writable. Closes: #318376. + * Adjusted various dpkg-query options to avoid outputting a trailing + newline. Closes: #151651, #319781. + * Changed references to "statusoverride" file to just "statoverride" + to make it match reality. Closes: #320952. + * Fixed several bugs with the default diff ignore list used by dpkg-source. + * Added ,,* to the list of default diff ignore list. Closes: #322917. + + * Fixes to dpkg-dev (Frank Lichtenheld): + - dpkg-checkbuilddeps will now exit with an error if it is unable to + parse a dependency field. Closes: #171762, #302229. + - dpkg-genchanges will now output a warning if given -sd for a native + package, as it's going to ignore it. Closes: #5571. + - dpkg-source fixed to give a more meaningful error message if given + a directory as the first argument. Closes: #306874. + - dpkg-source fixed to handle being given an absolute path to -b. + Closes: #147574. + - Fix controllib.pl to allow whitespace before version operators. + Closes: #273489, #310306. + - Fix architecture dependency parsing that sometimes generated wrong + list of requirements. Closes: #319816. + - Make the default control field name mangling behaviour "nicer" by + upper-casing all letters that come after a dash. Closes: #306474. + - Ignore trailing newlines in single paragraph control files. + Closes: #57194, #156319 + * Documentation: + - Fixed typo in dpkg-architecture man page. Closes: #317770. + - Documented dpkg-deb -W/--show and --showformat. Closes: #319784. + + -- Scott James Remnant Wed, 17 Aug 2005 04:44:44 +0100 + dpkg (1.13.10) unstable; urgency=low The "Bully's Special Prize" Release. diff --git a/debian/control b/debian/control index 1023bf49..dfb4b587 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ 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 -Description: Package maintenance system for Debian +Description: package maintenance system for Debian This package contains the low-level commands for handling the installation and removal of packages on your system. . @@ -31,7 +31,7 @@ Recommends: gcc | c-compiler, bzip2 Suggests: gnupg, debian-keyring Conflicts: dpkgname Replaces: dpkgname, dpkg (<< 1.4.1.8), dpkg-doc-ja -Description: Package building tools for Debian +Description: package building tools for Debian This package contains the tools (including dpkg-source) required to unpack, build and upload Debian source packages. . @@ -42,7 +42,7 @@ Package: dselect Architecture: any Depends: ${shlibs:Depends}, dpkg (>= 1.13.1) Replaces: dpkg (<< 1.10.3) -Description: a user tool to manage Debian packages +Description: user tool to manage Debian packages dselect is an interface for managing the installation and removal of packages on your system. . diff --git a/lib/dbmodify.c b/lib/dbmodify.c index 7f3cd392..720c96e9 100644 --- a/lib/dbmodify.c +++ b/lib/dbmodify.c @@ -304,6 +304,7 @@ void log_message(const char *fmt, ...) { return; } setlinebuf(logfd); + setcloexec(fileno(logfd), log_file); } if (!log) { diff --git a/lib/ehandle.c b/lib/ehandle.c index 7b6c09bc..f4945826 100644 --- a/lib/ehandle.c +++ b/lib/ehandle.c @@ -132,6 +132,8 @@ static void run_cleanups(struct errorcontext *econ, int flagsetin) { econtext= oldecontext; } } + flagset &= cep->cpmask; + flagset |= cep->cpvalue; ncep= cep->next; if (cep != &emergency.ce) free(cep); cep= ncep; @@ -207,8 +209,6 @@ void pop_cleanup(int flagset) { for (i=0; icalls[i].call && cep->calls[i].mask & flagset) cep->calls[i].call(cep->argc,cep->argv); - flagset &= cep->cpmask; - flagset |= cep->cpvalue; } if (cep != &emergency.ce) free(cep); } diff --git a/man/C/dpkg-architecture.1 b/man/C/dpkg-architecture.1 index 6285ee24..9b2e0b62 100644 --- a/man/C/dpkg-architecture.1 +++ b/man/C/dpkg-architecture.1 @@ -53,7 +53,7 @@ The machine the package is built on. The machine the package is built for. .IP "Debian Architecture" 4 .IX Item "Debian Architecture" -The Debian archietcture string, which specifies the binary tree in the \s-1FTP\s0 +The Debian architecture string, which specifies the binary tree in the \s-1FTP\s0 archive. Examples: i386, sparc, hurd\-i386. .IP "\s-1GNU\s0 System Type" 4 .IX Item "GNU System Type" diff --git a/man/C/dpkg-deb.1 b/man/C/dpkg-deb.1 index 6db9f21a..9d62bc74 100644 --- a/man/C/dpkg-deb.1 +++ b/man/C/dpkg-deb.1 @@ -19,14 +19,20 @@ dpkg\-deb - Debian package archive (.deb) manipulation tool .I archive .br .B dpkg\-deb +.BR \-W | \-\-show +.RB " [" \-\-showformat\fR=\fIformat "]" +.I archive +.br +.B dpkg\-deb .BR \-x | \-\-extract | \-X | \-\-vextract .I archive directory .br +.B dpkg\-deb +.BR \-e | \-\-control +.I archive directory +.br .B dpkg\-deb \-\-fsys\-tarfile .I archive -.br -.B dpkg\-deb \-\-control -.I archive directory .SH DESCRIPTION .B dpkg\-deb packs, unpacks and provides information about Debian archives. @@ -117,6 +123,20 @@ will print them in the order they were specified; if any of the components weren't present it will print an error message to stderr about each one and exit with status 2. .TP +.BR \-\-show ", " \-W +Provides information about a binary package archive in the format +specified by the +.B \-\-showformat +argument. + +This argument is a string that may reference any status field using the +"${\fIfield-name\fR}" form, a list of the valid fields can be easily +produced using +.B -I +on the same package. + +The default for this field is "${Package}\\t${Version}\\n". +.TP .BR \-\-field ", " \-f Extracts control file information from a binary package archive. diff --git a/po/bs.gmo b/po/bs.gmo index 3662e6a4..297406e9 100644 Binary files a/po/bs.gmo and b/po/bs.gmo differ diff --git a/po/bs.po b/po/bs.po index 697bf2d0..acf53264 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-06-28 12:31+0100\n" +"POT-Creation-Date: 2005-08-17 04:46+0100\n" "PO-Revision-Date: 2004-11-27 01:29+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -291,11 +291,11 @@ msgstr "" msgid "dpkg: too many nested errors during error recovery !!\n" msgstr "" -#: lib/ehandle.c:184 +#: lib/ehandle.c:186 msgid "out of memory for new cleanup entry with many arguments" msgstr "" -#: lib/ehandle.c:196 +#: lib/ehandle.c:198 msgid "out of memory for new cleanup entry" msgstr "" @@ -871,12 +871,12 @@ msgstr "" msgid "error setting timestamps of `%.255s'" msgstr "" -#: src/archives.c:272 src/archives.c:580 +#: src/archives.c:272 src/archives.c:585 #, c-format msgid "error setting ownership of `%.255s'" msgstr "" -#: src/archives.c:274 src/archives.c:583 +#: src/archives.c:274 src/archives.c:588 #, c-format msgid "error setting permissions of `%.255s'" msgstr "" @@ -942,231 +942,236 @@ msgstr "" # Now that we have verified everything its time to actually # * build something. Lets start by making the ar-wrapper. -#: src/archives.c:563 dpkg-deb/build.c:314 +#: src/archives.c:568 dpkg-deb/build.c:314 #, c-format msgid "unable to create `%.255s'" msgstr "" -#: src/archives.c:568 +#: src/archives.c:573 #, c-format msgid "backend dpkg-deb during `%.255s'" msgstr "" -#: src/archives.c:586 +#: src/archives.c:591 #, c-format msgid "error closing/writing `%.255s'" msgstr "" -#: src/archives.c:591 +#: src/archives.c:596 #, c-format msgid "error creating pipe `%.255s'" msgstr "" -#: src/archives.c:597 src/archives.c:603 +#: src/archives.c:602 src/archives.c:608 #, c-format msgid "error creating device `%.255s'" msgstr "" -#: src/archives.c:612 +#: src/archives.c:617 #, c-format msgid "error creating hard link `%.255s'" msgstr "" -#: src/archives.c:619 +#: src/archives.c:624 #, c-format msgid "error creating symbolic link `%.255s'" msgstr "" -#: src/archives.c:628 +#: src/archives.c:630 src/archives.c:635 #, c-format msgid "error setting ownership of symlink `%.255s'" msgstr "" -#: src/archives.c:633 +#: src/archives.c:641 #, c-format msgid "error creating directory `%.255s'" msgstr "" -#: src/archives.c:668 +#: src/archives.c:676 #, c-format msgid "unable to move aside `%.255s' to install new version" msgstr "" -#: src/archives.c:677 +#: src/archives.c:685 #, c-format msgid "unable to read link `%.255s'" msgstr "" -#: src/archives.c:681 +#: src/archives.c:689 #, c-format msgid "unable to make backup symlink for `%.255s'" msgstr "" -#: src/archives.c:687 +#: src/archives.c:692 src/archives.c:695 #, c-format msgid "unable to chown backup symlink for `%.255s'" msgstr "" -#: src/archives.c:691 +#: src/archives.c:700 #, c-format msgid "unable to make backup link of `%.255s' before installing new version" msgstr "" -#: src/archives.c:711 +#: src/archives.c:724 #, c-format msgid "unable to install new version of `%.255s'" msgstr "" -#: src/archives.c:735 +#: src/archives.c:756 #, c-format msgid "" "dpkg: warning - ignoring dependency problem with removal of %s:\n" "%s" msgstr "" -#: src/archives.c:742 +#: src/archives.c:763 #, c-format msgid "" "dpkg: warning - considering deconfiguration of essential\n" " package %s, to enable removal of %s.\n" msgstr "" -#: src/archives.c:746 +#: src/archives.c:767 #, 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:759 +#: src/archives.c:780 #, c-format msgid "" "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n" "%s" msgstr "" -#: src/archives.c:793 +#: src/archives.c:814 #, c-format msgid "dpkg: considering removing %s in favour of %s ...\n" msgstr "" -#: src/archives.c:797 +#: src/archives.c:818 #, c-format msgid "%s is not properly installed - ignoring any dependencies on it.\n" msgstr "" -#: src/archives.c:824 +#: src/archives.c:845 #, c-format msgid "dpkg: may have trouble removing %s, as it provides %s ...\n" msgstr "" -#: src/archives.c:839 +#: src/archives.c:860 #, c-format msgid "" "dpkg: package %s requires reinstallation, but will remove anyway as you " "request.\n" msgstr "" -#: src/archives.c:842 +#: src/archives.c:863 #, c-format msgid "dpkg: package %s requires reinstallation, will not remove.\n" msgstr "" -#: src/archives.c:855 +#: src/archives.c:876 #, c-format msgid "dpkg: yes, will remove %s in favour of %s.\n" msgstr "" -#: src/archives.c:863 +#: src/archives.c:884 #, c-format msgid "" "dpkg: regarding %s containing %s:\n" "%s" msgstr "" -#: src/archives.c:866 +#: src/archives.c:887 #, c-format msgid "conflicting packages - not installing %.250s" msgstr "" -#: src/archives.c:867 +#: src/archives.c:888 #, c-format msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n" msgstr "" -#: src/archives.c:905 +#: src/archives.c:926 #, c-format msgid "--%s --recursive needs at least one path argument" msgstr "" -#: src/archives.c:935 +#: src/archives.c:956 msgid "failed to exec find for --recursive" msgstr "" -#: src/archives.c:940 +#: src/archives.c:961 msgid "failed to fdopen find's pipe" msgstr "" -#: src/archives.c:946 +#: src/archives.c:967 msgid "error reading find's pipe" msgstr "" -#: src/archives.c:947 +#: src/archives.c:968 msgid "error closing find's pipe" msgstr "" -#: src/archives.c:950 +#: src/archives.c:971 #, c-format msgid "find for --recursive returned unhandled error %i" msgstr "" -#: src/archives.c:953 +#: src/archives.c:974 msgid "searched, but found no packages (files matching *.deb)" msgstr "" -#: src/archives.c:969 +#: src/archives.c:990 #, c-format msgid "--%s needs at least one package archive file argument" msgstr "" -#: src/archives.c:1039 +#: src/archives.c:1060 #, c-format msgid "Selecting previously deselected package %s.\n" msgstr "" -#: src/archives.c:1044 +#: src/archives.c:1065 #, c-format msgid "Skipping deselected package %s.\n" msgstr "" -#: src/archives.c:1058 +#: src/archives.c:1079 #, c-format msgid "Version %.250s of %.250s already installed, skipping.\n" msgstr "" -#: src/archives.c:1070 +#: src/archives.c:1091 #, c-format msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n" msgstr "" -#: src/archives.c:1076 +#: src/archives.c:1097 #, c-format msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n" msgstr "" -#: src/cleanup.c:84 +#: src/cleanup.c:83 #, c-format msgid "" "unable to remove newly-installed version of `%.250s' to allow reinstallation " "of backup copy" msgstr "" -#: src/cleanup.c:91 +#: src/cleanup.c:90 #, c-format msgid "unable to restore backup version of `%.250s'" msgstr "" -#: src/cleanup.c:97 +#: src/cleanup.c:94 +#, c-format +msgid "unable to remove newly-installed version of `%.250s'" +msgstr "" + +#: src/cleanup.c:101 #, c-format msgid "unable to remove newly-extracted version of `%.250s'" msgstr "" @@ -1997,14 +2002,14 @@ msgstr "" msgid "' package management program version " msgstr "" -#: src/main.c:48 src/query.c:462 +#: src/main.c:48 src/query.c:463 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:50 src/query.c:464 +#: src/main.c:50 src/query.c:465 msgid " --licence for copyright and license details.\n" msgstr "" @@ -2089,7 +2094,7 @@ msgid "" "`more' !" msgstr "" -#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145 +#: src/main.c:184 src/query.c:531 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "" @@ -2220,7 +2225,7 @@ msgstr "" msgid "unexpected eof before end of line %d" msgstr "" -#: src/main.c:541 src/main.c:556 src/query.c:565 dpkg-deb/main.c:184 +#: src/main.c:541 src/main.c:556 src/query.c:566 dpkg-deb/main.c:184 #: dpkg-split/main.c:157 msgid "need an action option" msgstr "" @@ -2428,65 +2433,65 @@ msgstr "" msgid "dpkg-deb: zap possible trailing zeros" msgstr "" -#: src/processarc.c:663 +#: src/processarc.c:667 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "" -#: src/processarc.c:685 src/processarc.c:922 src/remove.c:286 +#: src/processarc.c:689 src/processarc.c:929 src/remove.c:286 msgid "cannot read info directory" msgstr "" -#: src/processarc.c:698 +#: src/processarc.c:702 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" -#: src/processarc.c:710 +#: src/processarc.c:714 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "" -#: src/processarc.c:713 +#: src/processarc.c:717 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "" -#: src/processarc.c:720 +#: src/processarc.c:724 msgid "unable to open temp control directory" msgstr "" -#: src/processarc.c:729 +#: src/processarc.c:733 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" -#: src/processarc.c:734 +#: src/processarc.c:738 #, c-format msgid "package control info contained directory `%.250s'" msgstr "" -#: src/processarc.c:736 +#: src/processarc.c:740 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" -#: src/processarc.c:742 +#: src/processarc.c:746 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "" -#: src/processarc.c:749 +#: src/processarc.c:753 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "" -#: src/processarc.c:902 +#: src/processarc.c:909 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "" -#: src/processarc.c:938 +#: src/processarc.c:945 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "" @@ -2511,7 +2516,7 @@ msgstr "Verzija" msgid "Description" msgstr "Opis" -#: src/query.c:218 src/query.c:446 src/select.c:80 +#: src/query.c:218 src/query.c:447 src/select.c:80 #, c-format msgid "No packages found matching %s.\n" msgstr "" @@ -2583,26 +2588,26 @@ msgstr "" msgid " to: %s\n" msgstr "" -#: src/query.c:397 +#: src/query.c:398 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:458 dpkg-deb/main.c:46 +#: src/query.c:459 dpkg-deb/main.c:46 msgid "Debian `" msgstr "Debian `" -#: src/query.c:460 +#: src/query.c:461 msgid "' package management program query tool\n" msgstr "" -#: src/query.c:472 +#: src/query.c:473 #, c-format msgid "Usage: " msgstr "Upotreba:" -#: src/query.c:473 +#: src/query.c:474 #, c-format msgid "" " [