summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-12-19 14:57:39 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2007-12-19 14:57:39 +0100
commitf00d26304c1febd47d5d9aefdcb9dd7e25f4058c (patch)
tree8c0487dcbdf4563aefe40afc2cc2b71e3a6e7e56 /debian
parentaff87a762f86ed47f2b81ccbac23faa5d9fddcdb (diff)
parent383594799377d5e628ee84557218f538d7b0bc0a (diff)
merged from bzr.debian.net
Diffstat (limited to 'debian')
-rw-r--r--debian/apt.cron.daily3
-rw-r--r--debian/changelog23
2 files changed, 25 insertions, 1 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 1d4df56b6..7af689e1f 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -147,6 +147,9 @@ check_size_constraints()
fi
}
+if ! which apt-config >/dev/null; then
+ exit 0
+fi
UpdateInterval=0
DownloadUpgradeableInterval=0
diff --git a/debian/changelog b/debian/changelog
index 671145fde..ef9784178 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,9 +14,21 @@ apt (0.7.10) UNRELEASED; urgency=low
closes: #452862.
* Applied patch from Alexander Winston <alexander.winston@comcast.net>
to use 'min' as symbol for minute, closes: #219034.
+ * Applied patch from Amos Waterland <apw@us.ibm.com> to allow apt to
+ work properly in initramfs, closes: #448316.
+ * Applied patch from Robert Millan <rmh@aybabtu.com> to make apt-key and
+ apt-get to ignore time conflicts, closes: #451328.
+ * Applied patch from Peter Eisentraut <peter_e@gmx.net> to fix a
+ grammatical error ("manual installed" -> "manually installed"),
+ closes: #438136.
+ * Fix cron.daily job to not call fail if apt isn't installed, closes:
+ #443286.
[ Program translations ]
- Basque updated. Closes: #453088
+ - Vietnamese updated. Closes: #453774
+ - Japanese updated. Closes: #456909
+ - French updated.
[ Michael Vogt ]
* debian/rules
@@ -37,8 +49,17 @@ apt (0.7.10) UNRELEASED; urgency=low
- support lzma data members
* ftparchive/multicompress.cc:
- support lzma output
+
+ [ Daniel Burrows ]
+ * apt-pkg/contrib/configuration.cc:
+ - if RootDir is set, then FindFile and FindDir will return paths
+ relative to the directory stored in RootDir, closes: #456457.
+
+ [ Christian Perrier ]
+ * Fix wording for "After unpacking...". Thans to Michael Gilbert
+ for the patch. Closes: #260825
- -- Otavio Salvador <otavio@ossystems.com.br> Sat, 08 Dec 2007 12:13:58 -0200
+ -- Christian Perrier <bubulle@debian.org> Mon, 17 Dec 2007 10:10:17 +0530
apt (0.7.9) unstable; urgency=low