[SCM] Kross interpreters packaging branch, master, updated. debian/4.12.2-2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kross-interpreters.git;a=commitdiff;h=dff235e

The following commit has been merged in the master branch:
commit dff235e159524b41b16690becbaddfc888c6672c
Merge: 90b4bd708b1f011dd03efa8ccbd46efa6a2b6834 f8d44109e7fa408c8a0e4eb974d3cc7542689af4
Author: Pino Toscano <pino at debian.org>
Date:   Sat Apr 12 13:07:53 2014 +0200

    Merge remote-tracking branch 'origin/master' into kde4.12
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog                                   | 12 +++++++++
 debian/control                                     |  2 +-
 debian/patches/series                              |  1 +
 ...not-reject-ruby-versions-greater-than-1.9.patch | 29 ++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index a484798,c0a3fdd..fe2081a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,15 +1,29 @@@
 +kross-interpreters (4:4.12.2-2) UNRELEASED; urgency=medium
 +
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 12 Apr 2014 13:06:26 +0200
 +
 +kross-interpreters (4:4.12.2-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +  * Remove upstream patch: upstream_ruby-fix-rb_raise-calls-with-
 +    arguments.patch.
 +  * Bump kde-sc-dev-latest build dependency.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 10 Feb 2014 11:31:51 +0100
 +
+ kross-interpreters (4:4.11.5-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Fix krossruby build with ruby > 1.9: (Closes: #739128)
+     - bump the cmake build dependency to 2.8.12.1-1.2, since that version fixes
+       FindRuby.cmake for ruby 2.x versions
+     - backport upstream commit 7f919486919fb083670f66b5d9054a1c5e2179d0 to
+       accept ruby versions greater than 1.9; patch
+       upstream_ruby-do-not-reject-ruby-versions-greater-than-1.9.patch
+ 
+  -- Pino Toscano <pino at debian.org>  Sat, 12 Apr 2014 12:42:23 +0200
+ 
  kross-interpreters (4:4.11.5-2) unstable; urgency=medium
  
    * Merge previous upload.
diff --cc debian/control
index 16e2eb5,93cff7f..09b253c
--- a/debian/control
+++ b/debian/control
@@@ -2,9 -2,9 +2,9 @@@ Source: kross-interpreter
  Section: kde
  Priority: optional
  Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
- Build-Depends: cmake,
+ Build-Depends: cmake (>= 2.8.12.1-1.2~),
                 debhelper (>= 9),
 -               kde-sc-dev-latest (>= 4:4.11),
 +               kde-sc-dev-latest (>= 4:4.12),
                 kdelibs5-dev (>= 4:4.11),
                 pkg-kde-tools (>= 0.12),
                 python-dev,
diff --cc debian/patches/series
index 0000000,d39e7d2..20e47fb
mode 000000,100644..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,0 -1,2 +1,1 @@@
 -upstream_ruby-fix-rb_raise-calls-with-arguments.patch
+ upstream_ruby-do-not-reject-ruby-versions-greater-than-1.9.patch

-- 
Kross interpreters packaging