summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-07-09 08:24:46 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2012-07-09 08:24:46 +0200
commite77aedb863e2a9eebb5aa9628121d350c029527d (patch)
treedc314b4157aba3fa9a67c2d2e9c56a410ded4ec7 /debian
parentf52074eed3849ae7c7ebae3c3a118cd4ee094b32 (diff)
parent25792e39cf2218f1c9bae74217e4f91682e14837 (diff)
merged from lp:~donkult/apt/sid
Diffstat (limited to 'debian')
-rw-r--r--debian/apt.cron.daily14
-rw-r--r--debian/changelog30
2 files changed, 37 insertions, 7 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 6f6dc92a4..5c00f22db 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -327,12 +327,14 @@ check_power(){
# ------------------------ main ----------------------------
-# Backup the 7 last versions of APT's extended_states file
-# shameless copy from dpkg cron
-if cd /var/backups ; then
- if ! cmp -s apt.extended_states.0 /var/lib/apt/extended_states; then
- cp -p /var/lib/apt/extended_states apt.extended_states
- savelog -c 7 apt.extended_states >/dev/null
+if test -r /var/lib/apt/extended_states; then
+ # Backup the 7 last versions of APT's extended_states file
+ # shameless copy from dpkg cron
+ if cd /var/backups ; then
+ if ! cmp -s apt.extended_states.0 /var/lib/apt/extended_states; then
+ cp -p /var/lib/apt/extended_states apt.extended_states
+ savelog -c 7 apt.extended_states >/dev/null
+ fi
fi
fi
diff --git a/debian/changelog b/debian/changelog
index fef8db0cc..e49a8e224 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,37 @@
apt (0.9.7.2) UNRELEASED; urgency=low
+
[ Manpages translation updates ]
* French (Christian Perrier)
- -- Christian Perrier <bubulle@debian.org> Tue, 03 Jul 2012 13:56:41 -0600
+ [ Program translation updates ]
+ * Greek (Θανάσης Νάτσης)
+
+ * Japanese (Kenshi Muto) (Closes: #679662)
+ * Russian (Yuri Kozlov) (Closes: #679599)
+ * Danish (Joe Dalton) (Closes: #680119)
+ * Portuguese (Miguel Figueiredo) (Closes: #680616)
+
+ [ Manpage translation updates ]
+ * German (Chris Leick)
+
+ [ David Kalnischkies ]
+ * debian/apt.cron.daily:
+ - do not try to backup extended_states file if it doesn't
+ exist (Closes: #680287)
+ * ftparchive/writer.cc:
+ - handle the APT::FTPArchive::Packages::SHA512 option correctly instead
+ of overriding SHA256, thanks Christian Marillat! (Closes: #680252)
+ * cmdline/apt-mark.cc:
+ - arch:all packages are treated as arch:native packages, but dpkg
+ expects pkg:all for selections, so use the arch of the installed
+ version instead of the package structure if possible.
+ Thanks to Stepan Golosunov for the report! (Closes: #680041)
+ * apt-pkg/clean.cc:
+ - run autoclean against pkg:arch and not always against pkg:native as
+ this removes valid cache entries (Closes: #679371)
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Sun, 01 Jul 2012 08:20:57 +0200
apt (0.9.7.1) unstable; urgency=low