From: Joey Hess <joey@kitenet.net>
Date: Fri, 5 Jul 2013 21:02:21 +0000 (-0400)
Subject: releasing version 1.20130705.1
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/68da44924be0f7ae36da937ba21a0fd2a1b66479?ds=sidebyside;hp=--cc

releasing version 1.20130705.1
---

68da44924be0f7ae36da937ba21a0fd2a1b66479
diff --git a/debian/changelog b/debian/changelog
index 262eec1..a750d09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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
diff --git a/debian/control b/debian/control
index c1b9233..317c4a6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: vcs
 Priority: optional
 Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.9.0)
 Maintainer: Joey Hess <joeyh@debian.org>
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://myrepos.branchable.com/
 Vcs-Git: git://myrepos.branchable.com/
 
@@ -12,9 +12,11 @@ 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
-Description: a tool to manage all your version control repos
+Description: tool to manage all your version control repos
  The mr(1) command can checkout, update, or perform other actions on
  a set of repositories as if they were one combined respository. It
  supports any combination of git, svn, mercurial, bzr, darcs, cvs, vcsh,