summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-09-15 19:51:07 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-09-15 19:51:07 +0200
commit60e1c2ad73e7d62b43f1ae66a05f750ab5c8da81 (patch)
tree13814c3aea3b85516ae6ed7d08033fb6667544dc /debian
parent2d6edfef307079c94083ec03990ef65709ad588a (diff)
parent9976f17c87a6be4b27cb3fcfa59a2a7387aed5e5 (diff)
merged lp:~mvo/apt/conflicts-on-virtuals to better deal
with conflicts/breaks against virtual packages (LP: #614993)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 5a4982ad0..e5ca1ff8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.8.3ubuntu4) maverick; urgency=low
+
+ * merged lp:~mvo/apt/conflicts-on-virtuals to better deal
+ with conflicts/breaks against virtual packages (LP: #614993)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 15 Sep 2010 19:48:26 +0200
+
apt (0.8.3ubuntu3) maverick; urgency=low
* merged fixes from debian-sid