]> 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: 7a4912e)
releasing version 1.20130710
authorJoey Hess <joey@kitenet.net>
Wed, 10 Jul 2013 17:58:06 +0000 (13:58 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 10 Jul 2013 17:58:06 +0000 (13:58 -0400)
debian/changelog patch | blob | history
debian/control patch | blob | history

diff --git a/debian/changelog b/debian/changelog
index a750d096197accc0d32eab0584d160afd2d78a42..65815389990fce79fc6d93fc7f9981df55c1045d 100644 (file)
--- 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 317c4a6be51080738f932936db4cff8914902d86..a9b6f211ad326f3a5a649989d2dd275ccb14506e 100644 (file)
--- 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
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.