[SCM] qtruby packaging branch, master, updated. debian/4.11.3-1-5-g6893123

[Cédric Boutillier]

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

The following commit has been merged in the master branch:
commit 0cab15e1f53859d7fab5073a8473bea96f827703
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Sep 17 14:43:11 2013 +0200

    build-conflict with ruby1.8 and build with ruby1.9.1
---
 debian/changelog | 6 ++++++
 debian/control   | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 707f0fa..d33fe9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qtruby (4:4.11.3-2) UNRELEASED; urgency=low
+
+  * Build-conflict with ruby1.8 and build with ruby1.9.1.
+
+ -- Cédric Boutillier <boutil at debian.org>  Sun, 24 Nov 2013 00:12:01 +0100
+
 qtruby (4:4.11.3-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 535c23e..16d33ab 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,10 @@ Uploaders: Torsten Marek <shlomme at debian.org>,
            David Palacio <dpalacio at orbitalibre.org>,
            Michael Meskes <meskes at debian.org>,
            Maximiliano Curia <maxy at debian.org>
+Build-Conflicts: libruby1.8
 Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.6.8), cmake,
  smoke-dev-tools (>= 4:4.11), libsmokeqt4-dev (>= 4:4.11),
- ruby1.8, ruby1.8-dev,
+ ruby1.9.1, ruby1.9.1-dev,
  libqt4-dev, libqtwebkit-dev, libphonon-dev, libqscintilla2-dev
 Standards-Version: 3.9.4
 Homepage: http://projects.kde.org/projects/kde/kdebindings/ruby/qtruby
@@ -45,7 +46,7 @@ Description: QScintilla2 bindings for the Ruby language
 Package: ruby-qt4
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: ruby1.8
+Recommends: ruby1.9.1
 Provides: libqt4-ruby, libqt4-ruby1.8
 Replaces: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
 Breaks: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
@@ -74,7 +75,7 @@ Architecture: any
 Breaks: kdebindings-dbg
 Replaces: kdebindings-dbg
 Depends: ruby-qt4 (= ${binary:Version}), ${misc:Depends}
-Recommends: libsmokeqt4-dbg, libruby1.8-dbg
+Recommends: libsmokeqt4-dbg, libruby1.9.1-dbg
 Description: Qt 4 bindings for the Ruby language -- debug symbols
  This package provides the debug symbols of the Qt 4 Ruby bindings.
  .

-- 
qtruby packaging