[SCM] korundum packaging branch, master, updated. debian/4.11.3-1-5-gacf1fe8

[Cédric Boutillier]

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

The following commit has been merged in the master branch:
commit 16052d2a348351f6c7637483384953d5df33639b
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Dec 3 07:57:18 2013 +0100

    Use Ruby vendor directories to install as per Ruby policy.
---
 debian/changelog            |  1 +
 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 ++--
 debian/rules                | 11 +++++------
 7 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27c82ad..3ab89e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ korundum (4:4.11.3-2) UNRELEASED; urgency=low
   * Build against default Ruby version (Closes: #723634).
   * Add myself to uploaders.
   * Bump Standards-Version to 3.9.5 (no changes needed).
+  * Use Ruby vendor directories to install as per Ruby policy.
 
  -- Cédric Boutillier <boutil at debian.org>  Tue, 03 Dec 2013 07:50:02 +0100
 
diff --git a/debian/ruby-akonadi.install b/debian/ruby-akonadi.install
index edcb15f..ff1fde9 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..bb1bc11 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..9583d1c 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..441f8fd 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..944f713 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
diff --git a/debian/rules b/debian/rules
index 4c291ea..062feeb 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_VENDORLIBDIR := $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]')
 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_VENDORLIBDIR) \
+  -DCUSTOM_RUBY_SITE_ARCH_DIR=$(RUBY_VENDORARCHDIR) \
+   $(NULL)
 
 override_dh_install:
 	dh_install --list-missing

-- 
korundum packaging