[DRE-commits] [SCM] gem2deb.git branch, master, updated. debian/0.2.3-38-gdc59e27

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit f1188dcaa3e8b33f5c6b927c34f7da401bc29e99
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Sun Jun 19 19:32:37 2011 -0700

    Use Breaks: insted of Conflicts: in transitional packages

diff --git a/bin/gen-ruby-trans-pkgs b/bin/gen-ruby-trans-pkgs
index ba99d48..66e51e4 100755
--- a/bin/gen-ruby-trans-pkgs
+++ b/bin/gen-ruby-trans-pkgs
@@ -20,7 +20,7 @@ binaries -= allpackages
 rstring = binaries.map { |pkg| "#{pkg} (<< #{version}~)" }.join(', ')
 puts "# For the replacement package"
 puts "Replaces: #{rstring}"
-puts "Conflicts: #{rstring}"
+puts "Breaks: #{rstring}"
 puts "Provides: #{binaries.join(', ')}"
 
 puts
diff --git a/debian/changelog b/debian/changelog
index d58bd8a..7af2d2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ gem2deb (0.2.5) UNRELEASED; urgency=low
 
   * Replace libshoulda-ruby1.8 for ruby-shoulda-context in Build-Depends
   * Always create installation dirs (Closes: #630738)
+  * gen-ruby-trans-pkgs: use Breaks: instead of Conflicts for transitional
+    packages.
 
- -- Antonio Terceiro <terceiro at softwarelivre.org>  Mon, 06 Jun 2011 21:27:23 -0700
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Sun, 19 Jun 2011 19:32:00 -0700
 
 gem2deb (0.2.4) unstable; urgency=low
 

-- 
gem2deb.git