[DRE-maint] Bug#704966: patches
Cédric Boutillier
cedric.boutillier at gmail.com
Tue Sep 17 13:09:37 UTC 2013
Control: tag -1 patch
Hi,
I gave a try a making a patch to build qtruby against ruby1.9.1 instead
of ruby1.8.
Please find attached the sequence of changes, as well as the full debdiff.
I had to add a Build-Conflicts with ruby1.8, since otherwise the
libraries got linked against libruby1.8 if it happened to be installed
on the system during the build.
Tell me what you think.
Cheers,
Cédric
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-build-conflict-with-ruby1.8-and-build-with-ruby1.9.1.patch
Type: text/x-diff
Size: 1896 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-ruby-extras-maintainers/attachments/20130917/5bf4aa8e/attachment.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-install-files-in-Ruby-vendor-locations-as-per-Ruby-p.patch
Type: text/x-diff
Size: 1237 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-ruby-extras-maintainers/attachments/20130917/5bf4aa8e/attachment-0001.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-fix-install-path-for-Ruby-libs.patch
Type: text/x-diff
Size: 3950 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-ruby-extras-maintainers/attachments/20130917/5bf4aa8e/attachment-0002.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0004-drop-use_ruby1.8.diff-since-the-default-Ruby-version.patch
Type: text/x-diff
Size: 1252 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-ruby-extras-maintainers/attachments/20130917/5bf4aa8e/attachment-0003.patch>
-------------- next part --------------
diff -Nru qtruby-4.10.5/debian/changelog qtruby-4.10.5/debian/changelog
--- qtruby-4.10.5/debian/changelog 2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/changelog 2013-09-17 14:54:00.000000000 +0200
@@ -1,3 +1,12 @@
+qtruby (4:4.10.5-1.1) UNRELEASED; urgency=low
+
+ * build-conflict with ruby1.8 and build with ruby1.9.1
+ * install files in Ruby vendor locations as per Ruby policy
+ * fix install path for Ruby libs
+ * drop use_ruby1.8.diff, since the default Ruby version is used now
+
+ -- Cédric Boutillier <boutil at debian.org> Tue, 17 Sep 2013 14:53:38 +0200
+
qtruby (4:4.10.5-1) unstable; urgency=low
* New upstream release.
diff -Nru qtruby-4.10.5/debian/control qtruby-4.10.5/debian/control
--- qtruby-4.10.5/debian/control 2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/control 2013-09-17 14:41:19.000000000 +0200
@@ -4,9 +4,10 @@
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Torsten Marek <shlomme at debian.org>, Sune Vuorela <sune 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.10), libsmokeqt4-dev (>= 4:4.10),
- 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
@@ -42,7 +43,7 @@
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)
@@ -71,7 +72,7 @@
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.
.
diff -Nru qtruby-4.10.5/debian/patches/series qtruby-4.10.5/debian/patches/series
--- qtruby-4.10.5/debian/patches/series 2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/patches/series 2013-09-17 14:48:57.000000000 +0200
@@ -1,2 +1 @@
-use_ruby1.8.diff
fix_ruby_requires.diff
diff -Nru qtruby-4.10.5/debian/patches/use_ruby1.8.diff qtruby-4.10.5/debian/patches/use_ruby1.8.diff
--- qtruby-4.10.5/debian/patches/use_ruby1.8.diff 2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/patches/use_ruby1.8.diff 1970-01-01 01:00:00.000000000 +0100
@@ -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.
diff -Nru qtruby-4.10.5/debian/ruby-phonon.install qtruby-4.10.5/debian/ruby-phonon.install
--- qtruby-4.10.5/debian/ruby-phonon.install 2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-phonon.install 2013-09-17 14:48:42.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/phonon/phonon.rb
-usr/lib/ruby/1.8/*/phonon.so
+usr/lib/ruby/vendor_ruby/phonon/phonon.rb
+usr/lib/ruby/vendor_ruby/*/*/phonon.so
diff -Nru qtruby-4.10.5/debian/ruby-qscintilla2.install qtruby-4.10.5/debian/ruby-qscintilla2.install
--- qtruby-4.10.5/debian/ruby-qscintilla2.install 2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-qscintilla2.install 2013-09-17 14:03:04.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qscintilla/qscintilla.rb
-usr/lib/ruby/1.8/*/qscintilla.so
+usr/lib/ruby/vendor_ruby/qscintilla/qscintilla.rb
+usr/lib/ruby/vendor_ruby/*/*/qscintilla.so
diff -Nru qtruby-4.10.5/debian/ruby-qt4-declarative.install qtruby-4.10.5/debian/ruby-qt4-declarative.install
--- qtruby-4.10.5/debian/ruby-qt4-declarative.install 2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-qt4-declarative.install 2013-09-17 14:03:16.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qtdeclarative/qtdeclarative.rb
-usr/lib/ruby/1.8/*/qtdeclarative.so
+usr/lib/ruby/vendor_ruby/qtdeclarative/qtdeclarative.rb
+usr/lib/ruby/vendor_ruby/*/*/qtdeclarative.so
diff -Nru qtruby-4.10.5/debian/ruby-qt4.install qtruby-4.10.5/debian/ruby-qt4.install
--- qtruby-4.10.5/debian/ruby-qt4.install 2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-qt4.install 2013-09-17 14:03:37.000000000 +0200
@@ -1,6 +1,6 @@
usr/bin/rbqtapi
usr/bin/rbrcc
usr/bin/rbuic4
-usr/lib/ruby/1.8/Qt/*.rb
-usr/lib/ruby/1.8/Qt*.rb
-usr/lib/ruby/1.8/*/qtruby4.so
+usr/lib/ruby/vendor_ruby/Qt/*.rb
+usr/lib/ruby/vendor_ruby/Qt*.rb
+usr/lib/ruby/vendor_ruby/*/*/qtruby4.so
diff -Nru qtruby-4.10.5/debian/ruby-qt4-script.install qtruby-4.10.5/debian/ruby-qt4-script.install
--- qtruby-4.10.5/debian/ruby-qt4-script.install 2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-qt4-script.install 2013-09-17 14:03:48.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qtscript/qtscript.rb
-usr/lib/ruby/1.8/*/qtscript.so
+usr/lib/ruby/vendor_ruby/qtscript/qtscript.rb
+usr/lib/ruby/vendor_ruby/*/*/qtscript.so
diff -Nru qtruby-4.10.5/debian/ruby-qt4-test.install qtruby-4.10.5/debian/ruby-qt4-test.install
--- qtruby-4.10.5/debian/ruby-qt4-test.install 2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-qt4-test.install 2013-09-17 14:03:56.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qttest/qttest.rb
-usr/lib/ruby/1.8/*/qttest.so
+usr/lib/ruby/vendor_ruby/qttest/qttest.rb
+usr/lib/ruby/vendor_ruby/*/*/qttest.so
diff -Nru qtruby-4.10.5/debian/ruby-qt4-uitools.install qtruby-4.10.5/debian/ruby-qt4-uitools.install
--- qtruby-4.10.5/debian/ruby-qt4-uitools.install 2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-qt4-uitools.install 2013-09-17 14:04:03.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qtuitools/qtuitools.rb
-usr/lib/ruby/1.8/*/qtuitools.so
+usr/lib/ruby/vendor_ruby/qtuitools/qtuitools.rb
+usr/lib/ruby/vendor_ruby/*/*/qtuitools.so
diff -Nru qtruby-4.10.5/debian/ruby-qt4-webkit.install qtruby-4.10.5/debian/ruby-qt4-webkit.install
--- qtruby-4.10.5/debian/ruby-qt4-webkit.install 2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-qt4-webkit.install 2013-09-17 14:04:11.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qtwebkit/qtwebkit.rb
-usr/lib/ruby/1.8/*/qtwebkit.so
+usr/lib/ruby/vendor_ruby/qtwebkit/qtwebkit.rb
+usr/lib/ruby/vendor_ruby/*/*/qtwebkit.so
diff -Nru qtruby-4.10.5/debian/ruby-qwt5.install qtruby-4.10.5/debian/ruby-qwt5.install
--- qtruby-4.10.5/debian/ruby-qwt5.install 2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-qwt5.install 2013-09-17 14:04:18.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qwt/qwt.rb
-usr/lib/ruby/1.8/*/qwt.so
+usr/lib/ruby/vendor_ruby/qwt/qwt.rb
+usr/lib/ruby/vendor_ruby/*/*/qwt.so
diff -Nru qtruby-4.10.5/debian/rules qtruby-4.10.5/debian/rules
--- qtruby-4.10.5/debian/rules 2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/rules 2013-09-17 14:19:42.000000000 +0200
@@ -3,12 +3,12 @@
pkgs_lib := $(filter-out %-dev %-dbg,$(filter lib%,$(shell dh_listpackages)))
current_version := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
-#Always use Ruby 1.8.x
-RUBY_SITEARCH := $(shell ruby1.8 -rrbconfig -e 'puts Config::CONFIG["sitearch"]')
+
+RUBY_VENDORARCHDIR := $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"]')
+RUBY_VENDORDIR := $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendordir"]')
CMAKE_FLAGS := \
- -DRUBY_EXECUTABLE=/usr/bin/ruby1.8 \
- -DCUSTOM_RUBY_SITE_LIB_DIR=/usr/lib/ruby/1.8/ \
- -DCUSTOM_RUBY_SITE_ARCH_DIR=/usr/lib/ruby/1.8/$(RUBY_SITEARCH) \
+ -DCUSTOM_RUBY_SITE_LIB_DIR=$(RUBY_VENDORDIR) \
+ -DCUSTOM_RUBY_SITE_ARCH_DIR=$(RUBY_VENDORARCHDIR) \
$(NULL)
override_dh_install:
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-ruby-extras-maintainers/attachments/20130917/5bf4aa8e/attachment.sig>
More information about the Pkg-ruby-extras-maintainers
mailing list