merge from trunk

diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index ab08a8f4dafbb31c940519c375554e59ff40a684..8619822dffc5e713b34cdeeb88e46a5ca30adbe2 100644 (file)
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -164,8 +164,8 @@ bool debSystem::Initialize(Configuration &Cnf)
    /* These really should be jammed into a generic 'Local Database' engine
       which is yet to be determined. The functions in pkgcachegen should
       be the only users of these */
-   Cnf.CndSet("Dir::State::extended_states", Cnf.FindDir("Dir::State").append("extended_states"));
-   Cnf.CndSet("Dir::State::status", Cnf.FindDir("Dir", "/").append("var/lib/dpkg/status"));
+   Cnf.CndSet("Dir::State::extended_states", "extended_states");
+   Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status");
    Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg");
 
    if (StatusFile) {

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 8ace14a31e5770ae3932821f02555bcf809b1722..c61bfb9bb3cd0f7c885f6eca09f13b002d694be2 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -417,6 +417,13 @@ do_cache_backup $BackupArchiveInterval
 # mirrors at the same time
 random_sleep
 
+# include default system language so that "apt-get update" will
+# fetch the right translated package descriptions
+if [ -r /etc/default/locale ]; then
+    . /etc/default/locale
+    export LANG LANGUAGE LC_MESSAGES LC_ALL
+fi
+
 # update package lists
 UPDATED=0
 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp

diff --git a/debian/changelog b/debian/changelog
index f1737a5a20427fa02cb8cea7afeeda50acb78b1f..3a552d01ef8f5a18d42848169d5140570a0c990d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,16 @@ apt (0.8.7) UNRELEASED; urgency=low
   * Another typo fixed in French ("Anfin"). Thanks to bubulle
   * Wrong translation for "showauto" fixed. Thanks to Raphaël Hertzog
     Closes: #599265
+  
+  [ Michael Vogt ]
+  * debian/apt.cron.daily:
+    - source /etc/default/locale (if available) so that the 
+      apt-get update cron job fetches the right translated package
+      descriptions
+  * fix test failure on amd64
+  * apt-pkg/deb/debsystem.cc:
+    - fix issues with dir::state::status and dir::state::extended_states
+      when alternative rootdirs are used
 
   [ Martin Pitt ]
   * apt-pkg/deb/debindexfile.cc:

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 26fb53fecdeaf21f6f69d38a9b7488fb3801f6a0..c4c2acb6427e64079756456e11ed403962e120f9 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -433,6 +433,7 @@ Debug
   Acquire::Http "false";   // Show http command traffic
   Acquire::Https "false";   // Show https debug
   Acquire::gpgv "false";   // Show the gpgv traffic
+  Acquire::cdrom "false";   // Show cdrom debug output
   aptcdrom "false";        // Show found package files
   IdentCdrom "false";
   acquire::netrc "false";  // netrc parser

diff --git a/test/integration/framework b/test/integration/framework
index c09afcbad8752151583b144b47b923a36fd45622..e2c5234e287667c2ae872b57020740f253f36c2a 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -64,6 +64,8 @@ runapt() {
        msgdebug "Executing: ${CCMD}$*${CDEBUG} "
        if [ -f ./aptconfig.conf ]; then
                APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*
+        elif [ -f ../aptconfig.conf ]; then
+                APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*
        else
                LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*
        fi