[SCM] qtruby packaging branch, multi-ruby, updated. 743858702ab34ce08575977f2c303fcfadd214d0
David Palacio
dpalacio-guest at alioth.debian.org
Fri Sep 23 22:48:23 UTC 2011
The following commit has been merged in the multi-ruby branch:
commit d3e752ab1154b2cbb0f359ec4c95896db7f9fbc2
Merge: e7047d2a14fb67eaf77f61ebf1b34a21b50379c9 2460eea198763f4ba1a9b6923e55f2586029f2c8
Author: David Palacio <dpalacio at orbitalibre.org>
Date: Fri Sep 23 17:13:27 2011 -0500
Merge branch 'master' into multi-ruby
Conflicts:
debian/control
debian/ruby-qscintilla2.install
debian/ruby-qt4.install
debian/ruby-qwt5.install
debian/rules
debian/changelog | 43 +-
debian/control | 152 ++-
debian/copyright | 30 +-
debian/patches/00_install_to_usr.diff | 16 -
debian/patches/fix_ruby_requires.diff | 1337 ++++++++++++++++++++
debian/patches/series | 4 +-
.../{01_use_ruby1.8.diff => use_ruby1.8.diff} | 7 +-
debian/rbqtapi.1 | 51 +
debian/rbrcc.1 | 48 +
debian/rbuic4.1 | 52 +
...ruby-qt4-phonon.install => ruby-phonon.install} | 0
debian/ruby-qscintilla2.examples | 1 +
debian/ruby-qt4-test.examples | 1 +
debian/ruby-qt4.install | 6 +-
debian/ruby-qt4.links | 2 +
debian/ruby-qt4.manpages | 3 +
debian/ruby-qwt5.examples | 1 +
debian/ruby-qwt5.install | 5 +-
debian/rules | 27 +-
debian/source/lintian-overrides | 2 +
debian/tests/test_checkarg.rb | 16 +
debian/watch | 2 +-
22 files changed, 1703 insertions(+), 103 deletions(-)
diff --cc debian/control
index a81ff82,00039bd..b21363e
--- a/debian/control
+++ b/debian/control
@@@ -2,11 -2,10 +2,11 @@@ Source: qtrub
Section: ruby
Priority: optional
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>, Modestas Vainius <modax at debian.org>, Michael Meskes <meskes at 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,
- libqt4-dev, libsmokeqt4-dev, libqtwebkit-dev, libqwt5-qt4-dev, libphonon-dev,
- libqscintilla2-dev
- smoke-dev-tools (>= 4:4.7.0), libsmokeqt4-dev, ruby1.8, ruby1.8-dev,
++ ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
++ smoke-dev-tools (>= 4:4.7.0), libsmokeqt4-dev,
+ libqt4-dev, libqtwebkit-dev, libphonon-dev, libqscintilla2-dev
Standards-Version: 3.9.2
Homepage: http://projects.kde.org/projects/kde/kdebindings/ruby/qtruby
Vcs-Git: git://git.debian.org/git/pkg-kde/kde-sc/qtruby.git
@@@ -105,13 -136,15 +137,15 @@@ Description: QtWebKit bindings for the
#Transitional packages: http://wiki.debian.org/Teams/Ruby/RubyInWheezy
Package: libqt4-ruby
Architecture: all
- Depends: ruby-qt4
- Description: Transitional dummy package for libqt4-ruby
- The KDE community creates tools and applications for the modern desktop. This package lets developers use these tools with the Ruby language.
+ Depends: ${misc:Depends}, ruby-qt4
-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.
Package: libqt4-ruby1.8
Architecture: all
- Depends: ruby-qt4
- Description: Transitional dummy package for libqt4-ruby1.8
- The KDE community creates tools and applications for the modern desktop. This package lets developers use these tools with the Ruby language.
+ Depends: ${misc:Depends}, ruby-qt4
-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/ruby-qt4.install
index a03983d,575ab0a..64748ae
--- a/debian/ruby-qt4.install
+++ b/debian/ruby-qt4.install
@@@ -1,9 -1,6 +1,9 @@@
+ usr/bin/rbqtapi
usr/bin/rbrcc
usr/bin/rbuic4
- usr/bin/rbqtapi
-usr/lib/ruby/1.8/Qt/*.rb
usr/lib/ruby/1.8/Qt*.rb
- usr/lib/ruby/1.8/*/qtruby4.so
+usr/lib/ruby/1.8/Qt/*.rb
+ usr/lib/ruby/1.8/*/qtruby4.so
+usr/lib/ruby/1.9*/Qt*.rb
- usr/lib/ruby/1.9*/*/qtruby4.so
+usr/lib/ruby/1.9*/Qt/*.rb
++usr/lib/ruby/1.9*/*/qtruby4.so
diff --cc debian/ruby-qwt5.install
index 1121963,4d73a76..8881040
--- a/debian/ruby-qwt5.install
+++ b/debian/ruby-qwt5.install
@@@ -1,5 -1,2 +1,4 @@@
- usr/lib/ruby/1.8/*/qwt.so
usr/lib/ruby/1.8/qwt/qwt.rb
- usr/lib/ruby/1.9*/*/qwt.so
+ usr/lib/ruby/1.8/*/qwt.so
+usr/lib/ruby/1.9*/qwt/qwt.rb
-
++usr/lib/ruby/1.9*/*/qwt.so
diff --cc debian/rules
index 74ec035,02fcc23..96801d0
--- a/debian/rules
+++ b/debian/rules
@@@ -1,11 -1,12 +1,6 @@@
#! /usr/bin/make -f
- # This has to be exported to make some magic below work.
- export DH_OPTIONS
- ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
- endif
-#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)
override_dh_install:
dh_install --list-missing
@@@ -13,27 -14,18 +8,33 @@@
override_dh_strip:
dh_strip --dbg-package=ruby-qt4-dbg
- #Build-Depend on pkg-kde-tools (>= 0.6.8) for dh_sodeps
- override_dh_gencontrol:
- dh_sodeps
- dh_gencontrol
-
+override_dh_auto_clean:
+ dh_auto_clean --builddirectory=obj-ruby18
+ dh_auto_clean --builddirectory=obj-ruby191
+
override_dh_auto_configure:
- dh_auto_configure --builddirectory=obj-ruby18 -- -DRUBY_EXECUTABLE=/usr/bin/ruby1.8
- dh_auto_configure -- $(CMAKE_FLAGS)
++ dh_auto_configure --builddirectory=obj-ruby18 -- -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)
+ dh_auto_configure --builddirectory=obj-ruby191 -- -DRUBY_EXECUTABLE=/usr/bin/ruby1.9.1 -DRUBY_LIBRARY=/usr/lib/libruby-1.9.1.so
+
+override_dh_auto_build:
+ dh_auto_build --builddirectory=obj-ruby18
+ dh_auto_build --builddirectory=obj-ruby191
+
+override_dh_auto_install:
+ dh_auto_install --builddirectory=obj-ruby18
+ dh_auto_install --builddirectory=obj-ruby191
+ override_dh_compress:
+ dh_compress -X.rb -X.ui -X.mng -X.xbel
+
+ override_dh_installexamples:
+ dh_installexamples
+ tar cvzf $(CURDIR)/debian/ruby-qt4/usr/share/doc/ruby-qt4/examples.tar.gz examples
+
+ #Build-Depend on debhelper (>= 7.4.10) for --parallel
+ #Build-Depend on pkg-kde-tools (>= 0.6.8) for the sodeps addon
%:
- dh $@
+ dh $@ --parallel --with sodeps
--
qtruby packaging
More information about the pkg-kde-commits
mailing list