- only increase the score of installed applications if they

    are not obsolete
  - fix resolver bug on removal triggered by weak-dependencies
    with or-groups
* methods/http.cc:
  - send apt version in User-Agent
* apt-pkg/deb/debrecords.cc:
  - fix SHA1Hash() return value
* apt-pkg/cdrom.cc:
  - only unmount if APT::CDROM::NoMount is false
* methods/cdrom.cc:
  - only umount if it was mounted by the method before
* po/gl.po:
  - fix error translation that causes trouble to lsb_release
* apt-pkg/acquire-item.cc:
  - if decompression of a index fails, delete the index
* apt-pkg/acquire.{cc,h}:
  - deal better with duplicated sources.list entries (avoid
    double queuing of  URLs) - this fixes hangs in bzip/gzip
* apt-pkg/policy.cc:
  - allow multiple packages (thanks to David Foerster)
* merged from Christian Perrier:
	* mr.po: New Marathi translation  Closes: #416806

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

diff --cc debian/changelog
index 5f9d3d5,1fd4922..eea6d2a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -2,8 -2,41 +2,41 @@@ apt (0.6.47) UNRELEASED; urgency=lo
  
    * apt-pkg/algorithm.cc:
      - use clog for all debugging
- 
-  --
+     - only increase the score of installed applications if they 
+       are not obsolete 
+     - fix resolver bug on removal triggered by weak-dependencies 
+       with or-groups
+   * methods/http.cc:
+     - send apt version in User-Agent
+   * apt-pkg/deb/debrecords.cc:
+     - fix SHA1Hash() return value
+   * apt-pkg/cdrom.cc:
+     - only unmount if APT::CDROM::NoMount is false
+   * methods/cdrom.cc:  
+     - only umount if it was mounted by the method before
+   * po/gl.po:
+     - fix error translation that causes trouble to lsb_release
+   * apt-pkg/acquire-item.cc:
+     - if decompression of a index fails, delete the index 
 -  * [ABI] apt-pkg/acquire.{cc,h}:
++  * apt-pkg/acquire.{cc,h}:
+     - deal better with duplicated sources.list entries (avoid
+       double queuing of  URLs) - this fixes hangs in bzip/gzip
+   * apt-pkg/policy.cc:
+     - allow multiple packages (thanks to David Foerster)
+   * merged from Christian Perrier:
+       * mr.po: New Marathi translation  Closes: #416806
+       * zh_CN.po: Updated by Eric Pareja  Closes: #416822
+       * tl.po: Updated by Eric Pareja   Closes: #416638
+       * gl.po: Updated by Jacobo Tarrio
+                Closes: #412828
+       * da.po: Updated by Claus Hindsgaul
+                Closes: #409483
+       * fr.po: Remove a non-breakable space for usability
+                issues. Closes: #408877
+       * ru.po: Updated Russian translation. Closes: #405476
+       * *.po: Unfuzzy after upstream typo corrections
+   
+  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
  
  apt (0.6.46.4) unstable; urgency=high
  

diff --cc methods/http.cc
Simple merge

diff --cc methods/makefile
Simple merge