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

Cédric Boutillier boutil at moszumanska.debian.org
Tue Dec 10 14:41:06 UTC 2013


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

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

    drop use_ruby1.8.diff, since the default Ruby version is used now
---
 debian/changelog                |  1 +
 debian/patches/series           |  1 -
 debian/patches/use_ruby1.8.diff | 14 --------------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dd7c8fe..c4d76ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtruby (4:4.11.3-2) UNRELEASED; urgency=low
 
   * Build-conflict with ruby1.8 and build with ruby1.9.1.
   * Install files in Ruby vendor locations as per Ruby policy.
+  * Drop use_ruby1.8.diff, since the default Ruby version is used now.
 
  -- Cédric Boutillier <boutil at debian.org>  Sun, 24 Nov 2013 00:12:01 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index aa9ef00..1f2052f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-use_ruby1.8.diff
 fix_ruby_requires.diff
diff --git a/debian/patches/use_ruby1.8.diff b/debian/patches/use_ruby1.8.diff
deleted file mode 100644
index 019998a..0000000
--- a/debian/patches/use_ruby1.8.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Vincent Fourmond <fourmond at debian.org>
-Description: Use Debian executable name
-Last-Update: 2011-06-24
-Origin: vendor
-Forwarded: no
-
---- a/bin/rbqtapi
-+++ b/bin/rbqtapi
-@@ -1,4 +1,4 @@
--#!/usr/bin/env ruby
-+#!/usr/bin/env ruby1.8
- 
- # Note: this program is part of qtruby and makes use of its internal functions.
- #       You should not rely on those in your own programs.

-- 
qtruby packaging



More information about the pkg-kde-commits mailing list