[DRE-commits] [SCM] rcov.git branch, master, updated. upstream/0.9.11-17-g9d1ee6e

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit b4bdf6915f1747fd0b9d06feea3b56492ae27711
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue May 29 15:49:08 2012 +0200

    Added a build-depend on ruby-test-unit; dropped conflicts and replaces on librcov*-ruby

diff --git a/debian/changelog b/debian/changelog
index 867917d..19a62cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ rcov (1.0-1) UNRELEASED; urgency=low
     - Standards-Version bumped to 3.9.3; no changes required.
     - Set XS-Ruby-Versions to ruby1.8.
     - Changed the build-depends for using gem2deb instead of ruby-pkg-tools.
+    - Added a build-depend on ruby-test-unit; the tests don't run with the old
+      version shipped with ruby1.8.
+    - Dropped the conflicts and replaces for librcov*-ruby; they haven't exist
+      in the archive for quite a while.
     - Switched the maintainer with the uploaders field as per new
       convention the team is the default maintainer.
   * debian/copyright: reworked to fit the Debian copyright format version 1.0.
diff --git a/debian/control b/debian/control
index 19f9c60..cae68f8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Micah Anderson <micah at debian.org>, Paul van Tilburg <paulvt at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~), ruby-test-unit
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/rcov.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/rcov.git;a=summary
@@ -14,9 +14,7 @@ XS-Ruby-Versions: ruby1.8
 Package: rcov
 Architecture: any
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, libjs-jquery, libjs-jquery-tablesorter
-Conflicts: librcov-ruby (<< 0.6-1), librcov-ruby1.8 (<< 0.6-1)
-Replaces: librcov-ruby (<< 0.6-1), librcov-ruby1.8 (<< 0.6-1)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8, libjs-jquery, libjs-jquery-tablesorter
 Description: Code coverage analysis tool for Ruby
  rcov is a code coverage tool for Ruby.  It is commonly used for viewing
  overall test unit coverage of target code.  This version improves on the

-- 
rcov.git