summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-12-13 09:14:45 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2012-12-13 09:14:45 +0100
commit8e604bec425dda28db6f541cc7e64e16989d89f6 (patch)
treed498a4d1027e19236282ef6f738626c12067c7e5 /debian
parent0c58e5cb65cb10a2afe67f35ea7a2b23586c816c (diff)
parentfb3ecf163485c428ebf863e65e60ec884e741ada (diff)
merged from the debian-sid branch
Diffstat (limited to 'debian')
-rw-r--r--debian/apt.postinst7
-rw-r--r--debian/changelog17
2 files changed, 24 insertions, 0 deletions
diff --git a/debian/apt.postinst b/debian/apt.postinst
index 4d87c4e25..bd814e1af 100644
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -21,6 +21,13 @@ case "$1" in
rm -f $SECRING
fi
apt-key update
+
+ # ensure tighter permissons on the logs, see LP: #975199
+ if dpkg --compare-versions "$2" lt-nl 0.9.7.7; then
+ # ensure permissions are right
+ chmod -f 0640 /var/log/apt/term.log* || true
+ fi
+
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/changelog b/debian/changelog
index cbe97833f..e89a4d3e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+apt (0.9.7.6ubuntu6) UNRELEASEDraring; urgency=low
+
+ * merged from the debian-sid branch
+
+ [ Program translation updates ]
+ * Catalan (Jordi Mallach)
+ * Drop a confusing non-breaking space. Closes: #691024
+ * Thai (Theppitak Karoonboonyanan). Closes: #691613
+ * Vietnamese (Trần Ngọc Quân). Closes: #693773
+ * Fix Plural forms in German, French, Japanese and Portuguese
+ translations. Thanks to Jakub Wilk for reporting these errors.
+
+ [ Michael Vogt ]
+ * change permissions of /var/log/apt/term.log to 0640 (LP: #975199)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Dec 2012 09:03:59 +0100
+
apt (0.9.7.6ubuntu5) raring; urgency=low
* Revert build-dependency from gettext:any to gettext, now that gettext is