* Mark a message from dselect backend as translatable

  Thanks to Frédéric Bothamy for the patch
  Closes: #322470
* Simplified Chinese updated. Closes: #473360
* Catalan fixes. Closes: #387141
* Typo fix in Greek translation. Closes: #479122
* French updated.
* Thai updated. Closes: #479313
* Italian updated. Closes: #479326
* Polish updated. Closes: #479342
* Bulgarian updated. Closes: #479379
* Finnish updated. Closes: #479403
* Korean updated. Closes: #479426
* Basque updated. Closes: #479452
* Add missing build-depends back from build-depends-indep field.
  Closes: #478231
* Make cron script quiet if cache is locked. Thanks to Ted Percival
  <ted@midg3t.net> for the patch. Closes: #459344
* Add timeout support for https. Thanks to Andrew Martens
  <andrew.martens@strangeloopnetworks.com> for the patch.
* Add support for --no-download on apt-get update. Closes: #478517

  - Vietnamese updated. Closes: #479008
  
  - Enable more complete debugging information when Debug::pkgAutoRemove
    is set.
* debian/rules:
  - Add missing Build-Depends-Indep on xsltproc, docbook-xsl, and xmlto.

3 files changed, 50 insertions, 6 deletions

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index ec53a7f2f..1ca830c93 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -193,9 +193,10 @@ if which on_ac_power >/dev/null; then
 fi
 
 # check if we can lock the cache and if the cache is clean
+# There's a reasonable chance that someone is already running an apt
+# frontend that has locked the cache, so exit quietly if it is locked.
 if ! apt-get check -q -q 2>/dev/null; then
-    echo "$0: could not lock the APT cache"
-    exit 1
+    exit 0
 fi
 
 # sleep random amount of time
diff --git a/debian/changelog b/debian/changelog
index 5b844e8c3..0a42c92ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,44 @@
-apt (0.7.12) UNRELEASED; urgency=low
+apt (0.7.14) UNRELEASED; urgency=low
+
+  [ Christian Perrier ]
+  * Mark a message from dselect backend as translatable
+    Thanks to Frédéric Bothamy for the patch
+    Closes: #322470
+
+  [ Program translations ]
+  * Simplified Chinese updated. Closes: #473360
+  * Catalan fixes. Closes: #387141
+  * Typo fix in Greek translation. Closes: #479122
+  * French updated.
+  * Thai updated. Closes: #479313
+  * Italian updated. Closes: #479326
+  * Polish updated. Closes: #479342
+  * Bulgarian updated. Closes: #479379
+  * Finnish updated. Closes: #479403
+  * Korean updated. Closes: #479426
+  * Basque updated. Closes: #479452
+
+ -- Christian Perrier <bubulle@debian.org>  Sun, 04 May 2008 08:31:06 +0200
+
+apt (0.7.13) unstable; urgency=low
+
+  [ Otavio Salvador ]
+  * Add missing build-depends back from build-depends-indep field.
+    Closes: #478231
+  * Make cron script quiet if cache is locked. Thanks to Ted Percival
+    <ted@midg3t.net> for the patch. Closes: #459344
+  * Add timeout support for https. Thanks to Andrew Martens
+    <andrew.martens@strangeloopnetworks.com> for the patch.
+
+  [ Goswin von Brederlow ]
+  * Add support for --no-download on apt-get update. Closes: #478517
+  
+  [ Program translations ]
+    - Vietnamese updated. Closes: #479008
+    
+ -- Otavio Salvador <otavio@debian.org>  Fri, 02 May 2008 14:46:00 -0300
+
+apt (0.7.12) unstable; urgency=low
 
   [ Michael Vogt ]
   * cmdline/apt-key:
@@ -53,14 +93,18 @@ apt (0.7.12) UNRELEASED; urgency=low
     - Patch MarkInstall to follow currently satisfied Recommends even
       if they aren't "new", so that we automatically force upgrades
       when the version of a Recommends has been tightened.  (Closes: #470115)
+    - Enable more complete debugging information when Debug::pkgAutoRemove
+      is set.
   * apt-pkg/contrib/configuration.cc
     - Lift the 1024-byte limit on lines in configuration files.
       (Closes: #473710, #473874)
   * apt-pkg/contrib/strutl.cc:
     - Lift the 64000-byte limit on individual messages parsed by ReadMessages.
       (Closes: #474065)
+  * debian/rules:
+    - Add missing Build-Depends-Indep on xsltproc, docbook-xsl, and xmlto.
 
- -- Michael Vogt <mvo@debian.org>  Thu, 10 Jan 2008 12:06:12 +0100
+ -- Daniel Burrows <dburrows@debian.org>  Sat, 26 Apr 2008 12:24:35 -0700
 
 apt (0.7.11) unstable; urgency=critical
   
diff --git a/debian/control b/debian/control
index 2e9e306c8..a3c84d72a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Priority: important
 Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>
 Standards-Version: 3.7.2.2
-Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5)
-Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)
+Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12-1), xsltproc, docbook-xsl, xmlto
 XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
 
 Package: apt