[SCM] qtruby packaging branch, master, updated. debian/4.11.3-3-1-g3cb307d

[Cédric Boutillier]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/qtruby.git;a=commitdiff;h=3cb307d

The following commit has been merged in the master branch:
commit 3cb307d9d8b7538076d56fa2d24162bd459e1d78
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon May 19 00:56:22 2014 +0200

    rebuild against ruby2.1, drop build-conflict with ruby1.8
---
 debian/changelog | 8 ++++++++
 debian/control   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 42f0182..2b0cfb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qtruby (4:4.11.3-4) unstable; urgency=medium
+
+  * Build against Ruby 2.1.
+  * Breaks binary packages from korundum before its rebuild with Ruby 2.1.
+  * Drop build-conflict with ruby1.8 (not needed any more).
+
+ -- Cédric Boutillier <boutil at debian.org>  Mon, 19 May 2014 00:09:58 +0200
+
 qtruby (4:4.11.3-3) unstable; urgency=medium
 
   * Aesthetic changes made by wrap-and-sort.
diff --git a/debian/control b/debian/control
index 59f50ec..21c8362 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Uploaders: Torsten Marek <shlomme at debian.org>,
            Michael Meskes <meskes at debian.org>,
            Maximiliano Curia <maxy at debian.org>,
            Cédric Boutillier <boutil at debian.org>
-Build-Conflicts: libruby1.8
 Build-Depends: cmake,
                debhelper (>= 9),
                libphonon-dev,
@@ -29,6 +28,7 @@ Package: libqtruby4shared2
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: ruby-soprano (<< 4:4.11.3-4~), ruby-kde4 (<< 4:4.11.3-4~)
 Description: internal library for Qt 4 Ruby bindings
  This package provides an internal library of Qt Ruby.
  .

-- 
qtruby packaging