* merged the auto-remove branch

diff --cc apt-pkg/init.h
index 63547619fa01b8aeb26ce3656c1b486d4cfa755e,6a832bddfdb7f7ba1227f907821e6184e77d1434..51a7ba2ebb3b7207fed5a754fcc89720df092066
--- 1/apt-pkg/init.h
--- 2/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@@ -17,8 -17,8 +17,8 @@@
  #include <apt-pkg/pkgsystem.h>
  
  // See the makefile
 -#define APT_PKG_MAJOR 3
 -#define APT_PKG_MINOR 13
 +#define APT_PKG_MAJOR 4
- #define APT_PKG_MINOR 0
++#define APT_PKG_MINOR 1
  #define APT_PKG_RELEASE 0
      
  extern const char *pkgVersion;

diff --cc apt-pkg/makefile
index 7887fce928a243de07f7becb379a984c2d9c38f8,7093d23ceaee873d0d3b879735acac33b480eddc..29c8ee135ceeb45e24a1cc82c542c2cae543e928
--- 1/apt-pkg/makefile
--- 2/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@@ -13,7 -13,7 +13,7 @@@ include ../buildlib/defaults.ma
  # methods/makefile - FIXME
  LIBRARY=apt-pkg
  LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
- MAJOR=4.0
 -MAJOR=3.13
++MAJOR=4.1
  MINOR=0
  SLIBS=$(PTHREADLIB) $(INTLLIBS)
  APT_DOMAIN:=libapt-pkg$(MAJOR)

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

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

diff --cc configure.in
index a8e565848007cd61ac3511fd546cc839bf4ae872,6d42f340e231f0410cd58824c176eedd7e0b7d97..f0eb6e8f978e94462ca251ceb5d1fd5ee957efa4
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -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.44.1exp1")
 -AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1-0.1")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.44.2exp1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)

diff --cc debian/changelog
index 83135ec08d2065ae05ee03bbf3d794cd440474cb,8b11ff0da37fb181ba677161bc246d23f39e6131..e48fb77d82ec6fa9994f7d191364ea2d0aa634a5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,28 +1,26 @@@
- apt (0.6.44.1exp1) experimental; urgency=low
 -apt (0.6.44.2) unstable; urgency=low
 -
 -  * apt-pkg/depcache.cc:
 -    - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
 -  * merged from 
 -    http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
 -      * sk.po: Completed to 512t
 -      * eu.po: Completed to 512t
 -      * fr.po: Completed to 512t
 -      * sv.po: Completed to 512t
 -      * Update all PO and the POT. Gives 506t6f for formerly
 -        complete translations
 -
 - --
++apt (0.6.44.2exp1) experimental; urgency=low
 +
 +  * added support for i18n of the package descriptions
++  * added support for aptitude like auto-install tracking (a HUGE
++    HUGE thanks to Daniel Burrows who made this possible, if you meet
++    him, please give him a HUG and tell him how great he his!)
 +  * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch
 +  * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental
-   * merged patch from Otavio (thanks!) to better support translations
-     that need the full language-code (like pt_BR)
 +  
 + -- Michael Vogt <mvo@debian.org>  Tue,  6 Jun 2006 19:31:31 +0200
  
+ apt (0.6.44.1-0.1) unstable; urgency=low
+ 
+   * Non-maintainer upload.
+   * Don't give an error when parsing empty Packages/Sources files.
+     (Closes: #366931, #367086, #370160)
+ 
+  -- Steinar H. Gunderson <sesse@debian.org>  Fri,  9 Jun 2006 00:52:21 +0200
+ 
  apt (0.6.44.1) unstable; urgency=low
  
 +  * apt-pkg/acquire-item.cc:
 +    - fix reversed logic of the "Acquire::PDiffs" option
    * merged from 
      http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
      - po/LINGUAS: added "bg" Closes: #360262

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

diff --cc methods/makefile
index 03146d1bcca068a26f309d9ca4c5043b10cfd666,7af5d38d18605ca0bf281cd1937eec561a660360..10fce8bfca66c4d6b6b23614ed289be4ab69eb97
--- 1/methods/makefile
--- 2/methods/makefile
+++ b/methods/makefile
@@@ -7,7 -7,7 +7,7 @@@ include ../buildlib/defaults.ma
  BIN := $(BIN)/methods
  
  # FIXME..
- LIB_APT_PKG_MAJOR = 4.0
 -LIB_APT_PKG_MAJOR = 3.13
++LIB_APT_PKG_MAJOR = 4.1
  APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
  
  # The file method

diff --cc po/apt-all.pot
index 262200f4456cdb477e96046a9c84159d1648f316,ebf7c01cba2691d9e84ce46ae2aeb850fbeb4468..e4a6d32d68059e5d5c67015206772e4d14eb54ff
--- 1/po/apt-all.pot
--- 2/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-05-17 17:27+0200\n"
 -"POT-Creation-Date: 2006-06-26 07:08+0200\n"
++"POT-Creation-Date: 2006-06-26 15:51+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -154,9 -146,9 +154,9 @@@ msgstr "
  msgid "       %4i %s\n"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
+ #: cmdline/apt-get.cc:2426 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr ""
@@@ -251,7 -243,7 +251,7 @@@ msgid "
  "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
  msgstr ""
  
- #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
 -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr ""
@@@ -1368,9 -1363,9 +1382,9 @@@ msgid "The info and temp directories ne
  msgstr ""
  
  #. Build the status cache
- #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748
- #: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
- #: apt-pkg/pkgcachegen.cc:945
 -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645
 -#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719
 -#: apt-pkg/pkgcachegen.cc:842
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr ""
  
@@@ -2295,87 -2307,73 +2323,87 @@@ msgstr "
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:132
 -#: apt-pkg/pkgcachegen.cc:131
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:155
 -#: apt-pkg/pkgcachegen.cc:152
++#: apt-pkg/pkgcachegen.cc:157
 +#, c-format
 +msgid "Error occured while processing %s (NewFileDesc1)"
 +msgstr ""
 +
- #: apt-pkg/pkgcachegen.cc:180
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:184
 -#: apt-pkg/pkgcachegen.cc:156
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:215
 -#: apt-pkg/pkgcachegen.cc:186
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:219
 -#: apt-pkg/pkgcachegen.cc:190
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:223
 -#: apt-pkg/pkgcachegen.cc:194
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:247
 -#: apt-pkg/pkgcachegen.cc:209
++#: apt-pkg/pkgcachegen.cc:249
 +#, c-format
 +msgid "Error occured while processing %s (NewFileDesc2)"
 +msgstr ""
 +
- #: apt-pkg/pkgcachegen.cc:253
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:256
 -#: apt-pkg/pkgcachegen.cc:212
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:259
 -#: apt-pkg/pkgcachegen.cc:215
++#: apt-pkg/pkgcachegen.cc:261
 +msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 +msgstr ""
 +
- #: apt-pkg/pkgcachegen.cc:262
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:290
 -#: apt-pkg/pkgcachegen.cc:243
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:303
 -#: apt-pkg/pkgcachegen.cc:256
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:309
 -#: apt-pkg/pkgcachegen.cc:262
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:679
 -#: apt-pkg/pkgcachegen.cc:576
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:763
 -#: apt-pkg/pkgcachegen.cc:660
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
 -#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr ""