summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-08-17 10:11:40 +0200
committerMichael Vogt <mvo@debian.org>2013-08-17 10:11:40 +0200
commit304731b8f23e03d15d1c2d6f66e1bf5f26ac0ca2 (patch)
tree6662c499b4909620d24469ad6aaa3f7e1fa0f3fd /debian
parent1afd369d00f2f9272462ffc6c6e24f293a81459e (diff)
[ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
1 files changed, 3 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index af75ee757..06520b748 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-apt (0.9.10~exp1) UNRELEASED; urgency=low
+apt (0.9.11~exp1) UNRELEASED; urgency=low
[ Michael Vogt ]
* lp:~mvo/apt/webserver-simulate-broken-with-fix346386:
@@ -14,9 +13,10 @@ apt (0.9.10~exp1) UNRELEASED; urgency=low
* use sha512 when available (LP: #1098752)
* [ABI-Break] lp:~mvo/apt/source-hashes:
- use sha{512,256,1} for deb-src when available LP: #1098738
+ * [ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines
-- Michael Vogt <mvo@debian.org> Fri, 01 Mar 2013 12:12:39 +0100
-=======
+
apt (0.9.11) UNRELEASED; urgency=low
The "Happy 20th Birthday Debian" upload
@@ -48,7 +48,6 @@ apt (0.9.11) UNRELEASED; urgency=low
* French translation update.
-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Aug 2013 09:27:35 +0200
->>>>>>> debian/sid
apt (0.9.10) unstable; urgency=low