* merged with the apt--mvo branch

diff --cc apt-pkg/makefile
Simple merge

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

diff --cc debian/changelog
Simple merge

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

diff --cc po/apt-all.pot
index cc075ce,095de7f..2dd7206
--- 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-07-26 10:56+0200\n"
 -"POT-Creation-Date: 2006-08-09 16:17+0200\n"
++"POT-Creation-Date: 2006-09-06 18:03+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"
@@@ -148,7 -148,7 +148,7 @@@ msgstr "
  
  #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2430 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2380 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2449 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr ""
@@@ -535,7 -546,7 +546,7 @@@ msgstr "
  msgid "Y"
  msgstr ""
  
- #: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1560
 -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1561
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr ""
@@@ -694,11 -705,11 +705,11 @@@ msgstr "
  msgid "Internal error, Ordering didn't finish"
  msgstr ""
  
- #: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
++#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1880 cmdline/apt-get.cc:1913
  msgid "Unable to lock the download directory"
  msgstr ""
  
- #: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1942 cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2128
++#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1961 cmdline/apt-get.cc:2197
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr ""
@@@ -727,7 -738,7 +738,7 @@@ msgstr "
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2051
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr ""
@@@ -761,7 -772,7 +772,7 @@@ msgstr "
  msgid "Do you want to continue [Y/n]? "
  msgstr ""
  
- #: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1366 cmdline/apt-get.cc:2075
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2025
++#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1366 cmdline/apt-get.cc:2094
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr ""
@@@ -770,7 -781,7 +781,7 @@@
  msgid "Some files failed to download"
  msgstr ""
  
- #: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2084
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2034
++#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2103
  msgid "Download complete and in download only mode"
  msgstr ""
  
@@@ -876,49 -887,31 +887,49 @@@ msgid "
  "used instead."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1403
 +#: cmdline/apt-get.cc:1399
 +msgid "We are not supposed to delete stuff, can't start AutoRemover"
 +msgstr ""
 +
 +#: cmdline/apt-get.cc:1424
 +msgid ""
 +"Hmm, seems like the AutoRemover destroyed something which really\n"
 +"shouldn't happen. Please file a bug report against apt."
 +msgstr ""
 +
- #: cmdline/apt-get.cc:1427 cmdline/apt-get.cc:1628
++#: cmdline/apt-get.cc:1427 cmdline/apt-get.cc:1629
 +msgid "The following information may help to resolve the situation:"
 +msgstr ""
 +
 +#: cmdline/apt-get.cc:1431
 +msgid "Internal Error, AutoRemover broke stuff"
 +msgstr ""
 +
 +#: cmdline/apt-get.cc:1450
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:1547 cmdline/apt-get.cc:1583
 -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1548 cmdline/apt-get.cc:1584
  #, c-format
  msgid "Couldn't find package %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:1570
 -#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1571
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1600
 -#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1601
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1603
 -#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1604
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
  msgstr ""
  
- #: cmdline/apt-get.cc:1615
 -#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1616
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -926,159 -919,163 +937,159 @@@
  "or been moved out of Incoming."
  msgstr ""
  
- #: cmdline/apt-get.cc:1623
 -#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1624
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
  "that package should be filed."
  msgstr ""
  
- #: cmdline/apt-get.cc:1631
 -#: cmdline/apt-get.cc:1574
 -msgid "The following information may help to resolve the situation:"
 -msgstr ""
 -
 -#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1632
  msgid "Broken packages"
  msgstr ""
  
- #: cmdline/apt-get.cc:1662
 -#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1663
  msgid "The following extra packages will be installed:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1733
 -#: cmdline/apt-get.cc:1685
++#: cmdline/apt-get.cc:1752
  msgid "Suggested packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1734
 -#: cmdline/apt-get.cc:1686
++#: cmdline/apt-get.cc:1753
  msgid "Recommended packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1754
 -#: cmdline/apt-get.cc:1706
++#: cmdline/apt-get.cc:1773
  msgid "Calculating upgrade... "
  msgstr ""
  
- #: cmdline/apt-get.cc:1757 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1776 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:1762
 -#: cmdline/apt-get.cc:1714
++#: cmdline/apt-get.cc:1781
  msgid "Done"
  msgstr ""
  
- #: cmdline/apt-get.cc:1829 cmdline/apt-get.cc:1837
 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
++#: cmdline/apt-get.cc:1848 cmdline/apt-get.cc:1856
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:1937
 -#: cmdline/apt-get.cc:1887
++#: cmdline/apt-get.cc:1956
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  
- #: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2196
 -#: cmdline/apt-get.cc:1917 cmdline/apt-get.cc:2146
++#: cmdline/apt-get.cc:1986 cmdline/apt-get.cc:2215
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2011
 -#: cmdline/apt-get.cc:1961
++#: cmdline/apt-get.cc:2030
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2035
 -#: cmdline/apt-get.cc:1985
++#: cmdline/apt-get.cc:2054
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2040
 -#: cmdline/apt-get.cc:1990
++#: cmdline/apt-get.cc:2059
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2043
 -#: cmdline/apt-get.cc:1993
++#: cmdline/apt-get.cc:2062
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2049
 -#: cmdline/apt-get.cc:1999
++#: cmdline/apt-get.cc:2068
  #, c-format
  msgid "Fetch source %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2080
 -#: cmdline/apt-get.cc:2030
++#: cmdline/apt-get.cc:2099
  msgid "Failed to fetch some archives."
  msgstr ""
  
- #: cmdline/apt-get.cc:2108
 -#: cmdline/apt-get.cc:2058
++#: cmdline/apt-get.cc:2127
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2120
 -#: cmdline/apt-get.cc:2070
++#: cmdline/apt-get.cc:2139
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2121
 -#: cmdline/apt-get.cc:2071
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2138
 -#: cmdline/apt-get.cc:2088
++#: cmdline/apt-get.cc:2157
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2157
 -#: cmdline/apt-get.cc:2107
++#: cmdline/apt-get.cc:2176
  msgid "Child process failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:2173
 -#: cmdline/apt-get.cc:2123
++#: cmdline/apt-get.cc:2192
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  
- #: cmdline/apt-get.cc:2201
 -#: cmdline/apt-get.cc:2151
++#: cmdline/apt-get.cc:2220
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2221
 -#: cmdline/apt-get.cc:2171
++#: cmdline/apt-get.cc:2240
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2273
 -#: cmdline/apt-get.cc:2223
++#: cmdline/apt-get.cc:2292
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr ""
  
- #: cmdline/apt-get.cc:2325
 -#: cmdline/apt-get.cc:2275
++#: cmdline/apt-get.cc:2344
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
  "package %s can satisfy version requirements"
  msgstr ""
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2310
++#: cmdline/apt-get.cc:2379
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  
- #: cmdline/apt-get.cc:2385
 -#: cmdline/apt-get.cc:2335
++#: cmdline/apt-get.cc:2404
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2399
 -#: cmdline/apt-get.cc:2349
++#: cmdline/apt-get.cc:2418
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr ""
  
- #: cmdline/apt-get.cc:2403
 -#: cmdline/apt-get.cc:2353
++#: cmdline/apt-get.cc:2422
  msgid "Failed to process build dependencies"
  msgstr ""
  
- #: cmdline/apt-get.cc:2435
 -#: cmdline/apt-get.cc:2385
++#: cmdline/apt-get.cc:2454
  msgid "Supported modules:"
  msgstr ""
  
- #: cmdline/apt-get.cc:2476
 -#: cmdline/apt-get.cc:2426
++#: cmdline/apt-get.cc:2495
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -2115,21 -2112,7 +2126,21 @@@ msgstr "
  msgid "Dependency generation"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:72
 +#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
 +msgid "Reading state information"
 +msgstr ""
 +
 +#: apt-pkg/depcache.cc:199
 +#, c-format
 +msgid "Failed to open StateFile %s"
 +msgstr ""
 +
 +#: apt-pkg/depcache.cc:205
 +#, c-format
 +msgid "Failed to write temporary StateFile %s"
 +msgstr ""
 +
+ #: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr ""

diff --cc share/debian-archive.gpg
index bb5ed50,ce41211..bb5ed50
Binary files differ