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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 3d8ea785611f8f8023a2b7ba1f7e9923a7ef6507
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu May 22 14:33:48 2014 +0200

    Remove upstream patch: upstream_ruby-do-not-reject-ruby-versions-greater-than-1.9.patch
---
 debian/changelog                                   |  2 ++
 debian/patches/series                              |  1 -
 ...not-reject-ruby-versions-greater-than-1.9.patch | 29 ----------------------
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 016e16d..7764f82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 kross-interpreters (4:4.13.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove upstream patch: upstream_ruby-do-not-reject-ruby-versions-
+    greater-than-1.9.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 22 May 2014 14:28:03 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 20e47fb..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-upstream_ruby-do-not-reject-ruby-versions-greater-than-1.9.patch
diff --git a/debian/patches/upstream_ruby-do-not-reject-ruby-versions-greater-than-1.9.patch b/debian/patches/upstream_ruby-do-not-reject-ruby-versions-greater-than-1.9.patch
deleted file mode 100644
index 33b91ed..0000000
--- a/debian/patches/upstream_ruby-do-not-reject-ruby-versions-greater-than-1.9.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7f919486919fb083670f66b5d9054a1c5e2179d0 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Sat, 12 Apr 2014 12:21:47 +0200
-Subject: [PATCH] ruby: do not reject ruby versions greater than 1.9
-
-krossruby seems to build fine with them, so do not require just ruby
-1.9.x.
----
- ruby/CMakeLists.txt | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/ruby/CMakeLists.txt b/ruby/CMakeLists.txt
-index 7826a2f..07ac65d 100644
---- a/ruby/CMakeLists.txt
-+++ b/ruby/CMakeLists.txt
-@@ -1,9 +1,6 @@
- find_package(Ruby 1.9 QUIET)
- 
--if( RUBY_VERSION VERSION_GREATER "1.10" )
--    message(STATUS "Found Ruby: ${RUBY_EXECUTABLE} (found version \"${RUBY_VERSION}\") but only 1.9.x supported")
--    set(RUBY_FOUND False)
--else()
-+if(RUBY_FOUND)
-     message(STATUS "Found Ruby: ${RUBY_EXECUTABLE} (found version \"${RUBY_VERSION}\")")
- endif()
- 
--- 
-1.9.1
-

-- 
Kross interpreters packaging