From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 24 Nov 2008 10:16:13 +0000 (+0100)
Subject: merged from debian-sid
X-Git-Tag: 0.7.24ubuntu1~54
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/73e0ee1e7f97571d7be3277e3c25c2f41b2bb946

merged from debian-sid
---

73e0ee1e7f97571d7be3277e3c25c2f41b2bb946
diff --cc apt-pkg/deb/dpkgpm.cc
index a88e23081,40aafafa4..ae99e4324
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -25,8 -24,9 +25,10 @@@
  #include <sys/wait.h>
  #include <signal.h>
  #include <errno.h>
 +#include <string.h>
  #include <stdio.h>
+ #include <string.h>
+ #include <algorithm>
  #include <sstream>
  #include <map>
  
@@@ -871,8 -884,10 +903,9 @@@ bool pkgDPkgPM::Go(int OutStatusFd
  	    // Restore sig int/quit
  	    signal(SIGQUIT,old_SIGQUIT);
  	    signal(SIGINT,old_SIGINT);
+ 	    signal(SIGHUP,old_SIGHUP);
  	    return _error->Errno("waitpid","Couldn't wait for subprocess");
  	 }
 -
  	 // wait for input or output here
  	 FD_ZERO(&rfds);
  	 if (!stdin_is_dev_null)
diff --cc apt-pkg/deb/dpkgpm.h
index 51668bdf7,ebc7e32bf..62d3d893d
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@@ -48,8 -47,6 +48,12 @@@ class pkgDPkgPM : public pkgPackageMana
     // the int is the state that is already done (e.g. a package that is
     // going to be install is already in state "half-installed")
     map<string,unsigned int> PackageOpsDone;
-    // map the dpkg "processing" info to human readable names
++
++
++#if 1 // FIXME: BINARY COMPATIBILITY ONLY, remove on next ABI break
 +   map<string,string> PackageProcessingOps;
++#endif
++
     // progress reporting
     unsigned int PackagesDone;
     unsigned int PackagesTotal;
diff --cc configure.in
index aaaa44f43,0ffbc67ff..f3210d425
--- a/configure.in
+++ b/configure.in
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.7.14ubuntu7")
 -AC_DEFINE_UNQUOTED(VERSION,"0.7.18")
++AC_DEFINE_UNQUOTED(VERSION,"0.7.19ubuntu1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
diff --cc debian/changelog
index 042603ae6,c60050fd4..acc413bea
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,100 -1,304 +1,407 @@@
++apt (0.7.19ubuntu1) jaunty; urgency=low
++
++  * merge from debian
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 24 Nov 2008 10:52:20 +0100
++
+ apt (0.7.19) unstable; urgency=low
+ 
+   [ Eugene V. Lyubimkin ]
+   * doc/sources.list.5.xml:
+     - Mentioned allowed characters in file names in /etc/apt/sources.list.d.
+       Thanks to Matthias Urlichs. (Closes: #426913)
+   * doc/apt-get.8.xml:
+     - Explicitly say that 'dist-upgrade' command may remove packages.
+     - Included '-v'/'--version' as a command to synopsis.
+   * cmdline/apt-cache.cc:
+     - Advanced built-in help. Patch by Andre Felipe Machado. (Closes: #286061)
+     - Fixed typo 'GraphVis' -> 'GraphViz'. (Closes: #349038)
+     - Removed asking to file a release-critical bug against a package if there
+       is a request to install only one package and it is not installable.
+       (Closes: #419521)
+ 
+ 
+   [ Michael Vogt ]
+     - fix SIGHUP handling (closes: #463030)
+ 
+   [ Christian Perrier ]
+   * Translations:
+     - French updated
+     - Bulgarian updated. Closes: #505476
+     - Slovak updated. Closes: #505483
+     - Swedish updated. Closes: #505491
+     - Japanese updated. Closes: #505495
+     - Korean updated. Closes: #505506
+     - Catalan updated. Closes: #505513
+     - British English updated. Closes: #505539
+     - Italian updated. Closes: #505518, #505683
+     - Polish updated. Closes: #505569
+     - German updated. Closes: #505614
+     - Spanish updated. Closes: #505757
+     - Romanian updated. Closes: #505762
+     - Simplified Chinese updated. Closes: #505727
+     - Portuguese updated. Closes: #505902
+     - Czech updated. Closes: #505909
+     - Norwegian Bokmål updated. Closes: #505934
+     - Brazilian Portuguese updated. Closes: #505949
+     - Basque updated. Closes: #506085
+     - Russian updated. Closes: #506452 
+     - Marathi updated. 
+     - Ukrainian updated. Closes: #506545 
+ 
+  -- Michael Vogt <mvo@debian.org>  Mon, 24 Nov 2008 10:33:54 +0100
+ 
+ apt (0.7.18) unstable; urgency=low
+ 
+   [ Christian Perrier ]
+   * Translations:
+     - French updated
+     - Thai updated. Closes: #505067
+ 
+   [ Eugene V. Lyubimkin ]
+   * doc/examples/configure-index:
+     - Removed obsoleted header line. (Closes: #417638)
+     - Changed 'linux-kernel' to 'linux-image'.
+   * doc/sources.list.5.xml:
+     - Fixed typo and grammar in 'sources.list.d' section. Thanks to
+       Timothy G Abbott <tabbott@MIT.EDU>. (Closes: #478098)
+   * doc/apt-get.8.xml:
+     - Advanced descriptions for 'remove' and 'purge' options.
+       (Closes: #274283)
+   * debian/rules:
+     - Target 'apt' need to depend on 'build-doc'. Thanks for Peter Green.
+       Fixes FTBFS. (Closes: #504181)
+ 
+   [ Michael Vogt ]
+   * fix depend on libdb4.4 (closes: #501253)
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 07 Nov 2008 22:13:39 +0100
+ 
+ apt (0.7.17) unstable; urgency=low
+ 
+   [ Eugene V. Lyubimkin ]
+   * debian/control:
+     - 'Vcs-Bzr' field is official, used it.
+     - Bumped 'Standards-Version' to 3.8.0, no changes needed.
+     - Actualized 'Uploaders' field.
+   * doc/:
+     - Substituded 'apt-archive' with 'apt-ftparchive' in docs.
+       Patch based on work of Andre Felipe Machado. (Closes: #350865)
+     - Mentioned '/<release>' and '=<version>' for 'apt-get install' and
+       '=<version>' for 'apt-get source' in apt-get manpage. Patch based on
+       work of Andre Felipe Machado. (Closes: #399673)
+     - Mentioned more short options in the apt-get manpage. Documented 'xvcg'
+       option in the apt-cache manpage. The part of patch by Andre Felipe
+       Machado. (Closes: #176106, #355945)
+     - Documented that 'apt-get install' command should be used for upgrading
+       some of installed packages. Based on patch by Nori Heikkinen and
+       Andre Felipe Machado. (Closes: #267087)
+     - Mentioned 'apt_preferences(5)' in apt manpage. (Closes: #274295)
+     - Documented 'APT::Default-Release' in apt.conf manpage. (Closes: #430399)
+     - APT::Install-Recommends is now true by default, mentioned this in
+       configure-index example. (Closes: #463268)
+     - Added 'APT::Get::AllowUnauthenticated' to configure-index example.
+       (Closes: #320225)
+     - Documented '--no-install-recommends' option in apt-get manpage.
+       (Closes: #462962)
+     - Documented 'Acquire::PDiffs' in apt.conf manpage. (Closes: #376029)
+     - Added 'copy', 'rsh', 'ssh' to the list of recognized URI schemes in
+       sources.list manpage, as they are already described under in the manpage.
+     - Removed notice that ssh/rsh access cannot use password authentication
+       from sources.list manpage. Thanks to Steffen Joeris. (Closes: #434894)
+     - Added '(x)' to some referrings to manpages in apt-get manpage. Patch by
+       Andre Felipe Machado. (Closes: #309893)
+     - Added 'dist-upgrade' apt-get synopsis in apt-get manpage.
+       (Closes: #323866)
+ 
+  -- Michael Vogt <mvo@debian.org>  Wed, 05 Nov 2008 13:14:56 +0100
+ 
+ apt (0.7.17~exp4) experimental; urgency=low
+ 
+   * debian/rules:
+     - Fixed lintian warnings "debian/rules ignores make errors".
+   * debian/control:
+     - Substituted outdated "Source-Version" fields with "binary:Version".
+     - Added 'python-apt' to Suggests, as apt-mark need it for work.
+     - Drop Debian revision from 'doc-base' build dependency, this fixes
+       appropriate lintian warning.
+   * debian/libapt-pkg-doc.doc-base.*:
+     - Changed section: from old 'Devel' to 'Debian'. This fixes appropriate
+       lintian warnings.
+   * debian/{postrm,prerm,preinst}:
+     - Added 'set -e', fixes lintian warnings
+       'maintainer-script-ignores-error'.
+   * dselect/makefile:
+     - Removed unneeded 'LOCAL' entry. This allows cleaning rule to run smoothly.
+   * share/lintian-overrides:
+     - Added with override of 'apt must depend on python'. Script 'apt-mark'
+       needs apt-python for working and checks this on fly. We don't want
+       python in most cases.
+   * cmdline/apt-key:
+     - Added 'unset GREP_OPTIONS' to the script. This prevents 'apt-key update'
+       failure when GREP_OPTIONS contains options that modify grep output.
+       (Closes: #428752)
+ 
+  -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Fri, 31 Oct 2008 23:45:17 +0300
+ 
+ apt (0.7.17~exp3) experimental; urgency=low
+ 
+   * apt-pkg/acquire-item.cc:
+     - fix a merge mistake that prevents the fallback to the 
+       uncompressed 'Packages' to work correctly (closes: #409284)
+ 
+  -- Michael Vogt <mvo@debian.org>  Wed, 29 Oct 2008 09:36:24 +0100
+ 
+ apt (0.7.17~exp2) experimental; urgency=low
+ 
+   [ Eugene V. Lyubimkin ]
+   * apt-pkg/acquire-item.cc:
+     - Added fallback to uncompressed 'Packages' if neither 'bz2' nor 'gz'
+       available. (Closes: #409284)
+   * apt-pkg/algorithm.cc:
+     - Strip username and password from source URL in error message.
+       (Closes: #425150)
+   
+   [ Michael Vogt ]
+   * fix various -Wall warnings
+ 
+  -- Michael Vogt <mvo@debian.org>  Tue, 28 Oct 2008 18:06:38 +0100
+ 
+ apt (0.7.17~exp1) experimental; urgency=low
+ 
+   [ Luca Bruno ]
+   * Fix typos:
+     - apt-pkg/depcache.cc
+   * Fix compilation warnings:
+     - apt-pkg/acquire.cc
+     - apt-pkg/versionmatch.cc
+   * Compilation fixes and portability improvement for compiling APT against non-GNU libc
+     (thanks to Martin Koeppe, closes: #392063):
+     - buildlib/apti18n.h.in:
+       + textdomain() and bindtextdomain() must not be visible when --disable-nls
+     - buildlib/inttypes.h.in: undefine standard int*_t types
+     - Append INTLLIBS to SLIBS:
+       + cmdline/makefile
+       + ftparchive/makefile
+       + methods/makefile
+   * doc/apt.conf.5.xml:
+     - clarify whether configuration items of apt.conf are case-sensitive
+       (thanks to Vincent McIntyre, closes: #345901)
+ 
+  -- Luca Bruno <lethalman88@gmail.com>  Sat, 11 Oct 2008 09:17:46 +0200
+ 
+ apt (0.7.16) unstable; urgency=low
+ 
+   [ Luca Bruno ]
+   * doc/apt-cache.8.xml:
+     - search command uses POSIX regex, and searches for virtual packages too
+       (closes: #277536)
+   * doc/offline.sgml: clarify remote and target hosts
+     (thanks to Nikolaus Schulz, closes: #175940)
+   * Fix several typos in docs, translations and debian/changelog
+     (thanks to timeless, Nicolas Bonifas and Josh Triplett,
+     closes: #368665, #298821, #411532, #431636, #461458)
+   * Document apt-key finger and adv commands
+     (thanks to Stefan Schmidt, closes: #350575)
+   * Better documentation for apt-get --option
+     (thanks to Tomas Pospisek, closes: #386579)
+   * Retitle the apt-mark.8 manpage (thanks to Justin Pryzby, closes: #471276)
+   * Better documentation on using both APT::Default-Release and
+     /etc/apt/preferences (thanks to Ingo Saitz, closes: #145575)
+   
+   [ Michael Vogt ]
+   * doc/apt-cache.8.xml:
+     - add missing citerefentry
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 10 Oct 2008 23:44:50 +0200
+ 
+ apt (0.7.15) unstable; urgency=low
+ 
+   * Upload to unstable
+ 
+  -- Michael Vogt <mvo@debian.org>  Sun, 05 Oct 2008 13:23:47 +0200
+ 
+ apt (0.7.15~exp3) experimental; urgency=low
+ 
+   [Daniel Burrows]
+   * apt-pkg/deb/dpkgpm.cc:
+     - Store the trigger state descriptions in a way that does not break
+       the ABI.  The approach taken makes the search for a string O(n) rather
+       than O(lg(n)), but since n == 4, I do not consider this a major
+       concern.  If it becomes a concern, we can sort the static array and
+       use std::equal_range().  (Closes: #499322)
+ 
+   [ Michael Vogt ]
+   * apt-pkg/packagemanager.cc, apt-pkg/deb/dpkgpm.cc:
+     - move the state file writting into the Go() implementation
+       of dpkgpm (closes: #498799)
+   * apt-pkg/algorithms.cc:
+     - fix simulation performance drop (thanks to Ferenc Wagner
+       for reporting the issue)
+ 
+  -- Michael Vogt <mvo@debian.org>  Wed, 01 Oct 2008 18:09:49 +0200
+ 
+ apt (0.7.15~exp2) experimental; urgency=low
+ 
+   [ Michael Vogt ]
+   * apt-pkg/pkgcachegen.cc:
+     - do not add multiple identical descriptions for the same 
+       language (closes: #400768)
+ 
+   [ Program translations ]
+   * Catalan updated. Closes: #499462
+ 
+  -- Michael Vogt <mvo@debian.org>  Tue, 23 Sep 2008 07:29:59 +0200
+ 
+ apt (0.7.15~exp1) experimental; urgency=low
+ 
+   [ Christian Perrier ]
+   * Fix typo in cron.daily script. Closes: #486179
+ 
+   [ Program translations ]
+   * Traditional Chinese updated. Closes: #488526
+   * German corrected and completed. Closes: #490532, #480002, #498018
+   * French completed
+   * Bulgarian updated. Closes: #492473
+   * Slovak updated. Closes: #492475
+   * Galician updated. Closes: #492794
+   * Japanese updated. Closes: #492975
+   * Fix missing space in Greek translation. Closes: #493922
+   * Greek updated.
+   * Brazilian Portuguese updated.
+   * Basque updated. Closes: #496754
+   * Romanian updated. Closes: #492773, #488361
+   * Portuguese updated. Closes: #491790
+   * Simplified Chinese updated. Closes: #489344
+   * Norwegian Bokmål updated. Closes: #480022
+   * Czech updated. Closes: #479628, #497277
+   * Korean updated. Closes: #464515
+   * Spanish updated. Closes: #457706
+   * Lithuanian added. Closes: #493328
+   * Swedish updated. Closes: #497496
+   * Vietnamese updated. Closes: #497893
+   * Portuguese updated. Closes: #498411
+   * Greek updated. Closes: #498687
+   * Polish updated.
+ 
+   [ Michael Vogt ]
+   * merge patch that enforces stricter https server certificate
+     checking (thanks to Arnaud Ebalard, closes: #485960)
+   * allow per-mirror specific https settings
+     (thanks to Arnaud Ebalard, closes: #485965)
+   * add doc/examples/apt-https-method-example.cof
+     (thanks to Arnaud Ebalard, closes: #485964)
+   * apt-pkg/depcache.cc:
+     - when checking for new important deps, skip critical ones
+       (closes: #485943)
+   * improve apt progress reporting, display trigger actions
+   * add DPkg::NoTriggers option so that applications that call
+     apt/aptitude (like the installer) defer trigger processing
+     (thanks to Joey Hess)
+   * doc/makefile:
+     - add examples/apt-https-method-example.conf
+   
+  -- Michael Vogt <mvo@debian.org>  Tue, 16 Sep 2008 21:27:03 +0200
+ 
 +apt (0.7.14ubuntu7) jaunty; urgency=low
 +
 +  * cmdline/apt-cache.cc:
 +    - remove the gettext from a string that consists entirely 
 +      of variables (LP: #56792)
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix potential hang when in a backgroud process group
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Oct 2008 21:09:12 +0100
 +
 +apt (0.7.14ubuntu6) intrepid; urgency=low
 +
 +  * debian/apt.conf.autoremove:
 +    - remove "linux-image" (and friends) from the auto-remove
 +      blacklist. we have the kernel fallback infrastructure now
 +      in intrepid (thanks to BenC)
 +  * apt-pkg/indexcopy.cc:
 +    - support having CDs with no Packages file (just a Packages.gz)
 +      by not forcing a verification on non-existing files
 +     (LP: #255545)
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - improve the filtering for duplicated apport reports (thanks
 +      to seb128 for pointing that problem out)
 +    - do not report disk full errors from dpkg via apport
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 07 Aug 2008 16:28:05 +0200
 +
 +apt (0.7.14ubuntu5) intrepid; urgency=low
 +
 +  * fix various -Wall warnings
 +  * make "apt-get build-dep" installed packages marked automatic
 +    by default. This can be changed by setting the value of
 +    APT::Get::Build-Dep-Automatic to false (thanks to Aaron 
 +    Haviland, closes: #44874, LP: #248268)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 06 Aug 2008 14:00:51 +0200
 +
 +apt (0.7.14ubuntu4) intrepid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix uninitialized variable that caused no apport reports
 +      to be written sometimes (thanks to Matt Zimmerman)
 +  * merge patch that enforces stricter https server certificate
 +    checking (thanks to Arnaud Ebalard, closes: #485960)
 +  * allow per-mirror specific https settings
 +    (thanks to Arnaud Ebalard, closes: #485965)
 +  * add doc/examples/apt-https-method-example.cof
 +    (thanks to Arnaud Ebalard, closes: #485964)
 +  * add DPkg::NoTriggers option so that applications that call
 +    apt/aptitude (like the installer) defer trigger processing
 +    (thanks to Joey Hess) 
 +  * document --install-recommends and --no-install-recommends
 +    (thanks to Dereck Wonnacott, LP: #126180)
 +  
 +  [ Dereck Wonnacott ]
 +  * apt-ftparchive might write corrupt Release files (LP: #46439)
 +  * Apply --important option to apt-cache depends (LP: #16947) 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Aug 2008 10:10:49 +0200
 +
 +apt (0.7.14ubuntu3) intrepid; urgency=low
 +
 +  [ Otavio Salvador ]
 +  * Apply patch to avoid truncating of arbitrary files. Thanks to Bryan
 +    Donlan <bdonlan@fushizen.net> for the patch. Closes: #482476
 +  * Avoid using dbus if dbus-daemon isn't running. Closes: #438803
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - improve apt progress reporting, display trigger actions
 +  * apt-pkg/depcache.cc:
 +    - when checking for new important deps, skip critical ones
 +      (LP: #236360)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 03 Jun 2008 17:27:07 +0200
 +
 +apt (0.7.14ubuntu2) intrepid; urgency=low
 +
 +  * debian/control:
 +    - fix FTBFS by adding missing intltool dependency 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 09 May 2008 13:50:22 +0200
 +
 +apt (0.7.14ubuntu1) intrepid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * enable installation of recommends by default
 +  * debian/apt.conf.ubuntu:
 +    - remove APT::Install-Recommends-Sections (no longer needed)
 +  * merged from debian/sid, remaining changes:
 +    - authentication-reliable branch (to be merged into debian soon)
 +    - mirror:// uri branch (breaks ABI in debian, not merged yet)
 +    - apport failure reporting
 +    - show warning on apt-get source with 'Vcs-' header
 +    - proxy detection from gconf in apt.cron
 +  
+ apt (0.7.14) unstable; urgency=low
+ 
    [ Christian Perrier ]
    * Mark a message from dselect backend as translatable
      Thanks to Frédéric Bothamy for the patch
@@@ -1170,98 -837,11 +1477,98 @@@ apt (0.7.1) experimental; urgency=lo
  
   -- Michael Vogt <mvo@debian.org>  Wed,  2 May 2007 13:43:44 +0200
  
 +apt (0.6.46.4ubuntu10) feisty; urgency=low
 +
 +  * apt-pkg/depcache.cc:
 +    - added "APT::Never-MarkAuto-Section" and consider dependencies 
 +      of packages in this section manual (LP#59893)
 +    - ensure proper permissions in the extended_state file (LP#67037)
 +  * debian/apt.conf.ubuntu:
 +    - added APT::Never-MarkAuto-Section "metapackages" (LP#59893)
 +  * cmdline/apt-get.cc:
 +    - "apt-get install foo" on a already installed package foo will
 +      clean the automatic installed flag (LP#72007)
 +    - do not show packages already marked for removal as auto-installed
 +      (LP#64493)
 +    - applied patch to (optionally) hide the auto-remove information
 +      (thanks to Frode M. Døving) (LP#69148)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 14 Mar 2007 13:32:32 +0100
 +
 +apt (0.6.46.4ubuntu9) feisty; urgency=low
 +
 +  * debian/control:
 +    - set XS-Vcs-Bzr header
 +    - Set Ubuntu maintainer address
 +  * apt-pkg/cdrom.cc:
 +    - only unmount if APT::CDROM::NoMount is false
 +    - only umount if it was mounted by the method before
 +  * cmdline/apt-get.cc:
 +    - fix version output in autoremove list (LP#68941)
 +  * apt-pkg/packagemanager.cc:
 +    - do not spin 100% cpu in FixMissing() (LP#84476)
 +  * apt-pkg/indexfile.cc:
 +    - fix problem overwriting APT::Acquire::Translation
 +  * doc/examples/configure-index:
 +    - document APT::Acquire::Translation
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Mar 2007 15:24:39 +0100
 +
 +apt (0.6.46.4ubuntu8) feisty; urgency=low
 +
 +  * fix segfault in the pkgRecords destructor
 +  * Bump ABI version
 +  * debian/control:
 +    - make the libcurl3-gnutls-dev versionized (LP#86614)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 26 Feb 2007 14:26:33 +0100
 +
 +apt (0.6.46.4ubuntu7) feisty; urgency=low
 +
 +  * Merged the apt--mirror branch. This means that a new 'mirror' 
 +    method is available that will allow dynamic mirror updates.
 +    The sources.list entry looks something like this:
 +    "deb mirror://mirrors.lp.net/get_mirror feisty main restricted"
 +
 +    It also supports error reporting to a configurable url for mirror
 +    problems/failures.
 +  * Bump ABI version
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Feb 2007 11:38:06 +0100
 +
 +apt (0.6.46.4ubuntu6) feisty; urgency=low
 +
 +  * methods/http.cc:
 +    - send apt version in User-Agent
 +  * apt-pkg/deb/debrecords.cc:
 +    - fix SHA1Hash() return value
 +  * apt-pkg/algorithms.cc:
 +    - fix resolver bug on removal triggered by weak-dependencies 
 +      with or-groups
 +    - fix segfault (lp: #76530)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 20 Dec 2006 11:04:36 +0100
 +
 +apt (0.6.46.4ubuntu5) feisty; urgency=low
 +
 +  * added apt-transport-https package to provide a optional
 +    https transport (apt-https spec)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Dec 2006 16:23:43 +0100
 +
 +apt (0.6.46.4ubuntu4) feisty; urgency=low
 +  
 +  * apt-pkg/algorithms.cc:
 +    - only increase the score of installed applications if they 
 +      are not obsolete 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
 +
  apt (0.7.0) experimental; urgency=low
  
-   * Package that contains tall the new features
+   * Package that contains all the new features
    * Removed all #pragma interface/implementation
-   * Branch that contains tall the new features:
+   * Branch that contains all the new features:
    * translated package descriptions
    * task install support
    * automatic dependency removal (thanks to Daniel Burrows)
diff --cc debian/control
index 3df6226ff,ba9e32e4b..b74079735
--- a/debian/control
+++ b/debian/control
@@@ -1,12 -1,13 +1,14 @@@
  Source: apt
  Section: admin
  Priority: important
 -Maintainer: APT Development Team <deity@lists.debian.org>
 +Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 +XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
- Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>
- Standards-Version: 3.7.2.2
- Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12-1), xsltproc, docbook-xsl, xmlto, intltool
+ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
+  Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
+  Luca Bruno <lethalman88@gmail.com>, Eugene V. Lyubimkin <jackyf.devel@gmail.com>
+ Standards-Version: 3.8.0
 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto
 -Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
++Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto, intltool
 +Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu
  
  Package: apt
  Architecture: any
@@@ -14,8 -15,7 +16,8 @@@ Depends: ${shlibs:Depends
  Priority: important
  Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
  Provides: ${libapt-pkg:provides}
 +Recommends: ubuntu-keyring
- Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, gnupg
+ Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
  Section: admin
  Description: Advanced front-end for dpkg
   This is Debian's next generation front-end for the dpkg package manager.
diff --cc debian/rules
index 4f6d72e06,f587b141a..e4ecfbdd7
--- a/debian/rules
+++ b/debian/rules
@@@ -213,12 -213,13 +213,15 @@@ apt: build build-doc debian/shlibs.loca
  	cp debian/bugscript debian/$@/usr/share/bug/apt/script
  	cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt
  
 -	cp share/debian-archive.gpg debian/$@/usr/share/$@
 +	cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
 +	sed 's/^_//' share/apt-auth-failure.note > debian/$@/usr/share/$@/apt-auth-failure.note
  	cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
 +	cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu
  #	head -n 500 ChangeLog > debian/ChangeLog
  
+ 	# copy lintian override
+ 	cp share/lintian-overrides debian/$@/usr/share/lintian/overrides/apt
+ 
  	# make rosetta happy and remove pot files in po/ (but leave stuff
  	# in po/domains/* untouched) and cp *.po into each domain dir
  	rm -f build/po/*.pot
diff --cc doc/examples/configure-index
index 8e80a95a3,07803b2cb..5cc6187a8
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@@ -104,12 -103,9 +104,12 @@@ AP
  
    // consider Recommends, Suggests as important dependencies that should
    // be installed by default
-   Install-Recommends "false";
+   Install-Recommends "true";
    Install-Suggests "false";
  
 +  // install recommends automatically for packages in this section
 +  Install-Recommends-Section { "metapackages"; "universe/metapackages"; };
 +  
    // consider dependencies of packages in this section manual
    Never-MarkAuto-Sections {"metapackages"; "universe/metapackages"; };
  
diff --cc methods/makefile
index f765a4d37,d9481dbcc..5c4fa82bf
--- a/methods/makefile
+++ b/methods/makefile
@@@ -47,9 -47,9 +47,9 @@@ include $(PROGRAM_H
  
  # The http method
  PROGRAM=http
- SLIBS = -lapt-pkg $(SOCKETLIBS)
+ SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
  LIB_MAKES = apt-pkg/makefile
 -SOURCE = http.cc rfc2553emu.cc connect.cc
 +SOURCE = http.cc http_main.cc rfc2553emu.cc connect.cc
  include $(PROGRAM_H)
  
  # The https method
diff --cc po/apt-all.pot
index ae7cb4795,70f81f357..804c23b48
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-05-22 16:56+0200\n"
 -"POT-Creation-Date: 2008-11-12 22:07+0100\n"
++"POT-Creation-Date: 2007-06-07 00:57+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -28,7 -28,7 +28,7 @@@ msgid "Unable to locate package %s
  msgstr ""
  
  #: cmdline/apt-cache.cc:247
--msgid "Total package names: "
++msgid "Total package names : "
  msgstr ""
  
  #: cmdline/apt-cache.cc:287
@@@ -56,7 -56,7 +56,7 @@@ msgid "Total distinct versions: 
  msgstr ""
  
  #: cmdline/apt-cache.cc:295
--msgid "Total distinct descriptions: "
++msgid "Total Distinct Descriptions: "
  msgstr ""
  
  #: cmdline/apt-cache.cc:297
@@@ -155,10 -155,10 +155,10 @@@ msgid "       %4i %s\n
  msgstr ""
  
  #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
--#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
- #: cmdline/apt-get.cc:2571 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
++#: cmdline/apt-get.cc:2564 cmdline/apt-sortpkgs.cc:144
  #, c-format
--msgid "%s %s for %s compiled on %s %s\n"
++msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr ""
  
  #: cmdline/apt-cache.cc:1721
@@@ -260,31 -260,31 +260,31 @@@ msgstr "
  msgid "Cannot get debconf version. Is debconf installed?"
  msgstr ""
  
--#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
++#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
  msgid "Package extension list is too long"
  msgstr ""
  
--#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
--#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
--#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
++#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
++#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
++#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
  #, c-format
  msgid "Error processing directory %s"
  msgstr ""
  
--#: ftparchive/apt-ftparchive.cc:251
++#: ftparchive/apt-ftparchive.cc:254
  msgid "Source extension list is too long"
  msgstr ""
  
--#: ftparchive/apt-ftparchive.cc:368
++#: ftparchive/apt-ftparchive.cc:371
  msgid "Error writing header to contents file"
  msgstr ""
  
--#: ftparchive/apt-ftparchive.cc:398
++#: ftparchive/apt-ftparchive.cc:401
  #, c-format
  msgid "Error processing contents %s"
  msgstr ""
  
--#: ftparchive/apt-ftparchive.cc:553
++#: ftparchive/apt-ftparchive.cc:556
  msgid ""
  "Usage: apt-ftparchive [options] command\n"
  "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@@ -326,445 -326,445 +326,445 @@@
  "  -o=?  Set an arbitrary configuration option"
  msgstr ""
  
--#: ftparchive/apt-ftparchive.cc:759
++#: ftparchive/apt-ftparchive.cc:762
  msgid "No selections matched"
  msgstr ""
  
--#: ftparchive/apt-ftparchive.cc:832
++#: ftparchive/apt-ftparchive.cc:835
  #, c-format
  msgid "Some files are missing in the package file group `%s'"
  msgstr ""
  
--#: ftparchive/cachedb.cc:43
++#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr ""
  
--#: ftparchive/cachedb.cc:61
++#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr ""
  
--#: ftparchive/cachedb.cc:72
++#: ftparchive/cachedb.cc:76
  msgid ""
  "DB format is invalid. If you upgraded from a older version of apt, please "
  "remove and re-create the database."
  msgstr ""
  
--#: ftparchive/cachedb.cc:77
++#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr ""
  
--#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
--#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
++#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
++#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
  #, c-format
  msgid "Failed to stat %s"
  msgstr ""
  
--#: ftparchive/cachedb.cc:238
++#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr ""
  
--#: ftparchive/cachedb.cc:444
++#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr ""
  
--#: ftparchive/writer.cc:76
++#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr ""
  
--#: ftparchive/writer.cc:81
++#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr ""
  
--#: ftparchive/writer.cc:132
++#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr ""
  
--#: ftparchive/writer.cc:134
++#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr ""
  
--#: ftparchive/writer.cc:141
++#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr ""
  
--#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
++#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr ""
  
--#: ftparchive/writer.cc:170
++#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr ""
  
--#: ftparchive/writer.cc:195
++#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr ""
  
--#: ftparchive/writer.cc:254
++#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr ""
  
--#: ftparchive/writer.cc:262
++#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr ""
  
--#: ftparchive/writer.cc:266
++#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr ""
  
--#: ftparchive/writer.cc:273
++#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr ""
  
--#: ftparchive/writer.cc:283
++#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr ""
  
--#: ftparchive/writer.cc:387
++#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr ""
  
--#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
++#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr ""
  
--#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
++#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr ""
  
--#: ftparchive/writer.cc:620
++#: ftparchive/writer.cc:623
  #, c-format
  msgid "  %s has no source override entry\n"
  msgstr ""
  
--#: ftparchive/writer.cc:624
++#: ftparchive/writer.cc:627
  #, c-format
  msgid "  %s has no binary override entry either\n"
  msgstr ""
  
--#: ftparchive/contents.cc:321
++#: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
  msgstr ""
  
--#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
++#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
  msgid "realloc - Failed to allocate memory"
  msgstr ""
  
--#: ftparchive/override.cc:34 ftparchive/override.cc:142
++#: ftparchive/override.cc:38 ftparchive/override.cc:146
  #, c-format
  msgid "Unable to open %s"
  msgstr ""
  
--#: ftparchive/override.cc:60 ftparchive/override.cc:166
++#: ftparchive/override.cc:64 ftparchive/override.cc:170
  #, c-format
  msgid "Malformed override %s line %lu #1"
  msgstr ""
  
--#: ftparchive/override.cc:74 ftparchive/override.cc:178
++#: ftparchive/override.cc:78 ftparchive/override.cc:182
  #, c-format
  msgid "Malformed override %s line %lu #2"
  msgstr ""
  
--#: ftparchive/override.cc:88 ftparchive/override.cc:191
++#: ftparchive/override.cc:92 ftparchive/override.cc:195
  #, c-format
  msgid "Malformed override %s line %lu #3"
  msgstr ""
  
--#: ftparchive/override.cc:127 ftparchive/override.cc:201
++#: ftparchive/override.cc:131 ftparchive/override.cc:205
  #, c-format
  msgid "Failed to read the override file %s"
  msgstr ""
  
--#: ftparchive/multicompress.cc:72
++#: ftparchive/multicompress.cc:75
  #, c-format
  msgid "Unknown compression algorithm '%s'"
  msgstr ""
  
--#: ftparchive/multicompress.cc:102
++#: ftparchive/multicompress.cc:105
  #, c-format
  msgid "Compressed output %s needs a compression set"
  msgstr ""
  
--#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
++#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
  msgid "Failed to create IPC pipe to subprocess"
  msgstr ""
  
--#: ftparchive/multicompress.cc:195
++#: ftparchive/multicompress.cc:198
  msgid "Failed to create FILE*"
  msgstr ""
  
--#: ftparchive/multicompress.cc:198
++#: ftparchive/multicompress.cc:201
  msgid "Failed to fork"
  msgstr ""
  
--#: ftparchive/multicompress.cc:212
++#: ftparchive/multicompress.cc:215
  msgid "Compress child"
  msgstr ""
  
--#: ftparchive/multicompress.cc:235
++#: ftparchive/multicompress.cc:238
  #, c-format
  msgid "Internal error, failed to create %s"
  msgstr ""
  
--#: ftparchive/multicompress.cc:286
++#: ftparchive/multicompress.cc:289
  msgid "Failed to create subprocess IPC"
  msgstr ""
  
--#: ftparchive/multicompress.cc:321
++#: ftparchive/multicompress.cc:324
  msgid "Failed to exec compressor "
  msgstr ""
  
--#: ftparchive/multicompress.cc:360
++#: ftparchive/multicompress.cc:363
  msgid "decompressor"
  msgstr ""
  
--#: ftparchive/multicompress.cc:403
++#: ftparchive/multicompress.cc:406
  msgid "IO to subprocess/file failed"
  msgstr ""
  
--#: ftparchive/multicompress.cc:455
++#: ftparchive/multicompress.cc:458
  msgid "Failed to read while computing MD5"
  msgstr ""
  
--#: ftparchive/multicompress.cc:472
++#: ftparchive/multicompress.cc:475
  #, c-format
  msgid "Problem unlinking %s"
  msgstr ""
  
--#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
++#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
  #, c-format
  msgid "Failed to rename %s to %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:124
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr ""
  
--#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1655
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:241
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr ""
  
--#: cmdline/apt-get.cc:331
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr ""
  
--#: cmdline/apt-get.cc:333
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr ""
  
--#: cmdline/apt-get.cc:340
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr ""
  
--#: cmdline/apt-get.cc:342
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr ""
  
--#: cmdline/apt-get.cc:345
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr ""
  
--#: cmdline/apt-get.cc:345
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr ""
  
--#: cmdline/apt-get.cc:350
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr ""
  
--#: cmdline/apt-get.cc:379
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr ""
  
--#: cmdline/apt-get.cc:405
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr ""
  
--#: cmdline/apt-get.cc:427
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr ""
  
--#: cmdline/apt-get.cc:448
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr ""
  
--#: cmdline/apt-get.cc:469
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr ""
  
--#: cmdline/apt-get.cc:489
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr ""
  
--#: cmdline/apt-get.cc:542
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr ""
  
--#: cmdline/apt-get.cc:550
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
  msgstr ""
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr ""
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr ""
  
--#: cmdline/apt-get.cc:587
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr ""
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:593
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr ""
  
--#: cmdline/apt-get.cc:670
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr ""
  
--#: cmdline/apt-get.cc:673
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr ""
  
--#: cmdline/apt-get.cc:676
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr ""
  
--#: cmdline/apt-get.cc:678
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr ""
  
--#: cmdline/apt-get.cc:682
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr ""
  
--#: cmdline/apt-get.cc:685
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr ""
  
--#: cmdline/apt-get.cc:707
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr ""
  
--#: cmdline/apt-get.cc:711
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:718
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr ""
  
--#: cmdline/apt-get.cc:720
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr ""
  
--#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr ""
  
--#: cmdline/apt-get.cc:773
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  
--#: cmdline/apt-get.cc:782
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr ""
  
--#: cmdline/apt-get.cc:793
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr ""
  
- #: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1990 cmdline/apt-get.cc:2023
 -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1995 cmdline/apt-get.cc:2028
  msgid "Unable to lock the download directory"
  msgstr ""
  
- #: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2071 cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
--#: apt-pkg/cachefile.cc:65
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2076 cmdline/apt-get.cc:2312
++#: apt-pkg/cachefile.cc:63
  msgid "The list of sources could not be read."
  msgstr ""
  
--#: cmdline/apt-get.cc:834
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  
--#: cmdline/apt-get.cc:839
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:842
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:847
++#: cmdline/apt-get.cc:844
  #, c-format
--msgid "After this operation, %sB of additional disk space will be used.\n"
++msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:850
++#: cmdline/apt-get.cc:847
  #, c-format
--msgid "After this operation, %sB disk space will be freed.\n"
++msgid "After unpacking %sB disk space will be freed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2166
 -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2166
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:871
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr ""
  
--#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr ""
  
--#: cmdline/apt-get.cc:891
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -772,74 -772,74 +772,74 @@@
  " ?] "
  msgstr ""
  
--#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr ""
  
--#: cmdline/apt-get.cc:912
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr ""
  
- #: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2214 apt-pkg/algorithms.cc:1344
 -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2209
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1002
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr ""
  
- #: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2223
 -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2218
  msgid "Download complete and in download only mode"
  msgstr ""
  
--#: cmdline/apt-get.cc:1009
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
  msgstr ""
  
--#: cmdline/apt-get.cc:1013
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr ""
  
--#: cmdline/apt-get.cc:1018
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr ""
  
--#: cmdline/apt-get.cc:1019
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr ""
  
--#: cmdline/apt-get.cc:1053
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1063
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1092
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1104
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr ""
  
--#: cmdline/apt-get.cc:1109
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr ""
  
--#: cmdline/apt-get.cc:1114
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -847,111 -847,121 +847,117 @@@
  "is only available from another source\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr ""
  
--#: cmdline/apt-get.cc:1136
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr ""
  
--#: cmdline/apt-get.cc:1156
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1164
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1193
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr ""
  
--#: cmdline/apt-get.cc:1195
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr ""
  
--#: cmdline/apt-get.cc:1201
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1338
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr ""
  
--#: cmdline/apt-get.cc:1351
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr ""
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412
++msgid ""
++"Some index files failed to download, they have been ignored, or old ones "
++"used instead."
++msgstr ""
++
++#: cmdline/apt-get.cc:1433
  msgid "We are not supposed to delete stuff, can't start AutoRemover"
  msgstr ""
  
--#: cmdline/apt-get.cc:1435
++#: cmdline/apt-get.cc:1465
  msgid ""
  "The following packages were automatically installed and are no longer "
  "required:"
  msgstr ""
  
--#: cmdline/apt-get.cc:1437
++#: cmdline/apt-get.cc:1467
  msgid "Use 'apt-get autoremove' to remove them."
  msgstr ""
  
--#: cmdline/apt-get.cc:1442
++#: cmdline/apt-get.cc:1472
  msgid ""
  "Hmm, seems like the AutoRemover destroyed something which really\n"
  "shouldn't happen. Please file a bug report against apt."
  msgstr ""
  
- #: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1733
 -#.
 -#. if (Packages == 1)
 -#. {
 -#. c1out << endl;
 -#. c1out <<
 -#. _("Since you only requested a single operation it is extremely likely that\n"
 -#. "the package is simply not installable and a bug report against\n"
 -#. "that package should be filed.") << endl;
 -#. }
 -#.
 -#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1736
  msgid "The following information may help to resolve the situation:"
  msgstr ""
  
--#: cmdline/apt-get.cc:1449
++#: cmdline/apt-get.cc:1479
  msgid "Internal Error, AutoRemover broke stuff"
  msgstr ""
  
--#: cmdline/apt-get.cc:1468
++#: cmdline/apt-get.cc:1498
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr ""
  
--#: cmdline/apt-get.cc:1523
++#: cmdline/apt-get.cc:1543
  #, c-format
  msgid "Couldn't find task %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1642 cmdline/apt-get.cc:1678
  #, c-format
  msgid "Couldn't find package %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:1661
++#: cmdline/apt-get.cc:1665
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1692
++#: cmdline/apt-get.cc:1695
  #, c-format
--msgid "%s set to manually installed.\n"
++msgid "%s set to manual installed.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1705
++#: cmdline/apt-get.cc:1708
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr ""
  
--#: cmdline/apt-get.cc:1708
++#: cmdline/apt-get.cc:1711
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
  msgstr ""
  
--#: cmdline/apt-get.cc:1720
++#: cmdline/apt-get.cc:1723
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -959,50 -969,43 +965,50 @@@
  "or been moved out of Incoming."
  msgstr ""
  
- #: cmdline/apt-get.cc:1728
 -#: cmdline/apt-get.cc:1738
++#: cmdline/apt-get.cc:1731
 +msgid ""
 +"Since you only requested a single operation it is extremely likely that\n"
 +"the package is simply not installable and a bug report against\n"
 +"that package should be filed."
 +msgstr ""
 +
- #: cmdline/apt-get.cc:1736
++#: cmdline/apt-get.cc:1739
  msgid "Broken packages"
  msgstr ""
  
- #: cmdline/apt-get.cc:1765
 -#: cmdline/apt-get.cc:1767
++#: cmdline/apt-get.cc:1770
  msgid "The following extra packages will be installed:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1854
 -#: cmdline/apt-get.cc:1856
++#: cmdline/apt-get.cc:1859
  msgid "Suggested packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1855
 -#: cmdline/apt-get.cc:1857
++#: cmdline/apt-get.cc:1860
  msgid "Recommended packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1883
 -#: cmdline/apt-get.cc:1885
++#: cmdline/apt-get.cc:1888
  msgid "Calculating upgrade... "
  msgstr ""
  
- #: cmdline/apt-get.cc:1886 methods/ftp.cc:702 methods/connect.cc:112
 -#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
++#: cmdline/apt-get.cc:1891 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:1891
 -#: cmdline/apt-get.cc:1893
++#: cmdline/apt-get.cc:1896
  msgid "Done"
  msgstr ""
  
- #: cmdline/apt-get.cc:1958 cmdline/apt-get.cc:1966
 -#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
++#: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:1971
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:2066
 -#: cmdline/apt-get.cc:2068
++#: cmdline/apt-get.cc:2071
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  
- #: cmdline/apt-get.cc:2096 cmdline/apt-get.cc:2335
 -#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
++#: cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2330
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr ""
@@@ -1012,106 -1015,106 +1018,106 @@@
  msgid "Skipping already downloaded file '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2173
 -#: cmdline/apt-get.cc:2175
++#: cmdline/apt-get.cc:2169
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2179
 -#: cmdline/apt-get.cc:2181
++#: cmdline/apt-get.cc:2174
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2182
 -#: cmdline/apt-get.cc:2184
++#: cmdline/apt-get.cc:2177
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2188
 -#: cmdline/apt-get.cc:2190
++#: cmdline/apt-get.cc:2183
  #, c-format
  msgid "Fetch source %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2219
 -#: cmdline/apt-get.cc:2221
++#: cmdline/apt-get.cc:2214
  msgid "Failed to fetch some archives."
  msgstr ""
  
- #: cmdline/apt-get.cc:2247
 -#: cmdline/apt-get.cc:2249
++#: cmdline/apt-get.cc:2242
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2259
 -#: cmdline/apt-get.cc:2261
++#: cmdline/apt-get.cc:2254
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2260
 -#: cmdline/apt-get.cc:2262
++#: cmdline/apt-get.cc:2255
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2277
 -#: cmdline/apt-get.cc:2279
++#: cmdline/apt-get.cc:2272
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2296
 -#: cmdline/apt-get.cc:2298
++#: cmdline/apt-get.cc:2291
  msgid "Child process failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:2312
 -#: cmdline/apt-get.cc:2314
++#: cmdline/apt-get.cc:2307
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  
- #: cmdline/apt-get.cc:2340
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2335
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2362
++#: cmdline/apt-get.cc:2355
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2412
 -#: cmdline/apt-get.cc:2414
++#: cmdline/apt-get.cc:2407
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr ""
  
- #: cmdline/apt-get.cc:2465
 -#: cmdline/apt-get.cc:2467
++#: cmdline/apt-get.cc:2459
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
  "package %s can satisfy version requirements"
  msgstr ""
  
- #: cmdline/apt-get.cc:2501
 -#: cmdline/apt-get.cc:2503
++#: cmdline/apt-get.cc:2494
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  
- #: cmdline/apt-get.cc:2526
 -#: cmdline/apt-get.cc:2528
++#: cmdline/apt-get.cc:2519
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2540
 -#: cmdline/apt-get.cc:2542
++#: cmdline/apt-get.cc:2533
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr ""
  
- #: cmdline/apt-get.cc:2544
 -#: cmdline/apt-get.cc:2546
++#: cmdline/apt-get.cc:2537
  msgid "Failed to process build dependencies"
  msgstr ""
  
- #: cmdline/apt-get.cc:2576
 -#: cmdline/apt-get.cc:2578
++#: cmdline/apt-get.cc:2569
  msgid "Supported modules:"
  msgstr ""
  
- #: cmdline/apt-get.cc:2617
 -#: cmdline/apt-get.cc:2619
++#: cmdline/apt-get.cc:2610
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1126,8 -1129,8 +1132,6 @@@
  "   upgrade - Perform an upgrade\n"
  "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
  "   remove - Remove packages\n"
--"   autoremove - Remove automatically all unused packages\n"
--"   purge - Remove and purge packages\n"
  "   source - Download source archives\n"
  "   build-dep - Configure build-dependencies for source packages\n"
  "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@@ -1143,7 -1146,7 +1147,7 @@@
  "  -d  Download only - do NOT install or unpack archives\n"
  "  -s  No-act. Perform ordering simulation\n"
  "  -y  Assume Yes to all queries and do not prompt\n"
--"  -f  Attempt to correct a system with broken dependencies in place\n"
++"  -f  Attempt to continue if the integrity check fails\n"
  "  -m  Attempt to continue if archives are unlocatable\n"
  "  -u  Show a list of upgraded packages as well\n"
  "  -b  Build the source package after fetching it\n"
@@@ -1211,28 -1214,28 +1215,24 @@@ msgstr "
  msgid "Bad default setting!"
  msgstr ""
  
--#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
--#: dselect/install:105 dselect/update:45
++#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
++#: dselect/install:104 dselect/update:45
  msgid "Press enter to continue."
  msgstr ""
  
--#: dselect/install:91
--msgid "Do you want to erase any previously downloaded .deb files?"
--msgstr ""
--
--#: dselect/install:101
++#: dselect/install:100
  msgid "Some errors occurred while unpacking. I'm going to configure the"
  msgstr ""
  
--#: dselect/install:102
++#: dselect/install:101
  msgid "packages that were installed. This may result in duplicate errors"
  msgstr ""
  
--#: dselect/install:103
++#: dselect/install:102
  msgid "or errors caused by missing dependencies. This is OK, only the errors"
  msgstr ""
  
--#: dselect/install:104
++#: dselect/install:103
  msgid ""
  "above this message are important. Please fix them and run [I]nstall again"
  msgstr ""
@@@ -1241,188 -1244,188 +1241,188 @@@
  msgid "Merging available information"
  msgstr ""
  
--#: apt-inst/contrib/extracttar.cc:114
++#: apt-inst/contrib/extracttar.cc:117
  msgid "Failed to create pipes"
  msgstr ""
  
--#: apt-inst/contrib/extracttar.cc:141
++#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr ""
  
--#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
++#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr ""
  
--#: apt-inst/contrib/extracttar.cc:193
++#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr ""
  
--#: apt-inst/contrib/extracttar.cc:296
++#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr ""
  
--#: apt-inst/contrib/arfile.cc:70
++#: apt-inst/contrib/arfile.cc:73
  msgid "Invalid archive signature"
  msgstr ""
  
--#: apt-inst/contrib/arfile.cc:78
++#: apt-inst/contrib/arfile.cc:81
  msgid "Error reading archive member header"
  msgstr ""
  
--#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
++#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
  msgid "Invalid archive member header"
  msgstr ""
  
--#: apt-inst/contrib/arfile.cc:128
++#: apt-inst/contrib/arfile.cc:131
  msgid "Archive is too short"
  msgstr ""
  
--#: apt-inst/contrib/arfile.cc:132
++#: apt-inst/contrib/arfile.cc:135
  msgid "Failed to read the archive headers"
  msgstr ""
  
--#: apt-inst/filelist.cc:380
++#: apt-inst/filelist.cc:384
  msgid "DropNode called on still linked node"
  msgstr ""
  
--#: apt-inst/filelist.cc:412
++#: apt-inst/filelist.cc:416
  msgid "Failed to locate the hash element!"
  msgstr ""
  
--#: apt-inst/filelist.cc:459
++#: apt-inst/filelist.cc:463
  msgid "Failed to allocate diversion"
  msgstr ""
  
--#: apt-inst/filelist.cc:464
++#: apt-inst/filelist.cc:468
  msgid "Internal error in AddDiversion"
  msgstr ""
  
--#: apt-inst/filelist.cc:477
++#: apt-inst/filelist.cc:481
  #, c-format
  msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
  msgstr ""
  
--#: apt-inst/filelist.cc:506
++#: apt-inst/filelist.cc:510
  #, c-format
  msgid "Double add of diversion %s -> %s"
  msgstr ""
  
--#: apt-inst/filelist.cc:549
++#: apt-inst/filelist.cc:553
  #, c-format
  msgid "Duplicate conf file %s/%s"
  msgstr ""
  
--#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
++#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
  #, c-format
  msgid "Failed to write file %s"
  msgstr ""
  
--#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
++#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
  #, c-format
  msgid "Failed to close file %s"
  msgstr ""
  
--#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
++#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
  #, c-format
  msgid "The path %s is too long"
  msgstr ""
  
--#: apt-inst/extract.cc:124
++#: apt-inst/extract.cc:127
  #, c-format
  msgid "Unpacking %s more than once"
  msgstr ""
  
--#: apt-inst/extract.cc:134
++#: apt-inst/extract.cc:137
  #, c-format
  msgid "The directory %s is diverted"
  msgstr ""
  
--#: apt-inst/extract.cc:144
++#: apt-inst/extract.cc:147
  #, c-format
  msgid "The package is trying to write to the diversion target %s/%s"
  msgstr ""
  
--#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
++#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
  msgid "The diversion path is too long"
  msgstr ""
  
--#: apt-inst/extract.cc:240
++#: apt-inst/extract.cc:243
  #, c-format
  msgid "The directory %s is being replaced by a non-directory"
  msgstr ""
  
--#: apt-inst/extract.cc:280
++#: apt-inst/extract.cc:283
  msgid "Failed to locate node in its hash bucket"
  msgstr ""
  
--#: apt-inst/extract.cc:284
++#: apt-inst/extract.cc:287
  msgid "The path is too long"
  msgstr ""
  
--#: apt-inst/extract.cc:414
++#: apt-inst/extract.cc:417
  #, c-format
  msgid "Overwrite package match with no version for %s"
  msgstr ""
  
--#: apt-inst/extract.cc:431
++#: apt-inst/extract.cc:434
  #, c-format
  msgid "File %s/%s overwrites the one in the package %s"
  msgstr ""
  
--#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
++#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:753
  #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
  #: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
  #, c-format
  msgid "Unable to read %s"
  msgstr ""
  
--#: apt-inst/extract.cc:491
++#: apt-inst/extract.cc:494
  #, c-format
  msgid "Unable to stat %s"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
++#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
  #, c-format
  msgid "Failed to remove %s"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
++#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
  #, c-format
  msgid "Unable to create %s"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:114
++#: apt-inst/deb/dpkgdb.cc:118
  #, c-format
  msgid "Failed to stat %sinfo"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:119
++#: apt-inst/deb/dpkgdb.cc:123
  msgid "The info and temp directories need to be on the same filesystem"
  msgstr ""
  
  #. Build the status cache
- #: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748
 -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760
 -#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
 -#: apt-pkg/pkgcachegen.cc:957
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748
 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
 +#: apt-pkg/pkgcachegen.cc:945
  msgid "Reading package lists"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:176
++#: apt-inst/deb/dpkgdb.cc:180
  #, c-format
  msgid "Failed to change to the admin dir %sinfo"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
--#: apt-inst/deb/dpkgdb.cc:444
++#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
++#: apt-inst/deb/dpkgdb.cc:448
  msgid "Internal error getting a package name"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
++#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
  msgid "Reading file listing"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:212
++#: apt-inst/deb/dpkgdb.cc:216
  #, c-format
  msgid ""
  "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@@ -1430,77 -1433,77 +1430,77 @@@
  "package!"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
++#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
  #, c-format
  msgid "Failed reading the list file %sinfo/%s"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:262
++#: apt-inst/deb/dpkgdb.cc:266
  msgid "Internal error getting a node"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:305
++#: apt-inst/deb/dpkgdb.cc:309
  #, c-format
  msgid "Failed to open the diversions file %sdiversions"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:320
++#: apt-inst/deb/dpkgdb.cc:324
  msgid "The diversion file is corrupted"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
--#: apt-inst/deb/dpkgdb.cc:337
++#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
++#: apt-inst/deb/dpkgdb.cc:341
  #, c-format
  msgid "Invalid line in the diversion file: %s"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:358
++#: apt-inst/deb/dpkgdb.cc:362
  msgid "Internal error adding a diversion"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:379
++#: apt-inst/deb/dpkgdb.cc:383
  msgid "The pkg cache must be initialized first"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:439
++#: apt-inst/deb/dpkgdb.cc:443
  #, c-format
  msgid "Failed to find a Package: header, offset %lu"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:461
++#: apt-inst/deb/dpkgdb.cc:465
  #, c-format
  msgid "Bad ConfFile section in the status file. Offset %lu"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:466
++#: apt-inst/deb/dpkgdb.cc:470
  #, c-format
  msgid "Error parsing MD5. Offset %lu"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
++#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
  #, c-format
  msgid "This is not a valid DEB archive, missing '%s' member"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:50
++#: apt-inst/deb/debfile.cc:52
  #, c-format
--msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
++msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:110
++#: apt-inst/deb/debfile.cc:112
  #, c-format
  msgid "Couldn't change to %s"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:140
++#: apt-inst/deb/debfile.cc:138
  msgid "Internal error, could not locate member"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:173
++#: apt-inst/deb/debfile.cc:171
  msgid "Failed to locate a valid control file"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:258
++#: apt-inst/deb/debfile.cc:256
  msgid "Unparsable control file"
  msgstr ""
  
@@@ -1597,7 -1600,7 +1597,7 @@@ msgstr "
  msgid "Server closed the connection"
  msgstr ""
  
- #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190
 -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
++#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
  msgid "Read error"
  msgstr ""
  
@@@ -1609,7 -1612,7 +1609,7 @@@ msgstr "
  msgid "Protocol corruption"
  msgstr ""
  
- #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232
 -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
++#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
  msgid "Write error"
  msgstr ""
  
@@@ -1690,59 -1693,59 +1690,59 @@@ msgstr "
  msgid "Unable to invoke "
  msgstr ""
  
--#: methods/connect.cc:70
++#: methods/connect.cc:64
  #, c-format
  msgid "Connecting to %s (%s)"
  msgstr ""
  
--#: methods/connect.cc:81
++#: methods/connect.cc:71
  #, c-format
  msgid "[IP: %s %s]"
  msgstr ""
  
--#: methods/connect.cc:90
++#: methods/connect.cc:80
  #, c-format
  msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
  msgstr ""
  
--#: methods/connect.cc:96
++#: methods/connect.cc:86
  #, c-format
  msgid "Cannot initiate the connection to %s:%s (%s)."
  msgstr ""
  
--#: methods/connect.cc:104
++#: methods/connect.cc:93
  #, c-format
  msgid "Could not connect to %s:%s (%s), connection timed out"
  msgstr ""
  
--#: methods/connect.cc:119
++#: methods/connect.cc:108
  #, c-format
  msgid "Could not connect to %s:%s (%s)."
  msgstr ""
  
  #. We say this mainly because the pause here is for the
  #. ssh connection that is still going
--#: methods/connect.cc:147 methods/rsh.cc:425
++#: methods/connect.cc:136 methods/rsh.cc:425
  #, c-format
  msgid "Connecting to %s"
  msgstr ""
  
--#: methods/connect.cc:165 methods/connect.cc:184
++#: methods/connect.cc:167
  #, c-format
  msgid "Could not resolve '%s'"
  msgstr ""
  
--#: methods/connect.cc:190
++#: methods/connect.cc:173
  #, c-format
  msgid "Temporary failure resolving '%s'"
  msgstr ""
  
--#: methods/connect.cc:193
++#: methods/connect.cc:176
  #, c-format
  msgid "Something wicked happened resolving '%s:%s' (%i)"
  msgstr ""
  
--#: methods/connect.cc:240
++#: methods/connect.cc:223
  #, c-format
  msgid "Unable to connect to %s %s:"
  msgstr ""
@@@ -1767,7 -1770,7 +1767,7 @@@ msgstr "
  
  #: methods/gpgv.cc:214
  #, c-format
--msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
++msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
  msgstr ""
  
  #: methods/gpgv.cc:219
@@@ -1876,7 -1883,11 +1876,7 @@@ msgstr "
  msgid "Couldn't make mmap of %lu bytes"
  msgstr ""
  
 -#: apt-pkg/contrib/mmap.cc:213
 -msgid "Dynamic MMap ran out of room"
 -msgstr ""
 -
--#: apt-pkg/contrib/strutl.cc:1014
++#: apt-pkg/contrib/strutl.cc:978
  #, c-format
  msgid "Selection %s not found"
  msgstr ""
@@@ -1891,42 -1902,42 +1891,47 @@@ msgstr "
  msgid "Opening configuration file %s"
  msgstr ""
  
--#: apt-pkg/contrib/configuration.cc:662
++#: apt-pkg/contrib/configuration.cc:515
++#, c-format
++msgid "Line %d too long (max %u)"
++msgstr ""
++
++#: apt-pkg/contrib/configuration.cc:611
  #, c-format
  msgid "Syntax error %s:%u: Block starts with no name."
  msgstr ""
  
--#: apt-pkg/contrib/configuration.cc:681
++#: apt-pkg/contrib/configuration.cc:630
  #, c-format
  msgid "Syntax error %s:%u: Malformed tag"
  msgstr ""
  
--#: apt-pkg/contrib/configuration.cc:698
++#: apt-pkg/contrib/configuration.cc:647
  #, c-format
  msgid "Syntax error %s:%u: Extra junk after value"
  msgstr ""
  
--#: apt-pkg/contrib/configuration.cc:738
++#: apt-pkg/contrib/configuration.cc:687
  #, c-format
  msgid "Syntax error %s:%u: Directives can only be done at the top level"
  msgstr ""
  
--#: apt-pkg/contrib/configuration.cc:745
++#: apt-pkg/contrib/configuration.cc:694
  #, c-format
  msgid "Syntax error %s:%u: Too many nested includes"
  msgstr ""
  
--#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
++#: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:703
  #, c-format
  msgid "Syntax error %s:%u: Included from here"
  msgstr ""
  
--#: apt-pkg/contrib/configuration.cc:758
++#: apt-pkg/contrib/configuration.cc:707
  #, c-format
  msgid "Syntax error %s:%u: Unsupported directive '%s'"
  msgstr ""
  
--#: apt-pkg/contrib/configuration.cc:809
++#: apt-pkg/contrib/configuration.cc:741
  #, c-format
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr ""
@@@ -2001,70 -2013,70 +2006,70 @@@ msgstr "
  msgid "Failed to stat the cdrom"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:147
 -#: apt-pkg/contrib/fileutl.cc:149
++#: apt-pkg/contrib/fileutl.cc:82
  #, c-format
  msgid "Not using locking for read only lock file %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:152
 -#: apt-pkg/contrib/fileutl.cc:154
++#: apt-pkg/contrib/fileutl.cc:87
  #, c-format
  msgid "Could not open lock file %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:170
 -#: apt-pkg/contrib/fileutl.cc:172
++#: apt-pkg/contrib/fileutl.cc:105
  #, c-format
  msgid "Not using locking for nfs mounted lock file %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:174
 -#: apt-pkg/contrib/fileutl.cc:176
++#: apt-pkg/contrib/fileutl.cc:109
  #, c-format
  msgid "Could not get lock %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:442
 -#: apt-pkg/contrib/fileutl.cc:444
++#: apt-pkg/contrib/fileutl.cc:377
  #, c-format
  msgid "Waited for %s but it wasn't there"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:452
 -#: apt-pkg/contrib/fileutl.cc:454
++#: apt-pkg/contrib/fileutl.cc:387
  #, c-format
  msgid "Sub-process %s received a segmentation fault."
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:455
 -#: apt-pkg/contrib/fileutl.cc:457
++#: apt-pkg/contrib/fileutl.cc:390
  #, c-format
  msgid "Sub-process %s returned an error code (%u)"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:457
 -#: apt-pkg/contrib/fileutl.cc:459
++#: apt-pkg/contrib/fileutl.cc:392
  #, c-format
  msgid "Sub-process %s exited unexpectedly"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:501
 -#: apt-pkg/contrib/fileutl.cc:503
++#: apt-pkg/contrib/fileutl.cc:436
  #, c-format
  msgid "Could not open file %s"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:557
 -#: apt-pkg/contrib/fileutl.cc:559
++#: apt-pkg/contrib/fileutl.cc:492
  #, c-format
  msgid "read, still have %lu to read but none left"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:587
 -#: apt-pkg/contrib/fileutl.cc:589
++#: apt-pkg/contrib/fileutl.cc:522
  #, c-format
  msgid "write, still have %lu to write but couldn't"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:662
 -#: apt-pkg/contrib/fileutl.cc:664
++#: apt-pkg/contrib/fileutl.cc:597
  msgid "Problem closing the file"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:668
 -#: apt-pkg/contrib/fileutl.cc:670
++#: apt-pkg/contrib/fileutl.cc:603
  msgid "Problem unlinking the file"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:679
 -#: apt-pkg/contrib/fileutl.cc:681
++#: apt-pkg/contrib/fileutl.cc:614
  msgid "Problem syncing the file"
  msgstr ""
  
@@@ -2246,22 -2258,22 +2251,16 @@@ msgid "
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1106
 -#: apt-pkg/algorithms.cc:1107
++#: apt-pkg/algorithms.cc:1105
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1108
 -#: apt-pkg/algorithms.cc:1109
++#: apt-pkg/algorithms.cc:1107
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1370 apt-pkg/algorithms.cc:1372
 -#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
--msgid ""
--"Some index files failed to download, they have been ignored, or old ones "
--"used instead."
--msgstr ""
--
  #: apt-pkg/acquire.cc:59
  #, c-format
  msgid "Lists directory %spartial is missing."
@@@ -2294,7 -2306,7 +2293,7 @@@ msgstr "
  msgid "Method %s did not start correctly"
  msgstr ""
  
--#: apt-pkg/acquire-worker.cc:399
++#: apt-pkg/acquire-worker.cc:398
  #, c-format
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
@@@ -2317,11 -2329,11 +2316,11 @@@ msgstr "
  msgid "You must put some 'source' URIs in your sources.list"
  msgstr ""
  
--#: apt-pkg/cachefile.cc:71
++#: apt-pkg/cachefile.cc:69
  msgid "The package lists or status file could not be parsed or opened."
  msgstr ""
  
--#: apt-pkg/cachefile.cc:75
++#: apt-pkg/cachefile.cc:73
  msgid "You may want to run apt-get update to correct these problems"
  msgstr ""
  
@@@ -2522,8 -2534,8 +2521,8 @@@ msgstr "
  #: apt-pkg/cdrom.cc:678
  #, c-format
  msgid ""
--"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
--"zu signatures\n"
++"Found %u package indexes, %u source indexes, %u translation indexes and %u "
++"signatures\n"
  msgstr ""
  
  #: apt-pkg/cdrom.cc:715
@@@ -2574,79 -2586,78 +2573,68 @@@ msgstr "
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:486
 -#: apt-pkg/deb/dpkgpm.cc:49
 -#, c-format
 -msgid "Installing %s"
 -msgstr ""
 -
 -#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
 -#, c-format
 -msgid "Configuring %s"
 -msgstr ""
 -
 -#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
 -#, c-format
 -msgid "Removing %s"
 -msgstr ""
 -
 -#: apt-pkg/deb/dpkgpm.cc:52
 -#, c-format
 -msgid "Running post-installation trigger %s"
 -msgstr ""
 -
 -#: apt-pkg/deb/dpkgpm.cc:521
++#: apt-pkg/deb/dpkgpm.cc:513
  #, c-format
  msgid "Directory '%s' missing"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:569
 -#: apt-pkg/deb/dpkgpm.cc:605
++#: apt-pkg/deb/dpkgpm.cc:596
  #, c-format
  msgid "Preparing %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:570
 -#: apt-pkg/deb/dpkgpm.cc:606
++#: apt-pkg/deb/dpkgpm.cc:597
  #, c-format
  msgid "Unpacking %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:575
 -#: apt-pkg/deb/dpkgpm.cc:611
++#: apt-pkg/deb/dpkgpm.cc:602
  #, c-format
  msgid "Preparing to configure %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605
 -#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
++#: apt-pkg/deb/dpkgpm.cc:603
 +#, c-format
 +msgid "Configuring %s"
 +msgstr ""
 +
- #: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579
++#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606
  #, c-format
  msgid "Processing triggers for %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:581
 -#: apt-pkg/deb/dpkgpm.cc:617
++#: apt-pkg/deb/dpkgpm.cc:608
  #, c-format
  msgid "Installed %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588
- #: apt-pkg/deb/dpkgpm.cc:589
 -#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
 -#: apt-pkg/deb/dpkgpm.cc:625
++#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615
++#: apt-pkg/deb/dpkgpm.cc:616
  #, c-format
  msgid "Preparing for removal of %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606
 -#: apt-pkg/deb/dpkgpm.cc:628
++#: apt-pkg/deb/dpkgpm.cc:618
 +#, c-format
 +msgid "Removing %s"
 +msgstr ""
 +
- #: apt-pkg/deb/dpkgpm.cc:592
++#: apt-pkg/deb/dpkgpm.cc:619
  #, c-format
  msgid "Removed %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:597
 -#: apt-pkg/deb/dpkgpm.cc:633
++#: apt-pkg/deb/dpkgpm.cc:624
  #, c-format
  msgid "Preparing to completely remove %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:598
 -#: apt-pkg/deb/dpkgpm.cc:634
++#: apt-pkg/deb/dpkgpm.cc:625
  #, c-format
  msgid "Completely removed %s"
  msgstr ""
  
- #. populate the "processing" map
- #: apt-pkg/deb/dpkgpm.cc:604
- #, c-format
- msgid "Installing %s"
- msgstr ""
- 
- #: apt-pkg/deb/dpkgpm.cc:607
- #, c-format
- msgid "Triggering %s"
- msgstr ""
- 
- #: apt-pkg/deb/dpkgpm.cc:756
 -#: apt-pkg/deb/dpkgpm.cc:791
++#: apt-pkg/deb/dpkgpm.cc:775
  msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
  msgstr ""