Package: ruby-kde4 Version: 4:4.10.5-1.1 Severity: important Tags: patch User: debian-r...@lists.debian.org Usertags: ruby18-removal Control: block -1 with 520901
Hi! Please build the korundum package against ruby1.9.1, which has been the default Ruby interpreter since Wheezy. Ruby 1.8 is not maintained upstream anymore, and the Debian Ruby Team is willing to get rid of it as soon as possible. Please find attached patches to solve this issue, allowing to: - build against ruby1.9.1, libruby1.9.1-dev - install the files according to the Debian Ruby policy Note that this bug is blocked by #520901 against qtruby to build libqtruby4shared against ruby1.9.1. Cheers, Cédric
From 2cecd2bbe09e62fe3039b959b980c0d0cde14e5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Boutillier?= <bou...@debian.org>
Date: Tue, 17 Sep 2013 16:50:49 +0200
Subject: [PATCH 1/3] build against ruby1.9.1
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 6e64461..de7d9df 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-...@lists.debian.org>
Uploaders: Torsten Marek <shlo...@debian.org>, Sune Vuorela <s...@debian.org>, David Palacio <dpala...@orbitalibre.org>, Michael Meskes <mes...@debian.org>,
Maximiliano Curia <m...@debian.org>
-Build-Depends: debhelper (>= 9), cmake, ruby1.8, ruby1.8-dev,
+Build-Depends: debhelper (>= 9), cmake, ruby1.9.1, ruby1.9.1-dev,
smoke-dev-tools (>= 4:4.10), libsmokeqt4-dev (>= 4:4.10),
libsmokekde-dev (>= 4:4.10), libqtruby4shared-dev (>= 4:4.10),
kdelibs5-dev, kdepimlibs5-dev, libakonadi-dev, okular-dev (>= 4:4.10), libsoprano-dev
--
1.8.4.rc3
From ce49da11a9454d6c059056b8e6a91882b54235ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Boutillier?= <bou...@debian.org> Date: Tue, 17 Sep 2013 16:51:32 +0200 Subject: [PATCH 2/3] use Ruby vendor dirs to install as per Ruby policy --- debian/rules | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/debian/rules b/debian/rules index 4c291ea..e9e52f8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,12 +1,11 @@ #! /usr/bin/make -f -#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) \ - $(NULL) + -DCUSTOM_RUBY_SITE_LIB_DIR=$(RUBY_VENDORDIR) \ + -DCUSTOM_RUBY_SITE_ARCH_DIR=$(RUBY_VENDORARCHDIR) \ + $(NULL) override_dh_install: dh_install --list-missing -- 1.8.4.rc3
From d7e3aa7f34e4b2a28786a2ea4d47252fa40fc489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Boutillier?= <bou...@debian.org> Date: Wed, 18 Sep 2013 10:49:01 +0200 Subject: [PATCH 3/3] fix install paths --- debian/ruby-akonadi.install | 4 ++-- debian/ruby-kde4.install | 24 ++++++++++++------------ debian/ruby-okular.install | 4 ++-- debian/ruby-plasma.install | 4 ++-- debian/ruby-soprano.install | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/debian/ruby-akonadi.install b/debian/ruby-akonadi.install index edcb15f..f680c36 100644 --- a/debian/ruby-akonadi.install +++ b/debian/ruby-akonadi.install @@ -1,2 +1,2 @@ -usr/lib/ruby/1.8/*/akonadi.so -usr/lib/ruby/1.8/akonadi/akonadi.rb +usr/lib/ruby/vendor_ruby/*/*/akonadi.so +usr/lib/ruby/vendor_ruby/akonadi/akonadi.rb diff --git a/debian/ruby-kde4.install b/debian/ruby-kde4.install index d309294..76e1a19 100644 --- a/debian/ruby-kde4.install +++ b/debian/ruby-kde4.install @@ -1,15 +1,15 @@ usr/bin/krubyapplication usr/bin/rbkconfig_compiler4 usr/lib/kde4/krubypluginfactory.so -usr/lib/ruby/1.8/*/khtml.so -usr/lib/ruby/1.8/*/kio.so -usr/lib/ruby/1.8/*/korundum4.so -usr/lib/ruby/1.8/*/ktexteditor.so -usr/lib/ruby/1.8/*/nepomuk.so -usr/lib/ruby/1.8/*/solid.so -usr/lib/ruby/1.8/KDE/korundum4.rb -usr/lib/ruby/1.8/khtml/khtml.rb -usr/lib/ruby/1.8/kio/kio.rb -usr/lib/ruby/1.8/ktexteditor/ktexteditor.rb -usr/lib/ruby/1.8/nepomuk/nepomuk.rb -usr/lib/ruby/1.8/solid/solid.rb +usr/lib/ruby/vendor_ruby/*/*/khtml.so +usr/lib/ruby/vendor_ruby/*/*/kio.so +usr/lib/ruby/vendor_ruby/*/*/korundum4.so +usr/lib/ruby/vendor_ruby/*/*/ktexteditor.so +usr/lib/ruby/vendor_ruby/*/*/nepomuk.so +usr/lib/ruby/vendor_ruby/*/*/solid.so +usr/lib/ruby/vendor_ruby/KDE/korundum4.rb +usr/lib/ruby/vendor_ruby/khtml/khtml.rb +usr/lib/ruby/vendor_ruby/kio/kio.rb +usr/lib/ruby/vendor_ruby/ktexteditor/ktexteditor.rb +usr/lib/ruby/vendor_ruby/nepomuk/nepomuk.rb +usr/lib/ruby/vendor_ruby/solid/solid.rb diff --git a/debian/ruby-okular.install b/debian/ruby-okular.install index 4060193..cf8c95f 100644 --- a/debian/ruby-okular.install +++ b/debian/ruby-okular.install @@ -1,2 +1,2 @@ -usr/lib/ruby/1.8/*/okular.so -usr/lib/ruby/1.8/okular/okular.rb +usr/lib/ruby/vendor_ruby/*/*/okular.so +usr/lib/ruby/vendor_ruby/okular/okular.rb diff --git a/debian/ruby-plasma.install b/debian/ruby-plasma.install index e15c4f9..6297fb8 100644 --- a/debian/ruby-plasma.install +++ b/debian/ruby-plasma.install @@ -1,2 +1,2 @@ -usr/lib/ruby/1.8/*/plasma_applet.so -usr/lib/ruby/1.8/KDE/plasma.rb +usr/lib/ruby/vendor_ruby/*/*/plasma_applet.so +usr/lib/ruby/vendor_ruby/KDE/plasma.rb diff --git a/debian/ruby-soprano.install b/debian/ruby-soprano.install index ffc1aaf..6f98dab 100644 --- a/debian/ruby-soprano.install +++ b/debian/ruby-soprano.install @@ -1,2 +1,2 @@ -usr/lib/ruby/1.8/*/soprano.so -usr/lib/ruby/1.8/soprano/soprano.rb +usr/lib/ruby/vendor_ruby/*/*/soprano.so +usr/lib/ruby/vendor_ruby/soprano/soprano.rb -- 1.8.4.rc3
signature.asc
Description: Digital signature
