r12946 - packages/trunk/hex-a-hop/debian

[Paul Wise]

Author: pabs
Date: 2011-12-07 06:58:52 +0000 (Wed, 07 Dec 2011)
New Revision: 12946

Modified:
   packages/trunk/hex-a-hop/debian/changelog
   packages/trunk/hex-a-hop/debian/compat
   packages/trunk/hex-a-hop/debian/control
   packages/trunk/hex-a-hop/debian/install
   packages/trunk/hex-a-hop/debian/rules
Log:
Switch to debhelper 7 and dh

Modified: packages/trunk/hex-a-hop/debian/changelog
===================================================================
--- packages/trunk/hex-a-hop/debian/changelog	2011-12-06 13:55:13 UTC (rev 12945)
+++ packages/trunk/hex-a-hop/debian/changelog	2011-12-07 06:58:52 UTC (rev 12946)
@@ -6,6 +6,7 @@
   * Add a watch file
   * Wrap uploaders, build-deps and deps one per line
   * Wrap Debian menu file one item per line
+  * Switch to debhelper 7 and dh
 
  -- Paul Wise <pabs at debian.org>  Sat, 28 Aug 2010 18:41:43 +0800
 

Modified: packages/trunk/hex-a-hop/debian/compat
===================================================================
--- packages/trunk/hex-a-hop/debian/compat	2011-12-06 13:55:13 UTC (rev 12945)
+++ packages/trunk/hex-a-hop/debian/compat	2011-12-07 06:58:52 UTC (rev 12946)
@@ -1 +1 @@
-5
+7

Modified: packages/trunk/hex-a-hop/debian/control
===================================================================
--- packages/trunk/hex-a-hop/debian/control	2011-12-06 13:55:13 UTC (rev 12945)
+++ packages/trunk/hex-a-hop/debian/control	2011-12-07 06:58:52 UTC (rev 12946)
@@ -6,7 +6,7 @@
  Jens Seidel <jensseidel at users.sf.net>,
  Sam Hocevar <sho at debian.org>,
  Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 7.0.50~),
  quilt,
  gettext,
  libsdl1.2-dev,

Modified: packages/trunk/hex-a-hop/debian/install
===================================================================
--- packages/trunk/hex-a-hop/debian/install	2011-12-06 13:55:13 UTC (rev 12945)
+++ packages/trunk/hex-a-hop/debian/install	2011-12-07 06:58:52 UTC (rev 12946)
@@ -1,12 +1,2 @@
-hex-a-hop usr/games
-*.dat usr/share/games/hex-a-hop
-graphics/emi.dat usr/share/games/hex-a-hop/graphics/
-graphics/gradient.dat usr/share/games/hex-a-hop/graphics/
-graphics/icon.bmp usr/share/games/hex-a-hop/graphics/
-graphics/map.dat usr/share/games/hex-a-hop/graphics/
-graphics/map_top.dat usr/share/games/hex-a-hop/graphics/
-graphics/tiles.dat usr/share/games/hex-a-hop/graphics/
-graphics/tiles_reflect.dat usr/share/games/hex-a-hop/graphics/
-graphics/title.dat usr/share/games/hex-a-hop/graphics/
 debian/*.xpm usr/share/pixmaps/
 debian/*.desktop usr/share/applications/

Modified: packages/trunk/hex-a-hop/debian/rules
===================================================================
--- packages/trunk/hex-a-hop/debian/rules	2011-12-06 13:55:13 UTC (rev 12945)
+++ packages/trunk/hex-a-hop/debian/rules	2011-12-07 06:58:52 UTC (rev 12946)
@@ -1,81 +1,6 @@
 #!/usr/bin/make -f
+%:
+	dh $@ --parallel --with autotools_dev
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-CFLAGS = -Wall -W -g -DUSE_GETTEXT
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-patch:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-
-unpatch:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt pop -a -f || test $$? = 2
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
-	touch $@
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	$(MAKE) CXXFLAGS="$(CFLAGS)" NAME="hex-a-hop" DATA_DIR="/usr/share/games/hex-a-hop"
-	$(MAKE) CXXFLAGS="$(CFLAGS)" NAME="hex-a-hop" DATA_DIR="/usr/share/games/hex-a-hop" -C debian/i18n
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	$(MAKE) -C debian/i18n clean
-	[ ! -f Makefile ] || $(MAKE) NAME="hex-a-hop" clean
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	install -p -d -m 755 $(CURDIR)/debian/hex-a-hop/usr/share/lintian/overrides/
-	install -m 644 debian/lintian-override $(CURDIR)/debian/hex-a-hop/usr/share/lintian/overrides/hex-a-hop
-	#$(MAKE) DESTDIR=$(CURDIR)/debian/hex-a-hop install
-	$(MAKE) -C debian/i18n install LOCALEDIR=$(CURDIR)/debian/hex-a-hop/usr/share/locale/ \
-	  MANDIR=$(CURDIR)/debian/hex-a-hop/usr/share/man/
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs debian/hints.html
-	dh_installexamples
-	dh_install
-	dh_installmenu
-	# dh_installman is not yet able to install translations into <lang>.UTF-8/
-	dh_installman debian/hex-a-hop.6
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_auto_configure:
+	dh_auto_configure -- --bindir=/usr/games