merged from debian

diff --cc apt-pkg/acquire-item.cc
Simple merge

diff --cc apt-pkg/acquire-item.h
index de657ecc4c7b6c1b70caff57a016a4f95f91d178,3f073de5bee0058afc202feb04c7904a02bedf49..06fcffc73db66422abd655f9e26c6eb0456ed62e
--- 1/apt-pkg/acquire-item.h
--- 2/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@@ -552,11 -540,12 +552,13 @@@ class pkgAcqIndex : public pkgAcquire::
      *
      *  \param compressExt The compression-related extension with which
      *  this index file should be downloaded, or "" to autodetect
-     *  (".bz2" is used if bzip2 is installed, ".gz" otherwise).
+     *  Compression types can be set with config Acquire::CompressionTypes,
+     *  default is ".lzma" or ".bz2" (if the needed binaries are present)
+     *  fallback is ".gz" or none.
      */
     pkgAcqIndex(pkgAcquire *Owner,string URI,string URIDesc,
 -             string ShortDesc, HashString ExpectedHash, string compressExt="");
 +             string ShortDesc, HashString ExpectedHash, 
 +             string compressExt="");
  };
                                                                        /*}}}*/
  /** \brief An acquire item that is responsible for fetching a         {{{

diff --cc apt-pkg/deb/dpkgpm.cc
index 3e23720e02c3e89cb5987fb2999c0e652b9c4c0d,aec4edc49f7ccd2b70aa9699da15a5ea37b3ea62..d6fbfa72ee2ed378409e6059120b388731a87b59
--- 1/apt-pkg/deb/dpkgpm.cc
--- 2/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -462,13 -464,11 +473,13 @@@ void pkgDPkgPM::ProcessDpkgStatusLine(i
             << endl;
        if(OutStatusFd > 0)
         write(OutStatusFd, status.str().c_str(), status.str().size());
-       if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+       if (Debug == true)
         std::clog << "send: '" << status.str() << "'" << endl;
 +      pkgFailures++;
 +      WriteApportReport(list[1], list[3]);
        return;
     }
-    if(strncmp(action,"conffile",strlen("conffile")) == 0)
+    else if(strncmp(action,"conffile",strlen("conffile")) == 0)
     {
        status << "pmconffile:" << list[1]
             << ":"  << (PackagesDone/float(PackagesTotal)*100.0) 

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

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

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

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

diff --cc debian/changelog
index 160210dac95f929c8fd04b00044c54719fbfccc4,90e5f8de1661f8314d3c9b3285f2cc8145567138..9b2004b5757310030dd33d3e9a05840f8a02fcfe
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,125 +1,150 @@@
- apt (0.7.22.3) UNRELEASED; urgency=low
++apt (0.7.24ubuntu1) UNRELEASED; urgency=low
 +
-   [ Eugene V. Lyubimkin ]
-   * methods/{http,https,ftp}, doc/apt.conf.5.xml:
-     - Changed and unified the code that determines which proxy to use. Now
-       'Acquire::{http,ftp}::Proxy[::<host>]' options have the highest priority,
-       and '{http,ftp}_proxy' environment variables are used only if options
-       mentioned above are not specified.
-       (Closes: #445985, #157759, #320184, #365880, #479617)
-   
 +  [ Michael Vogt ]
 +  * apt-pkg/pkgcache.cc:
 +    - do not set internel "needs-configure" state for packages in 
 +      triggers-pending state. dpkg will deal with the trigger and
 +      it if does it before we trigger it, dpkg will error out
 +      (LP: #414631)
 +
 +  [ Matt Zimmerman ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - Suppress apport reports on dpkg short reads (these I/O errors are not 
 +      generally indicative of a bug in the packaging)
 +
 +  [ Brian Murray ]
 +  * cmdline/apt-get.cc:
 +    - typo fix (LP: #370094)
 +
 +  [ Loïc Minier ]
 +  * cmdline/apt-key:
 +    - Emit a warning if removed keys keyring is missing and skip associated
 +      checks (LP: #218971)
 +
-  -- Michael Vogt <mvo@debian.org>  Wed, 19 Aug 2009 11:14:15 +0200
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 23 Sep 2009 17:24:20 +0200
++
+ apt (0.7.24) UNRELEASED; urgency=low
+ 
+   [ Nicolas François ]
+   * Cleaned up the first patch draft from KURASAWA Nozomu to finally
+     get po4a support for translating the man pages.
+     Many thanks to both for this excellent work! (Closes: #441608)
+   * doc/ja/*, doc/po/ja.po:
+     - remove the old ja man page translation and replace it with
+       the new po4a-powered translation by KURASAWA Nozomu.
+   * doc/*.?.xml (manpages):
+     - add contrib to author tags and also add refmiscinfo to fix warnings
+   * doc/style.txt, buildlib/defaults.mak, buildlib/manpage.mak:
+     - fix a few typos in the comments of this files
+ 
+   [ David Kalnischkies ]
+   * doc/Doxyfile.in:
+     - update file with doxygen 1.6.1 (current unstable)
+     - activate DOT_MULTI_TARGETS, it is default on since doxygen 1.5.9
+   * buildlib/po4a_manpage.mak, doc/makefile, configure:
+     - simplify the makefiles needed for po4a manpages
+   * apt-pkg/contrib/configuration.cc:
+     - add a helper to easily get a vector of strings from the config
+   * apt-pkg/contrib/strutl.cc:
+     - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208)
+   * doc/apt-get.8.xml:
+     - fix two little typos in the --simulate description.
+   * apt-pkg/aptconfiguration.cc, doc/apt.conf.5.xml:
+     - add an order subgroup to the compression types to simplify reordering
+       a bit and improve the documentation for this option group.
+   * doc/apt.ent, all man pages:
+     - move the description of files to globally usable entities
+   * doc/apt_preferences.5.xml:
+     - document the new preferences.d folder (Closes: #544017)
+   * methods/rred.cc:
+     - add at the top without failing (by Bernhard R. Link, Closes: #545694)
+   * buildlib/sizetable:
+     - add amd64 for cross building (by Mikhail Gusarov, Closes: #513058)
+   * debian/prerm:
+     - remove file as nobody will upgrade from 0.4.10 anymore
+   * debian/control:
+     - remove gnome-apt suggestion as it was removed from debian
+   * apt-pkg/deb/dpkgpm.cc, apt-pkg/packagemanager.cc, apt-pkg/orderlist.cc:
+     - add and document _experimental_ options to make (aggressive)
+       use of dpkg's trigger and configuration handling (Closes: #473461)
+ 
+   [ Christian Perrier ]
+   * doc/fr/*, doc/po/fr.po:
+     - remove the old fr man page translation and replace it with
+       the new po4a-powered translation
+   * doc/pl, doc/de: dropped (pl translation is useless as the translated
+     document is not provideed anymore and the de translation is too
+     incomplete to be used)
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 28 Aug 2009 09:40:08 +0200
+ 
+ apt (0.7.23.1) unstable; urgency=low
+ 
+   [ Michael Vogt ]
+   * apt-pkg/pkgcache.cc:
+     - do not set internel "needs-configure" state for packages in 
+       triggers-pending state. dpkg will deal with the trigger and
+       it if does it before we trigger it, dpkg will error out
+       (LP: #414631)
+   * apt-pkg/acquire-item.cc:
+     - do not segfault on invalid items (closes: #544080)
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 28 Aug 2009 21:53:20 +0200
+ 
+ apt (0.7.23) unstable; urgency=low
+ 
+   [ Eugene V. Lyubimkin ]
+   * methods/{http,https,ftp}, doc/apt.conf.5.xml:
+     - Changed and unified the code that determines which proxy to use. Now
+       'Acquire::{http,ftp}::Proxy[::<host>]' options have the highest priority,
+       and '{http,ftp}_proxy' environment variables are used only if options
+       mentioned above are not specified.
+       (Closes: #445985, #157759, #320184, #365880, #479617)
+   
+   [ David Kalnischkies ]
+   * cmdline/apt-get.cc:
+     - add APT::Get::HideAutoRemove=small to display only a short line
+       instead of the full package list. (Closes: #537450)
+     - ShowBroken() in build-dep (by Mike O'Connor, Closes: #145916)
+     - check for statfs.f_type (by Robert Millan, Closes: #509313)
+     - correct the order of picked package binary vs source in source
+     - use SourceVersion instead of the BinaryVersion to get the source
+       Patch by Matt Kraai, thanks! (Closes: #382826)
+     - add pkg/archive and codename in source (Closes: #414105, #441178)
+   * apt-pkg/contrib/strutl.cc:
+     - enable thousand separator according to the current locale
+       (by Luca Bruno, Closes: #223712)
+   * doc/apt.conf.5.xml:
+     - mention the apt.conf.d dir (by Vincent McIntyre, Closes: #520831)
+   * apt-inst/contrib/arfile.cc:
+     - use sizeof instead strlen (by Marius Vollmer, Closes: #504325)
+   * doc/apt-mark.8.xml:
+     - improve manpage based on patch by Carl Chenet (Closes: #510286)
+   * apt-pkg/acquire-item.cc:
+     - use configsettings for dynamic compression type use and order.
+       Based on a patch by Jyrki Muukkonen, thanks! (LP: #71746)
+   * apt-pkg/aptconfiguration.cc:
+     - add default configuration for compression types and add lzma
+       support. Order is now bzip2, lzma, gzip, none (Closes: #510526)
+   * ftparchive/writer.cc:
+     - add lzma support also here, patch for this (and inspiration for
+       the one above) by Robert Millan, thanks!
+   * apt-pkg/depcache.cc:
+     - restore the --ignore-hold effect in the Is{Delete,Install}Ok hooks
+   * doc/apt-get.8.xml:
+     - update the source description to reflect what it actually does
+       and how it can be used. (Closes: #413021)
+   * methods/http.cc:
+     - allow empty Reason-Phase in Status-Line to please squid,
+       thanks Modestas Vainius for noticing! (Closes: #531157, LP: #411435)
+ 
+   [ George Danchev ]
+   * cmdline/apt-cache.cc:
+     - fix a memory leak in the xvcg method (Closes: #511557)
+   * apt-pkg/indexcopy.cc:
+     - fix a memory leak then the Release file not exists (Closes: #511556)
+ 
+  -- Michael Vogt <mvo@debian.org>  Thu, 27 Aug 2009 14:44:39 +0200
  
  apt (0.7.22.2) unstable; urgency=low
  

diff --cc debian/control
index 6587c2eb64e05c670ba6290f19636fc9e62946a2,a9c82f9e896454dd367f9759e425d70df121de71..9ffa732e2c424e791bfb6679019af49e7c327376
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -7,7 -6,8 +7,7 @@@ Uploaders: Michael Vogt <mvo@debian.org
   Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
   Luca Bruno <lethalman88@gmail.com>, Julian Andres Klode <jak@debian.org>
  Standards-Version: 3.8.2.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, intltool
 -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, po4a (>= 0.34-2)
 -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, po4a (>= 0.34-2), intltool
  
  Package: apt
  Architecture: any
@@@ -15,8 -15,7 +15,8 @@@ Depends: ${shlibs:Depends
  Priority: important
  Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
  Provides: ${libapt-pkg:provides}
- Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
 +Recommends: ubuntu-keyring
+ Suggests: aptitude | synaptic | 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 8e2b18f67a8bb696e00b1b65b4f3b790ad13d345,d19531dfcf41e774e8e66628e11f512af333deda..2a18f4f47c83cc7c39727fd570bae5c21f3000cd
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -227,12 -226,8 +228,12 @@@ apt: build build-doc debian/shlibs.loca
        rm -f build/po/*.pot
        rm -f po/*.pot
  
 +      # move the mirror failure script in place
 +      mv debian/$@/usr/bin/apt-report-mirror-failure \
 +         debian/$@/usr/lib/apt/apt-report-mirror-failure \
 +
        dh_installexamples -p$@ $(BLD)/docs/examples/*
-       dh_installman -p$@ 
+       dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES)))
        dh_installcron -p$@
        dh_installdocs -p$@
        dh_installchangelogs -p$@

diff --cc doc/examples/configure-index
index 175f0e4800b3adcef75f203de82384531f0b8ecd,27118fb7e85f8e7c34534b7c4a75a57d51072a08..b768195938b721693ceca23909b32093ed5f392c
--- 1/doc/examples/configure-index
--- 2/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@@ -250,19 -247,14 +250,28 @@@ Acquir
     Options {"--ignore-time-conflict";}        // not very useful on a normal system
    };
  
 -
 -    Order { "gz"; "lzma"; "bz2"; };
 +  mirror
 +  {
 +   RefreshInterval "360"; // refresh interval in minutes
 +   MaxAge "90";           // max age for a mirror file in days before 
 +                          // it gets deleted
 +   // mirror failure reporting script
 +   ProblemReporting "/usr/lib/apt/apt-report-mirror-failure"; 
 +   // mirror failure reporting url
 +   ReportFailures "http://example.com/mirror-failure"; 
++   };
++
+   CompressionTypes
+   {
+     bz2 "bzip2";
+     lzma "lzma";
+     gz "gzip";
    };
++  
++  Order { "gz"; "lzma"; "bz2"; };
 +
 +  // translations can be set here to "none", "environment" or "$locale"
 +  Translation "none";
  };
  
  // Directory layout

diff --cc methods/http.cc
Simple merge