[DRE-commits] [rdtool] 02/03: Remove conflict between ruby-rd and old (pre-Squeeze) version of rdtool.

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository rdtool.

commit 64aa7e9034c4f0359f68f73c788b51e4cf2848c4
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Sep 9 10:56:17 2014 +0200

    Remove conflict between ruby-rd and old (pre-Squeeze) version of rdtool.
---
 debian/changelog | 1 +
 debian/control   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e8a1644..97987cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ rdtool (0.6.38-3) unstable; urgency=medium
   * Team upload.
   * Make rdtool-elisp depend on emacs instead of the removed emacs23 package.
     Thanks Gabriele Giacone (Closes: #754028)
+  * Remove conflict between ruby-rd and old (pre-Squeeze) version of rdtool.
 
  -- Cédric Boutillier <boutil at debian.org>  Tue, 09 Sep 2014 10:25:51 +0200
 
diff --git a/debian/control b/debian/control
index a6babcd..bf5d550 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,6 @@ Package: ruby-rd
 Section: ruby
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: rdtool (<< 0.6.14-2)
 Description: RDTool library for Ruby - library
  RD is multipurpose documentation format created for documentating Ruby and
  output of Ruby world.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rdtool.git