merged from lp:~donkult/apt/sid

diff --cc debian/changelog
index 1e8d247565597c0401fcfd89cf2e6a2a1fa5555c,5916101087b6aa9bf4d6eeeef6deb7e51d1807da..b64594c2ca57909f43589510be90876fd35c9eae
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -3,19 -3,64 +3,75 @@@ apt (0.8.14.2) UNRELEASED; urgency=lo
    [ Julian Andres Klode ]
    * apt-pkg/depcache.cc:
      - Really release action groups only once (Closes: #622744)
 +    - Make purge work again for config-files (LP: #244598) (Closes: #150831)
 +  * debian/apt.cron.daily:
 +    - Check power after wait, patch by manuel-soto (LP: #705269)
 +  * debian/control:
 +    - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
 +      unpacked if a library is too old and thus break upgrades
 +  * doc/apt-key.8.xml:
 +    - Document apt-key net-update (LP: #192810)
 +
 +  [ Christian Perrier ]
 +  * Galician translation update (Miguel Anxo Bouzada). Closes: #626505
  
-  -- Julian Andres Klode <jak@debian.org>  Mon, 18 Apr 2011 10:54:11 +0200
+   [ David Kalnischkies ]
+   * fix a bunch of cppcheck warnings/errors based on a patch by
+     Niels Thykier, thanks! (Closes: #622805)
+   * apt-pkg/depcache.cc:
+     - really include 'rc' packages in the delete count by fixing a
+       typo which exists since 1999 in the source… (LP: #761175)
+     - if critical or-group can't be satisfied, exit directly.
+   * apt-pkg/acquire-method.cc:
+     - write directly to stdout instead of creating the message in
+       memory first before writing to avoid hitting limits
+     - fix order of CurrentURI and UsedMirror in Status() and Log()
+   * apt-pkg/orderlist.cc:
+     - let VisitRProvides report if the calls were successful
+   * apt-pkg/deb/dpkgpm.cc:
+     - replace obsolete usleep with nanosleep
+   * debian/apt{,-utils}.symbols:
+     - update both experimental symbol-files to reflect 0.8.14 state
+   * debian/rules:
+     - remove unused embedded jquery by doxygen from libapt-pkg-doc
+   * cmdline/apt-mark.cc:
+     - reimplement apt-mark in c++
+     - provide a 'showmanual' command (Closes: #582791)
+     - provide a 'dpkg --set-selections' wrapper to set/release holds
+   * cmdline/apt-get.cc:
+     - deprecate mostly undocumented 'markauto' in favor of 'apt-mark'
+   * cmdline/apt-cache.cc:
+     - deprecate mostly undocumented 'showauto' in favor of 'apt-mark'
+   * apt-pkg/pkgcache.cc:
+     - really ignore :arch in FindPkg() in non-multiarch environment
+   * doc/po/de.po:
+     - undo the translation of the command 'dump' in manpage of apt-config
+       as report by Burghard Grossmann on debian-l10n-german, thanks!
+   * apt-pkg/deb/debmetaindex.cc:
+     - do not download TranslationIndex if no Translation-* will be
+       downloaded later on anyway (Closes: #624218)
+   * test/versions.lst:
+     - disable obscure version number tests with versions dpkg doesn't
+       allow any more as they don't start with a number
+   * apt-pkg/acquire-worker.cc:
+     - print filename in the unmatching size warning (Closes: #623137)
+   * apt-pkg/acquire-item.cc:
+     - apply fix for poorly worded 'locate file' error message from
+       Ben Finney, thanks! (Closes: #623171)
+   * methods/http.cc:
+     - add config option to ignore a closed stdin to be able to easily
+       use the method as a simple standalone downloader
+     - Location header in redirects should be absolute URI, but some
+       servers just send an absolute path so still deal with it properly
+     - dequote URL taken from Location in redirects as we will otherwise
+       quote an already quoted string in the request later (Closes: #602412)
+   * apt-pkg/contrib/netrc.cc:
+     - replace non-posix gnu-extension strdupa with strdup
+   * apt-pkg/packagemanager.cc:
+     - ensure for Multi-Arch:same packages that they are unpacked in
+       lock step even in immediate configuration (Closes: #618288)
+ 
 - -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 16 May 2011 11:41:05 +0200
++ -- Michael Vogt <mvo@debian.org>  Mon, 16 May 2011 14:57:52 +0200
  
  apt (0.8.14.1) unstable; urgency=low
  

diff --cc po/gl.po
index 1d32e5a6bd8b1908d9611ce35755e9845316682d,43b059907e279fa193a8f236cb4b11c40dd937a6..7de0e5d8cec8b83ed0bfe2cad63a77262a9d5a74
--- 1/po/gl.po
--- 2/po/gl.po
+++ b/po/gl.po
@@@ -3085,19 -3004,19 +3085,19 @@@ msgid "
  "I wasn't able to locate a file for the %s package. This might mean you need "
  "to manually fix this package. (due to missing arch)"
  msgstr ""
 -"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
 -"ten que arranxar este paquete a man. (Falla a arquitectura)"
 +"Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que "
 +"ten que arranxar este paquete a man. (Falta a arquitectura)"
  
 -#: apt-pkg/acquire-item.cc:1631
 +#: apt-pkg/acquire-item.cc:1424
  #, c-format
  msgid ""
- "I wasn't able to locate file for the %s package. This might mean you need to "
- "manually fix this package."
+ "I wasn't able to locate a file for the %s package. This might mean you need "
+ "to manually fix this package."
  msgstr ""
 -"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
 +"Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que "
  "ten que arranxar este paquete a man."
  
 -#: apt-pkg/acquire-item.cc:1686
 +#: apt-pkg/acquire-item.cc:1479
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."