[DRE-commits] r3257 - packages/ruby-gnome2/trunk/debian

[acornet at alioth.debian.org]

Author: acornet
Date: 2009-03-07 09:40:49 +0000 (Sat, 07 Mar 2009)
New Revision: 3257

Modified:
   packages/ruby-gnome2/trunk/debian/changelog
   packages/ruby-gnome2/trunk/debian/compat
   packages/ruby-gnome2/trunk/debian/control
   packages/ruby-gnome2/trunk/debian/rules
Log:
Drop our CDBS class and build with debhelper only.

Modified: packages/ruby-gnome2/trunk/debian/changelog
===================================================================
--- packages/ruby-gnome2/trunk/debian/changelog	2009-03-05 01:34:32 UTC (rev 3256)
+++ packages/ruby-gnome2/trunk/debian/changelog	2009-03-07 09:40:49 UTC (rev 3257)
@@ -1,8 +1,10 @@
 ruby-gnome2 (0.18.1-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Bump compat to 7, build depend on debhelper 7, and switch to
+    debhelper 7 in debian/rules. Drop build depend on ruby-pkg-tools.
 
- -- Arnaud Cornet <acornet at debian.org>  Thu, 05 Mar 2009 02:25:35 +0100
+ -- Arnaud Cornet <acornet at debian.org>  Fri, 06 Mar 2009 18:09:04 +0100
 
 ruby-gnome2 (0.18.1-1) unstable; urgency=low
 

Modified: packages/ruby-gnome2/trunk/debian/compat
===================================================================
--- packages/ruby-gnome2/trunk/debian/compat	2009-03-05 01:34:32 UTC (rev 3256)
+++ packages/ruby-gnome2/trunk/debian/compat	2009-03-07 09:40:49 UTC (rev 3257)
@@ -1 +1 @@
-4
+7

Modified: packages/ruby-gnome2/trunk/debian/control
===================================================================
--- packages/ruby-gnome2/trunk/debian/control	2009-03-05 01:34:32 UTC (rev 3256)
+++ packages/ruby-gnome2/trunk/debian/control	2009-03-07 09:40:49 UTC (rev 3257)
@@ -3,7 +3,7 @@
 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: ruby-pkg-tools (>= 0.14), cdbs, debhelper (>= 4), ruby, ruby1.8, ruby1.8-dev, libgnomeui-dev, libglade2-dev, libgtkhtml2-dev, libpng12-dev, libgtkglext1-dev, libxmu-dev, libgtksourceview-dev, libpanel-applet2-dev, libgnomeprint2.2-dev (>= 2.8.0), libgnomeprintui2.2-dev (>= 2.6.0), librsvg2-dev (>= 2.8.0), libcairo-ruby, xulrunner-dev (>= 1.9~b5-4), libvte-dev (>= 0.12.1), libpoppler-glib-dev (>= 0.5.2), pkg-config, quilt, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgoocanvas-dev (>= 0.8.0), libgtksourceview2.0-dev
+Build-Depends: debhelper (>= 7), quilt, ruby, ruby1.8, ruby1.8-dev, libgnomeui-dev, libglade2-dev, libgtkhtml2-dev, libpng12-dev, libgtkglext1-dev, libxmu-dev, libgtksourceview-dev, libpanel-applet2-dev, libgnomeprint2.2-dev (>= 2.8.0), libgnomeprintui2.2-dev (>= 2.6.0), librsvg2-dev (>= 2.8.0), libcairo-ruby, xulrunner-dev (>= 1.9~b5-4), libvte-dev (>= 0.12.1), libpoppler-glib-dev (>= 0.5.2), pkg-config, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgoocanvas-dev (>= 0.8.0), libgtksourceview2.0-dev
 Standards-Version: 3.7.3
 Homepage: http://ruby-gnome2.sourceforge.jp/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/ruby-gnome2/trunk/

Modified: packages/ruby-gnome2/trunk/debian/rules
===================================================================
--- packages/ruby-gnome2/trunk/debian/rules	2009-03-05 01:34:32 UTC (rev 3256)
+++ packages/ruby-gnome2/trunk/debian/rules	2009-03-07 09:40:49 UTC (rev 3257)
@@ -1,32 +1,29 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
+include /usr/share/quilt/quilt.make
 
-# We might need that
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-
 DEB_RUBY_SETUP_CMD = extconf.rb
-cdbs_pkgdir = $(CURDIR)/debian/tmp
-cdbs_ruby_libdir_ver = $(cdbs_pkgdir)$(DEB_RUBY_LIBDIR)
-cdbs_ruby_archdir_ver = $(cdbs_pkgdir)$(DEB_RUBY_ARCHDIR)
-DEB_RUBY_INSTALL_ARGS = DESTDIR=$(cdbs_pkgdir) \
-		        sitelibdir=$(cdbs_ruby_libdir_ver) \
-		        sitearchdir=$(cdbs_ruby_archdir_ver)
 
-DEB_RUBY_SETUP_ARGS = --with-cflags="$(CFLAGS)" --with-ldflags="$(LDFLAGS)"
+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)
 
-common-configure-arch::
-	/usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_RUBY_ARGS) \
-		$(DEB_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_ARGS)
+build: patch
+	dh --before dh_auto_configure build
+	/usr/bin/ruby$(DEB_RUBY_VERSION) $(DEB_RUBY_SETUP_RUBY_ARGS) \
+		extconf.rb $(DEB_RUBY_SETUP_ARGS)
+	dh --after dh_auto_configure build
 
-common-build-arch::
-	$(MAKE)
+binary:
+	dh --before dh_auto_install binary
+	dh_auto_install -- $(DEB_RUBY_INSTALL_ARGS)
+	dh --after dh_auto_install binary
 
-common-install-arch::
-	$(MAKE) install $(DEB_RUBY_INSTALL_ARGS)
-
-clean::
-	[ ! -f Makefile ] || $(MAKE) distclean
-
+clean: unpatch
+	dh clean