From: Joey Hess <joey@kitenet.net>
Date: Wed, 10 Jul 2013 17:58:06 +0000 (-0400)
Subject: releasing version 1.20130710
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/891a0a35b581f0d6aff35715b89845a270e601af?hp=-c

releasing version 1.20130710
---

891a0a35b581f0d6aff35715b89845a270e601af
diff --git a/debian/changelog b/debian/changelog
index a750d09..6581538 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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.
diff --git a/debian/control b/debian/control
index 317c4a6..a9b6f21 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Architecture: all
 Section: vcs
 Depends: ${misc:Depends}
 Suggests: subversion, git-core | git (>= 1:1.7), cvs, bzr, mercurial, darcs, fossil, vcsh, liburi-perl, curl
-Conflicts: mr
 Provides: mr
 Replaces: mr
 Recommends: libwww-perl, libhtml-parser-perl, perl