X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/7b7da101607d593caf9708aba7dbf84750c6b2c8..891a0a35b581f0d6aff35715b89845a270e601af:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 7dae909..6581538 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,24 @@
-myrepos (1.16) UNRELEASED; urgency=low
+myrepos (1.20130710) unstable; urgency=low
+
+  * Avoid conflicting with mr so the dummy package can be installed and pull
+    in this one.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 10 Jul 2013 13:50:48 -0400
+
+myrepos (1.20130705.1) unstable; urgency=low
+
+  * Conflict and Replaces mr.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 05 Jul 2013 16:55:30 -0400
+
+myrepos (1.20130705) unstable; urgency=low
 
   * The package is renamed to myrepos. It Provides mr, so can still be
     installed by that name. The mr command is not renamed.
   * Add make install rule.
     Thanks, v4hn
 
- -- Joey Hess <joeyh@debian.org>  Tue, 18 Jun 2013 20:16:25 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 05 Jul 2013 14:42:39 -0400
 
 mr (1.15) unstable; urgency=low