]> git.madduck.net Git - code/myrepos.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / code / myrepos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: a5f0f7a)
releasing version 1.20130705.1
authorJoey Hess <joey@kitenet.net>
Fri, 5 Jul 2013 21:02:21 +0000 (17:02 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 5 Jul 2013 21:02:21 +0000 (17:02 -0400)
debian/changelog patch | blob | history
debian/control patch | blob | history

diff --git a/debian/changelog b/debian/changelog
index 262eec1705d3fbf82074f0cf6748d9e49bdc42af..a750d096197accc0d32eab0584d160afd2d78a42 100644 (file)
--- 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
 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 c1b9233ebe410047aa481950df07fdaabf5b486a..317c4a6be51080738f932936db4cff8914902d86 100644 (file)
--- 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>
 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/
 
 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
 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
 Provides: mr
+Replaces: mr
 Recommends: libwww-perl, libhtml-parser-perl, perl
 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,
  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,
hacking on myrepos

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.