[SCM] qtruby packaging branch, multi-ruby, updated. 60c3e087d46bf792e7c9342b2a806b425e4050dd

[David Palacio]

The following commit has been merged in the multi-ruby branch:
commit 60c3e087d46bf792e7c9342b2a806b425e4050dd
Merge: 743858702ab34ce08575977f2c303fcfadd214d0 fad8a355a5e5d6362f43b53c0b8e2bdf2c2361db
Author: David Palacio <dpalacio at orbitalibre.org>
Date:   Fri Sep 30 19:12:53 2011 -0500

    Merge branch 'master' into multi-ruby
    
    Conflicts:
    	debian/control
    	debian/rules

 debian/changelog |   10 +++-
 debian/control   |    5 +-
 debian/copyright |  146 +++++++++++++++++++++++++++++++++++++++++-------------
 debian/rules     |   19 +++++++
 4 files changed, 141 insertions(+), 39 deletions(-)

diff --cc debian/control
index b21363e,5bb8fab..54d6400
--- a/debian/control
+++ b/debian/control
@@@ -4,8 -4,8 +4,8 @@@ Priority: optiona
  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>
  Build-Depends: debhelper (>= 7.4.10), pkg-kde-tools (>= 0.6.8), cmake,
 + ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
-  smoke-dev-tools (>= 4:4.7.0), libsmokeqt4-dev,
+  smoke-dev-tools (>= 4:4.7.1), libsmokeqt4-dev (>= 4:4.7.1),
 - ruby1.8, ruby1.8-dev,
   libqt4-dev, libqtwebkit-dev, libphonon-dev, libqscintilla2-dev
  Standards-Version: 3.9.2
  Homepage: http://projects.kde.org/projects/kde/kdebindings/ruby/qtruby
@@@ -144,8 -144,9 +144,9 @@@ Description: Transitional package for r
  
  Package: libqt4-ruby1.8
  Architecture: all
- Depends: ${misc:Depends}, ruby-qt4
+ Depends: ${misc:Depends}, ruby-qt4, ruby-phonon, ruby-qt4-script,
+  ruby-qt4-test, ruby-qt4-uitools, ruby-qt4-webkit
 -Description: transitional package for ruby-qt4
 +Description: Transitional package for ruby-qt4
   This is a transitional package to ease upgrades to the ruby-qt4 package.
   It can safely be removed.
  
diff --cc debian/rules
index bd0d34a,94e717e..ddc8253
--- a/debian/rules
+++ b/debian/rules
@@@ -1,10 -1,19 +1,16 @@@
  #! /usr/bin/make -f
  
+ 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"]')
 -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)
 +RUBY18_SITEARCH := $(shell ruby1.8 -rrbconfig -e 'puts Config::CONFIG["sitearch"]')
 +RUBY19_SITEARCH := $(shell ruby1.9.1 -rrbconfig -e 'puts Config::CONFIG["sitearch"]')
 +OBJRUBY18 = obj-ruby18
 +OBJRUBY19 = obj-ruby19
  
+ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
+ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+ 
  override_dh_install:
  	dh_install --list-missing
  

-- 
qtruby packaging