* merged with unstable, prepared upload

diff --cc configure.in
index 830fef82a783e76ae61ee247db4224886843a7be,35d0ea5ee7a39ee5fa96e1936fa01db23e21b9f5,35d0ea5ee7a39ee5fa96e1936fa01db23e21b9f5..19828cc85cac1227a993739cc34fdafdf9a9d774
--- 1/configure.in
--- 2/configure.in
--- 3/configure.in
+++ b/configure.in
@@@@ -18,7 -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.6.45exp2")
 --AC_DEFINE_UNQUOTED(VERSION,"0.6.45.1")
+++AC_DEFINE_UNQUOTED(VERSION,"0.6.46.1exp1")
   PACKAGE="apt"
   AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
   AC_SUBST(PACKAGE)

diff --cc debian/changelog
index 0c4ac04b5c8a261e2706023f408081dd9fa68abd,88eb14871045b2668081a5bc4f54f554394c31d8,db84bc65a87abed9a6c93c58789c2d95564588ee..521650c93e254bb69f5e3090f0d6edaa41d8d94e
--- 1/debian/changelog
--- 2/debian/changelog
--- 3/debian/changelog
+++ b/debian/changelog
@@@@ -1,19 -1,58 -1,58 +1,65 @@@@
-  apt (0.6.45exp2) experimental; urgency=low
 --apt (0.6.46.1) unstable; urgency=low
 --
+++apt (0.6.46.1exp1) experimental; urgency=low
 ++
 ++  * merged "install-recommends" branch (ABI break): 
 ++    - new "--install-recommends"
 ++    - install new recommends on "upgrade" if --install-recommends is 
 ++      given
 ++    - new "--fix-policy" option to install all packages with unmet
 ++      important dependencies (usefull with --install-recommends to
 ++      see what not-installed recommends are on the system)
 ++    - fix of recommended packages display (only show CandidateVersion
 ++      fix or-group handling)
-    (closes: #42266, #281534, #257054)
+    * methods/gzip.cc:
+      - deal with empty files 
+    * Applied patch from Daniel Schepler to make apt bin-NMU able.  
 --    (closes: bug#359634)
+    * rebuild against current g++ because of:
+      http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29289
 --    (closes: #390189)
+    * fix broken i18n in the dpkg progress reporting, thanks to 
+      Frans Pop and Steinar Gunderson. (closes: #389261)
+    * Merged from Christian Perrier bzr branch:
+      * fi.po: Updated to 514t. Closes: #390149
+      * eu.po: Updated to 514t. Closes: #389725
+      * vi.po: Updated to 514t. Closes: #388555
+    
+   --
   
-   -- Michael Vogt <mvo@debian.org>  Mon, 14 Aug 2006 17:47:25 +0200
+  apt (0.6.46) unstable; urgency=low
   
-  apt (0.6.45exp1) experimental; urgency=low
+    * debian/control:
+      - switched to libdb4.4 for building (closes: #381019)
+    * cmdline/apt-get.cc:
+      - show only the recommends/suggests for the candidate-version, not for all
+        versions of the package (closes: #257054)
+      - properly handle recommends/suggests or-groups when printing the list of
+        suggested/recommends packages (closes: #311619)
+    * methods/http.cc:
+      - check more careful for incorrect proxy settings (closes: #378868)
+    * methods/gzip.cc:
+      - don't hang when /var is full (closes: #341537), thanks to
+        Luis Rodrigo Gallardo Cruz for the patch
+    * doc/examples/sources.list:
+      - removed non-us.debian.org from the example (closes: #380030,#316196)
+    * Merged from Christian Perrier bzr branch:
+      * ro.po: Updated to 514t. Closes: #388402
+      * dz.po: Updated to 514t. Closes: #388184
+      * it.po: Fixed typos. Closes: #387812
+      * ku.po: New kurdish translation. Closes: #387766
+      * sk.po: Updated to 514t. Closes: #386851
+      * ja.po: Updated to 514t. Closes: #386537
+      * gl.po: Updated to 514t. Closes: #386397
+      * fr.po: Updated to 516t.
+      * fi.po: Updated to 512t. Closes: #382702
+    * share/archive-archive.gpg:
+      - removed the outdated amd64 and debian-2004 keys
+    * apt-pkg/tagfile.cc:
+      - applied patch from Jeroen van Wolffelaar to make the tags
+        caseinsensitive (closes: #384182)
+      - reverted MMap use in the tagfile because it does not work 
+        across pipes (closes: #383487) 
+    
+   -- Michael Vogt <mvo@debian.org>  Thu, 21 Sep 2006 10:25:03 +0200
+  
+  apt (0.6.45) unstable; urgency=low
   
     * apt-pkg/contrib/sha256.cc:
       - fixed the sha256 generation (closes: #378183)

diff --cc debian/rules
Simple merge

diff --cc doc/examples/configure-index
index b4d42e123acb1baab0a9a159ddd7ae201d1f1444,ac2f2997d9a75aa555ee8363bfa203808adeda7f,0f0abc30c9028365104b6576a4cc6a7ad00dd5ee..831e276c75d49209b0439ef1a6c689908d78dc20
--- 1/doc/examples/configure-index
--- 2/doc/examples/configure-index
--- 3/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@@@ -261,8 -253,8 -251,8 +261,8 @@@@ Debu
     pkgDPkgPM "false";
     pkgDPkgProgressReporting "false";
     pkgOrderList "false";
-  
 ++  pkgAutoRemove "false";   // show information about automatic removes
 --  
+    BuildDeps "false";
     pkgInitialize "false";   // This one will dump the configuration space
     NoLocking "false";
     Acquire::Ftp "false";    // Show ftp command traffic