merged from lp:~donkult/apt/sid

diff --cc apt-pkg/deb/dpkgpm.cc
Simple merge

diff --cc apt-pkg/packagemanager.cc
Simple merge

diff --cc apt-pkg/policy.cc
Simple merge

diff --cc cmdline/apt-cache.cc
Simple merge

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc cmdline/apt-mark
Simple merge

diff --cc debian/changelog
index f166b7d32a8024e5c654477d92ba4161be86dd5f,205db85e0d2574751b860f25d06ad26776f867e5..49987385aea20abdfd9e5961699b838cb2540bca
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -8,11 -8,69 +8,73 @@@ apt (0.7.26~exp3) UNRELEASED; urgency=l
    * Add "manpages-pl (<< 20060617-3~)" to avoid file conflicts with
      that package that was providing some manpages for APT utilities.
  
+   [ David Kalnischkies ]
+   * [BREAK] merge MultiArch-ABI. We don't support MultiArch,
+     but we support the usage of the new ABI so libapt users
+     can start to prepare for MultiArch (Closes: #536029)
+   * Ignore :qualifiers after package name in build dependencies
+     in the library by default, but try to honour them in apt-get
+     as we have some sort of MultiArch support ready (Closes: #558103)
+   * add translation of the manpages to PT (portuguese)
+     Thanks to Américo Monteiro!
+   * Switch to dpkg-source 3.0 (native) format
+   * apt-pkg/depcache.cc:
+     - remove Auto-Installed information from extended_states
+       together with the package itself (Closes: #572364)
+   * cmdline/apt-mark:
+     - don't crash if no arguments are given (Closes: #570962)
+   * debian/control:
+     - remove some years old and obsolete Replaces
+     - add automake/conf build-depends/conflicts as recommend by
+       the autotools-dev README (Closes: #572615)
+   * apt-pkg/contrib/mmap.{h,cc}:
+     - add char[] fallback for filesystems without shared writable
+       mmap() like JFFS2. Thanks to Marius Vollmer for writing
+       and to Loïc Minier for pointing to the patch! (Closes: #314334)
+   * doc/apt_preferences.5.xml:
+     - fix two typos and be more verbose in the novice warning.
+       Thanks to Osamu Aoki for pointing it out! (Closes: #567669)
+     - fix a=sid vs. n=sid typo, thanks Ansgar Burchardt!
+     - origin can be used to match a hostname (Closes: #352667)
+     - remove wrong pin-priority is optional remark (Closes: #574944)
+   * apt-pkg/deb/dpkgpm.cc:
+     - fix error message construction in OpenLog()
+     - if available store the Commandline in the history
+   * cmdline/apt-get.cc:
+     - add a --only-upgrade flag to install command (Closes: #572259)
+     - fix memory leaks in error conditions in DoSource()
+     - try version match in FindSrc first exact than fuzzy (LP: #551178)
+   * apt-pkg/contrib/cmndline.cc:
+     - save Commandline in Commandline::AsString for logging
+   * apt-pkg/deb/debversion.cc:
+     - consider absent of debian revision equivalent to 0 (Closes: #573592)
+   * doc/makefile, doc/*:
+     - generate subdirectories for building the manpages in on the fly
+       depending on the po files we have.
+   * apt-pkg/pkgcachegen.cc:
+     - merge versions correctly even if multiple different versions
+       with the same version number are available.
+       Thanks to Magnus Holmgren for the patch! (Closes: #351056)
+   * ftparchive/writer.cc:
+     - write LongDescriptions if they shouldn't be included in Packages
+       file into i18n/Translation-en by default.
+   * doc/po/de.po:
+     - correct a few typos in the german manpage translation.
+       Thanks to Chris Leick and Georg Koppen! (Closes: #574962)
+   * apt-pkg/contrib/strutl.cc:
+     - convert all toupper calls to tolower_ascii for a little speedup
+ 
+   [ Jean-Baptiste Lallement ]
+   * apt-pkg/contrib/strutl.cc:
+     - always escape '%' (LP: #130289) (Closes: #500560)
+     - unescape '%' sequence only if followed by 2 hex digit
+     - username/password are urlencoded in proxy string (RFC 3986)
+ 
    [ Julian Andres Klode ]
 +  * cmdline/apt-cache.cc:
 +    - Change behavior of showsrc to match the one of show (Closes: #512046).
 +  * cmdline/apt-key:
 +    - Honor Apt::GPGV::TrustedKeyring (Closes: #316390)
    * cmdline/apt-mark:
      - Use the new python-apt API (and conflict with python-apt << 0.7.93.2).
    * apt-inst/contrib/arfile.h:

diff --cc doc/examples/configure-index
Simple merge

diff --cc doc/po/fr.po
index 9a076f2b3ca3cc5ed0dd0db78e86f81871a045ec,6e31871ebc29c4df97cf545c005d2a5ce0f8a382..d1704e2e72860062d6a25ef7d8d36c35a496324b
--- 1/doc/po/fr.po
--- 2/doc/po/fr.po
+++ b/doc/po/fr.po
@@@ -4671,11 -4709,10 +4704,11 @@@ msgid "
  msgstr ""
  "Utiliser « purge » à la place de « remove » pour supprimer tout ce qui peut "
  "être supprimé. Un astérisque (*) sera accolé aux noms des paquets qui vont "
 -"être purgés. Élément de configuration : <literal>APT::Get::Purge</literal>."
 +"être purgés. <option>remove --purge</option> est équivalent à la commande <option>purge</option>. "
 +"Élément de configuration : <literal>APT::Get::Purge</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
- #: apt-get.8.xml:474
+ #: apt-get.8.xml:481
  msgid "<option>--reinstall</option>"
  msgstr "<option>--reinstall</option>"
  
@@@ -8022,14 -8065,14 +8055,17 @@@ msgid "
  "not questioning the preferences so wrong settings will therefore lead to "
  "uninstallable packages or wrong decisions while upgrading packages.  Even "
  "more problems will arise if multiply distribution releases are mixed without "
- "a good understanding of the following paragraphs.  You have been warned."
+ "a good understanding of the following paragraphs.  Packages included in a "
+ "specific release aren't tested in and therefore doesn't always work as "
+ "expected in older or newer releases or together with other packages from "
+ "different releases.  You have been warned."
  msgstr ""
 +"Les préférences sont un outil puissant pour les administrateurs système mais peuvent devenir leur pire cauchemar si elles sont utilisées sans précautions. APT ne remettra "
 +"pas en doute les réglages choisis. Des valeurs erronées pourront alors conduire à des paquets non installables ou à des décisions incorrectes lors de la mise à jour des "
 +"paquets. Des problèmes supplémentaires peuvent survenir si des distributions multiples sont mélangées sans une bonne compréhension des paragraphes qui suivent."
  
  #. type: Content of: <refentry><refsect1><para>
- #: apt_preferences.5.xml:64
+ #: apt_preferences.5.xml:67
  msgid ""
  "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
  "directory are parsed in alphanumeric ascending order and need to obey the "
@@@ -8038,12 -8081,9 +8074,12 @@@
  "underscore (_) and period (.) characters - otherwise they will be silently "
  "ignored."
  msgstr ""
 +"Veuillez noter que les fichiers du répertoire <filename>/etc/apt/preferences.d</filename> sont analysés par ordre alphanumérique ascendant, doivent avoir l'extension \"<"
 +"literal>pref</literal>\" ou aucune extension et ne peuvent continir que des caractères alphanumériques, des tirets (-), des caractères de soulignement (_) et des points (."
 +"). Dans le cas contraire, ils seront ignorés sans avertissement."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:71
+ #: apt_preferences.5.xml:74
  msgid "APT's Default Priority Assignments"
  msgstr "Priorités affectées par défaut"
  
@@@ -8598,12 -8639,13 +8634,12 @@@ msgstr "
  "paquet n'est déjà installée."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
- #: apt_preferences.5.xml:321
+ #: apt_preferences.5.xml:324
  msgid "Determination of Package Version and Distribution Properties"
 -msgstr ""
 -"Détermination de la version des paquets et des propriétés des distributions"
 +msgstr "Détermination de la version des paquets et des propriétés des distributions"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
- #: apt_preferences.5.xml:323
+ #: apt_preferences.5.xml:326
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "

diff --cc ftparchive/apt-ftparchive.cc
Simple merge