From: Alexander Barton <alex@barton.de>
Date: Thu, 30 Oct 2014 23:24:02 +0000 (+0100)
Subject: ax-debian-repo 1.1
X-Git-Tag: rel-1.1
X-Git-Url: https://arthur.barton.de/gitweb/?p=ax-debian-repo.git;a=commitdiff_plain;h=refs%2Ftags%2Frel-1.1;hp=7c3c8ba13c1583c634ff504dab7980ec80b70f07

ax-debian-repo 1.1
---

diff --git a/ax-debian-repo b/ax-debian-repo
index f10d1b8..08c53d1 100644
--- a/ax-debian-repo
+++ b/ax-debian-repo
@@ -12,7 +12,7 @@ Readme: README
 Recommends:
  ax-debian,
 Conflicts:
- ax-debian (< 2),
+ ax-debian (<= 1),
 Architecture: all
 Files: alex-lenny.sources.list /etc/apt/sources.list.d/
  debian.barton.de.gpg /etc/apt/trusted.gpg.d/
diff --git a/debian/changelog b/debian/changelog
index abe8954..7493620 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ax-debian-repo (1.1) unstable; urgency=low
+
+  * Fix "Conflict:" to ax-debian <= 1.
+
+ -- Alexander Barton <alex@barton.de>  Thu, 30 Oct 2014 13:35:48 +0100
+
 ax-debian-repo (1) unstable; urgency=low
 
   * Initial release.