[SCM] Packaging for grhino branch, master, updated. debian/0.16.0-5-6-g10f6f8e

[Vincent Legout]

The following commit has been merged in the master branch:
commit 31b010beb836cb4cbc4aadc0bd01e054729fb28f
Author: Vincent Legout <vincent at legout.info>
Date:   Sat Dec 4 21:43:52 2010 +0100

    Switch to debhelper 7

diff --git a/debian/changelog b/debian/changelog
index 7aaf177..ac08bcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ grhino (0.16.1-1) UNRELEASED; urgency=low
     - 02_gcc_4_3.diff, 03_desktop_file.diff: Removed, merged upstream
   * Bump Standards-Version to 3.9.1
     - Use Breaks instead of Conflicts
+  * Switch to debhelper 7
+    - debian/compat: Update to 7
+    - Remove Build-Depends on quilt, cdbs, autoconf, automake1.9 and gettext
+    - Build-Depends on debhelper (7.0.50~) to use override targets
+    - Rewrite debian/rules
+    - debian/grhino.docs, debian/clean: Added
 
  -- Vincent Legout <vincent at legout.info>  Sat, 04 Dec 2010 21:09:28 +0100
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..49a3caa
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,8 @@
+po/en_GB.gmo
+po/stamp-po
+Makefile
+config.h
+config.log
+config.status
+grhino_icon_menu.xpm
+desktop/grhino.desktop
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index b542d8d..379a092 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Vincent Legout <vincent at legout.info>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libgtk2.0-dev, libgnome2-dev, libgnomeui-dev, imagemagick, autoconf (>= 2.61-3), automake1.9 (>= 1.9.6+nogfdl-3), gettext (>= 0.16.1), scrollkeeper, quilt
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libgtk2.0-dev, libgnome2-dev, libgnomeui-dev, imagemagick, scrollkeeper
 Standards-Version: 3.9.1
 Homepage: http://rhino.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-games/grhino.git
diff --git a/debian/grhino.docs b/debian/grhino.docs
new file mode 100644
index 0000000..e0a7a7b
--- /dev/null
+++ b/debian/grhino.docs
@@ -0,0 +1,3 @@
+README
+TODO
+NEWS
diff --git a/debian/rules b/debian/rules
index e30ab12..92fff88 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,34 +1,23 @@
 #!/usr/bin/make -f
 
-DEB_AUTO_UPDATE_AUTOCONF := 2.61
-DEB_AUTO_UPDATE_AUTOHEADER := 2.61
-DEB_AUTO_UPDATE_ACLOCAL := 1.9
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+export LDFLAGS
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+TOSAVE := po/Makefile po/Makefile.in po/remove-potcdate.sed
 
-export LDFLAGS=-Wl,-z,defs -Wl,--as-needed
+%:
+	dh $@ --with autotools-dev
 
-DEB_CONFIGURE_EXTRA_FLAGS += --bindir=/usr/games
-
-TOSAVE := aclocal.m4 configure acinclude.m4 po/Makefile.in.in config.h.in
-
-update-config::
-	for f in $(TOSAVE) ; do [ -e $$f.debian-rules-orig ] || cp -rpv $$f $$f.debian-rules-orig ; done
-	cp -fv /usr/share/gettext/po/Makefile.in.in po/Makefile.in.in
+override_dh_auto_configure:
+	for f in $(TOSAVE) ; \
+		do [ -e $$f.debian-rules-orig ] || cp -rpv $$f $$f.debian-rules-orig ; \
+	done
 	[ -e grhino_icon_menu.xpm ] || convert -resize 32x32 icon_new.xpm grhino_icon_menu.xpm
-	cd acinclude.m4 && for f in *.m4 ; do [ ! -e /usr/share/aclocal/$$f ] || cp -fv /usr/share/aclocal/$$f $$f ; done
-
-reverse-config::
-	for f in $(TOSAVE) ; do [ ! -e $$f.debian-rules-orig ] || ( rm -rf $$f && mv -v $$f.debian-rules-orig $$f ) ; done
-	rm -f grhino_icon_menu.xpm
-
-clean::
-	rm -f po/en_GB.gmo po/stamp-po
-	rm -f desktop/grhino.desktop
+	dh_auto_configure -- --bindir=/usr/games
 
-restore-cruft:
-	for f in po/Makefile po/Makefile.in po/POTFILES po/remove-potcdate.sed ; do \
-		rm -f $$f ; \
-		cp -p ../orig/*/$$f $$f ; \
+override_dh_auto_clean:
+	[ ! -e Makefile ] || $(MAKE) clean
+	for f in $(TOSAVE) ; \
+		do [ ! -e $$f.debian-rules-orig ] || ( rm -rf $$f && mv -v $$f.debian-rules-orig $$f ) ; \
 	done

-- 
Packaging for grhino