[DRE-commits] [SCM] ruby-gnome2.git branch, master, updated. 25aafcf06cd16ab64929480904d96f729b65b5f8

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 7cbe5d6f84a40d22339b9484d7b8a5c5716675c5
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Sun Jun 19 22:42:41 2011 -0700

    Build for different rubies

diff --git a/debian/build b/debian/build
new file mode 100755
index 0000000..03fd39d
--- /dev/null
+++ b/debian/build
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+if [ $# -ne 1 ]; then
+  echo "usage: $0 RUBY"
+  exit 1
+fi
+
+ruby="$1"
+
+libdir=$($ruby -rrbconfig -e 'puts Config::CONFIG["vendordir"]')
+archdir=$($ruby -rrbconfig -e 'puts Config::CONFIG["vendorarchdir"]')
+curdir=$(pwd)
+pkgdir="$curdir/debian/tmp"
+
+echo "I: Building with $ruby"
+echo "I: libdir  = $libdir"
+echo "I: archdir = $archdir"
+echo "I: DESTDIR = $pkgdir"
+
+$ruby extconf.rb
+
+make
+
+make install DESTDIR="$pkgdir" sitelibdir="$pkgdir/$libdir" sitearchdir="$pkgdir/$archdir"
+
+make distclean
diff --git a/debian/control b/debian/control
index d31241d..4cdf16c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: Arnaud Cornet <acornet at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Paul van Tilburg <paulvt at debian.org>, Michael Schutte <m.schutte.jr at gmail.com>, Antonio Terceiro <terceiro at softwarelivre.org>
-Build-Depends: debhelper (>= 7.0.50~), ruby, ruby1.8, ruby1.8-dev, libgnomeui-dev, libglade2-dev, libpng12-dev, libgtkglext1-dev, libxmu-dev, libpanel-applet2-dev, librsvg2-dev (>= 2.8.0), libcairo-ruby, xulrunner-dev (>= 1.9.1.3-2), libvte-dev (>= 0.12.1), libpoppler-glib-dev (>= 0.8.0), pkg-config, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgoocanvas-dev (>= 0.8.0), libgtksourceview2.0-dev, libdrm-dev, libjpeg62-dev
+Build-Depends: debhelper (>= 7.0.50~), ruby, ruby1.8, ruby1.8-dev, libgnomeui-dev, libglade2-dev, libpng12-dev, libgtkglext1-dev, libxmu-dev, libpanel-applet2-dev, librsvg2-dev (>= 2.8.0), xulrunner-dev (>= 1.9.1.3-2), libvte-dev (>= 0.12.1), libpoppler-glib-dev (>= 0.8.0), pkg-config, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgoocanvas-dev (>= 0.8.0), libgtksourceview2.0-dev, libdrm-dev, libjpeg62-dev, ruby-cairo
 Standards-Version: 3.8.4
 Homepage: http://ruby-gnome2.sourceforge.jp/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/ruby-gnome2/
diff --git a/debian/rules b/debian/rules
index e0a301c..a3d09de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,12 @@
 #!/usr/bin/make -f
 
-DEB_RUBY_VERSION = 1.8
-DEB_RUBY_LIBDIR=$(strip $(shell ruby$(DEB_RUBY_VERSION) -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]'))
-DEB_RUBY_ARCHDIR=$(strip $(shell ruby$(DEB_RUBY_VERSION) -rrbconfig -e 'puts Config::CONFIG["archdir"]'))
-pkgdir = $(CURDIR)/debian/tmp
-ruby_libdir_ver = $(pkgdir)$(DEB_RUBY_LIBDIR)
-ruby_archdir_ver = $(pkgdir)$(DEB_RUBY_ARCHDIR)
-DEB_RUBY_INSTALL_ARGS = DESTDIR=$(pkgdir) \
-		        sitelibdir=$(ruby_libdir_ver) \
-		        sitearchdir=$(ruby_archdir_ver)
-
 %:
 	dh --with xulrunner $@
 
-override_dh_auto_configure:
-	/usr/bin/ruby$(DEB_RUBY_VERSION) $(DEB_RUBY_SETUP_RUBY_ARGS) \
-		extconf.rb $(DEB_RUBY_SETUP_ARGS)
-
 override_dh_auto_install:
-	dh_auto_install -- $(DEB_RUBY_INSTALL_ARGS)
+	debian/build ruby1.8
+	debian/build ruby1.9.1
+	dh_auto_install
 
 override_dh_strip:
 	for i in $$(sed -n '/Package:.*ruby1.8-dbg/ { s/Package: \(.*\)-dbg/\1/ p }' debian/control) ; do \

-- 
ruby-gnome2.git