r11028 - packages/trunk/chromium-bsu/debian

[Paul Wise]

Author: pabs
Date: 2010-06-19 12:40:39 +0000 (Sat, 19 Jun 2010)
New Revision: 11028

Modified:
   packages/trunk/chromium-bsu/debian/changelog
   packages/trunk/chromium-bsu/debian/compat
   packages/trunk/chromium-bsu/debian/control
   packages/trunk/chromium-bsu/debian/rules
Log:
Switch to minimalist debhelper 7 rules

Modified: packages/trunk/chromium-bsu/debian/changelog
===================================================================
--- packages/trunk/chromium-bsu/debian/changelog	2010-06-19 10:37:40 UTC (rev 11027)
+++ packages/trunk/chromium-bsu/debian/changelog	2010-06-19 12:40:39 UTC (rev 11028)
@@ -6,6 +6,7 @@
   * Add ${misc:Depends} to the dummy packages, just in case
   * Be explicit about using dpkg source format v1.0
   * Bump priority of dummy packages to extra
+  * Switch to minimalist debhelper 7 rules
 
  -- Paul Wise <pabs at debian.org>  Sat, 09 Jan 2010 17:21:07 +0800
 

Modified: packages/trunk/chromium-bsu/debian/compat
===================================================================
--- packages/trunk/chromium-bsu/debian/compat	2010-06-19 10:37:40 UTC (rev 11027)
+++ packages/trunk/chromium-bsu/debian/compat	2010-06-19 12:40:39 UTC (rev 11028)
@@ -1 +1 @@
-5
+7

Modified: packages/trunk/chromium-bsu/debian/control
===================================================================
--- packages/trunk/chromium-bsu/debian/control	2010-06-19 10:37:40 UTC (rev 11027)
+++ packages/trunk/chromium-bsu/debian/control	2010-06-19 12:40:39 UTC (rev 11028)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Sam Hocevar <sho at debian.org>, Paul Wise <pabs at debian.org>
-Build-Depends: debhelper (>= 5.0), autotools-dev, libsdl1.2-dev (>= 1.2.2-3.1~), libsdl-image1.2-dev, libopenal-dev (>= 0.2005080600), libalut-dev, libglpng-dev, libglu1-mesa-dev, libglc-dev
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev (>= 20100122.1~), libsdl1.2-dev (>= 1.2.2-3.1~), libsdl-image1.2-dev, libopenal-dev (>= 0.2005080600), libalut-dev, libglpng-dev, libglu1-mesa-dev, libglc-dev
 Standards-Version: 3.8.4
 Homepage: http://chromium-bsu.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/chromium-bsu/

Modified: packages/trunk/chromium-bsu/debian/rules
===================================================================
--- packages/trunk/chromium-bsu/debian/rules	2010-06-19 10:37:40 UTC (rev 11027)
+++ packages/trunk/chromium-bsu/debian/rules	2010-06-19 12:40:39 UTC (rev 11028)
@@ -1,87 +1,9 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-        build_flags = --build=$(DEB_BUILD_GNU_TYPE)
-else
-        build_flags = --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
+%:
+	dh --with autotools_dev $@ --parallel
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-else
-        CFLAGS += -O2
-endif
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	./configure $(build_flags) CXXFLAGS="$(CFLAGS)" --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	rm -f config.sub config.guess
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_install -i --sourcedir=debian/tmp
-	dh_installdocs -i
-	dh_installchangelogs -i ChangeLog
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_install -a --sourcedir=debian/tmp
-	dh_installdocs -a
-	dh_installmenu -a
-	dh_installchangelogs -a ChangeLog
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-arch binary-indep
-.PHONY: configure build clean binary-arch binary-indep binary install 
+override_dh_auto_configure:
+	dh_auto_configure -- CXXFLAGS="$(CXXFLAGS) -Wall" --bindir=/usr/games --datadir=/usr/share/games