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

[Cédric Boutillier]

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

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

    install files in Ruby vendor locations as per Ruby policy
---
 debian/changelog                    |  1 +
 debian/ruby-phonon.install          |  4 ++--
 debian/ruby-qscintilla2.install     |  4 ++--
 debian/ruby-qt4-declarative.install |  4 ++--
 debian/ruby-qt4-script.install      |  4 ++--
 debian/ruby-qt4-test.install        |  4 ++--
 debian/ruby-qt4-uitools.install     |  4 ++--
 debian/ruby-qt4-webkit.install      |  4 ++--
 debian/ruby-qt4.install             |  6 +++---
 debian/ruby-qwt5.install            |  4 ++--
 debian/rules                        | 10 +++++-----
 11 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d33fe9f..dd7c8fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,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.
 
  -- Cédric Boutillier <boutil at debian.org>  Sun, 24 Nov 2013 00:12:01 +0100
 
diff --git a/debian/ruby-phonon.install b/debian/ruby-phonon.install
index 4214be8..7c37506 100644
--- a/debian/ruby-phonon.install
+++ b/debian/ruby-phonon.install
@@ -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 --git a/debian/ruby-qscintilla2.install b/debian/ruby-qscintilla2.install
index 3bad1b8..3cd8108 100644
--- a/debian/ruby-qscintilla2.install
+++ b/debian/ruby-qscintilla2.install
@@ -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 --git a/debian/ruby-qt4-declarative.install b/debian/ruby-qt4-declarative.install
index c3f1814..1576645 100644
--- a/debian/ruby-qt4-declarative.install
+++ b/debian/ruby-qt4-declarative.install
@@ -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 --git a/debian/ruby-qt4-script.install b/debian/ruby-qt4-script.install
index 29a847b..3a0a9fa 100644
--- a/debian/ruby-qt4-script.install
+++ b/debian/ruby-qt4-script.install
@@ -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 --git a/debian/ruby-qt4-test.install b/debian/ruby-qt4-test.install
index 076cf4c..6e95b28 100644
--- a/debian/ruby-qt4-test.install
+++ b/debian/ruby-qt4-test.install
@@ -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 --git a/debian/ruby-qt4-uitools.install b/debian/ruby-qt4-uitools.install
index de490cf..92e8d8c 100644
--- a/debian/ruby-qt4-uitools.install
+++ b/debian/ruby-qt4-uitools.install
@@ -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 --git a/debian/ruby-qt4-webkit.install b/debian/ruby-qt4-webkit.install
index 9870da1..e7bff67 100644
--- a/debian/ruby-qt4-webkit.install
+++ b/debian/ruby-qt4-webkit.install
@@ -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 --git a/debian/ruby-qt4.install b/debian/ruby-qt4.install
index 575ab0a..cc344f8 100644
--- a/debian/ruby-qt4.install
+++ b/debian/ruby-qt4.install
@@ -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 --git a/debian/ruby-qwt5.install b/debian/ruby-qwt5.install
index 4d73a76..b50895f 100644
--- a/debian/ruby-qwt5.install
+++ b/debian/ruby-qwt5.install
@@ -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 --git a/debian/rules b/debian/rules
index 4d66f5b..22e67af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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_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) \
+  -DCUSTOM_RUBY_SITE_LIB_DIR=$(RUBY_VENDORLIBDIR) \
+  -DCUSTOM_RUBY_SITE_ARCH_DIR=$(RUBY_VENDORARCHDIR) \
   $(NULL)
 
 override_dh_install:

-- 
qtruby packaging