[DRE-commits] [SCM] ruby-log4r.git branch, master, updated. debian/1.1.10-1-4-g8a2973e

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 8a2973e1d8cca9e4ff53982ad8a4df0d446bfad8
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue Jun 26 21:33:56 2012 +0200

    Replaced conflicts by breaks; control syntax tweaks

diff --git a/debian/changelog b/debian/changelog
index 750a7ab..dcd1aec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ruby-log4r (1.1.10-2) unstable; urgency=low
   * debian/control:
     - Bumped the build-dependency on gem2deb to >= 0.3.0~.
     - Added myself to the uploaders.
+    - Replaced the conflicts by breaks.
+    - Syntax tweaks.
   * debian/source/lintian-overrides: added overrides for the descriptions
     of the transitional packages. 
 
diff --git a/debian/control b/debian/control
index 2cb9c37..dfc818b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
 Replaces: liblog4r-ruby (<< 1.1.9-1~),  liblog4r-ruby1.8 (<< 1.1.9-1~)
-Conflicts: liblog4r-ruby (<< 1.1.9-1~),  liblog4r-ruby1.8 (<< 1.1.9-1~)
+Breaks: liblog4r-ruby (<< 1.1.9-1~),  liblog4r-ruby1.8 (<< 1.1.9-1~)
 Provides: liblog4r-ruby,  liblog4r-ruby1.8
 Description: Logging library for Ruby
  Log4r is a comprehensive and flexible logging library written in Ruby for
@@ -41,3 +41,4 @@ Architecture: all
 Depends: ${misc:Depends}, ruby-log4r
 Description: Transitional package for ruby-log4r
  This is a transitional package to ease upgrades to the ruby-log4r
+ package. It can safely be removed.

-- 
ruby-log4r.git