[DRE-commits] [SCM] ruby-ncurses.git branch, master, updated. upstream/1.2.4-21-g490f805

[Per Andersson]

The following commit has been merged in the master branch:
commit f44ee16a8489380d789e3e7a2370abbd1f9021ad
Author: Per Andersson <avtobiff at gmail.com>
Date:   Thu May 31 22:39:37 2012 +0200

    Use Breaks instead of Conflicts for transitional packages.

diff --git a/debian/changelog b/debian/changelog
index d0e53df..2950955 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ruby-ncurses (1.3.1-1) unstable; urgency=low
   * Update copyright file to DEP5.
   * Add myself to uploaders.
   * Set unapply-patches in debian/source/local-options.
+  * Use Breaks instead of Conflicts for transitional packages.
 
  -- Per Andersson <avtobiff at gmail.com>  Fri, 04 May 2012 00:48:40 +0200
 
diff --git a/debian/control b/debian/control
index 9174b61..5bd7dc9 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Architecture: any
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
 Replaces: libncurses-ruby (<< 1.2.4-1~), libncurses-ruby1.8 (<< 1.2.4-1~), libncurses-ruby1.9.1 (<< 1.2.4-1~), libncurses-ruby1.9 (<< 1.2.4-1~)
-Conflicts: libncurses-ruby (<< 1.2.4-1~), libncurses-ruby1.8 (<< 1.2.4-1~), libncurses-ruby1.9.1 (<< 1.2.4-1~), libncurses-ruby1.9 (<< 1.2.4-1~)
+Breaks: libncurses-ruby (<< 1.2.4-1~), libncurses-ruby1.8 (<< 1.2.4-1~), libncurses-ruby1.9.1 (<< 1.2.4-1~), libncurses-ruby1.9 (<< 1.2.4-1~)
 Provides: libncurses-ruby, libncurses-ruby1.8, libncurses-ruby1.9.1, libncurses-ruby1.9, ruby-ncursesw
 Description: ruby extension for the ncurses C library
  All C functions are wrapped by module functions of the module "Ncurses",

-- 
ruby-ncurses.git