summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-02-20 18:42:51 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2006-02-20 18:42:51 +0000
commitdd759349ecdd83d13cd1fc67294068c90a5984ea (patch)
tree58836bbcf03233b50b78fa4139f2ea93e1a0c785 /debian
parent5e972bffae68a75aafc9f9b639e82e252fde3b8b (diff)
parent7f016f53293f9c8c149debd2b84b1efd4d9cc827 (diff)
* merged with mainline
Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-132 * make apt-cache madion wotk without deb-src lines * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-133 * only clean out the list dir if the update was successful
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog36
1 files changed, 17 insertions, 19 deletions
diff --git a/debian/changelog b/debian/changelog
index 544c5b9da..92a4671f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,25 +1,20 @@
apt (0.6.43.3) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
- * ca.po: Completed to 512t. Closes: #351592
- * eu.po: Completed to 512t. Closes: #350483
- * ja.po: Completed to 512t. Closes: #349806
- * pl.po: Completed to 512t. Closes: #349514
- * sk.po: Completed to 512t. Closes: #349474
- * gl.po: Completed to 512 strings
- Closes: #349407
- * vi.po: Completed to 512 strings
- * sv.po: Completed to 512 strings
- Closes: #349210
- * ru.po: Completed to 512 strings
- Closes: #349154
- * da.po: Completed to 512 strings
- Closes: #349084
- * fr.po: Completed to 512 strings
- * LINGUAS: Add Welsh
- * *.po: Updated from sources (512 strings)
- * vi.po: Completed to 511 strings
- Closes: #348968
+ * ca.po: Completed to 512t. Closes: #351592
+ * eu.po: Completed to 512t. Closes: #350483
+ * ja.po: Completed to 512t. Closes: #349806
+ * pl.po: Completed to 512t. Closes: #349514
+ * sk.po: Completed to 512t. Closes: #349474
+ * gl.po: Completed to 512 strings Closes: #349407
+ * vi.po: Completed to 512 strings
+ * sv.po: Completed to 512 strings Closes: #349210
+ * ru.po: Completed to 512 strings Closes: #349154
+ * da.po: Completed to 512 strings Closes: #349084
+ * fr.po: Completed to 512 strings
+ * LINGUAS: Add Welsh
+ * *.po: Updated from sources (512 strings)
+ * vi.po: Completed to 511 strings Closes: #348968
* apt-pkg/deb/deblistparser.cc:
- don't explode on a DepCompareOp in a Provides line, but warn about
it and ignore it otherwise (thanks to James Troup for reporting it)
@@ -27,6 +22,9 @@ apt (0.6.43.3) unstable; urgency=low
- don't lock the lists directory in DoInstall, breaks --print-uri
(thanks to James Troup for reporting it)
* debian/apt.dirs: create /etc/apt/sources.list.d
+ * make apt-cache madison work without deb-src entries (#352583)
+ * cmdline/apt-get.cc: only run the list-cleaner if a update was
+ successfull
--