[Pkg-cli-apps-commits] [SCM] openbve-data branch, master, updated. debian/1.4.0.0+dfsg-1-6-gc543d28

[Paul Sladen]

The following commit has been merged in the master branch:
commit c543d28a0524dcc0f2dab436efca515575a31687
Author: Paul Sladen <debian at paul.sladen.org>
Date:   Sat Jan 14 09:16:05 2012 +0100

    debian/rules+control: convert to minimal debhelper 7 + bumps build-dep

diff --git a/debian/changelog b/debian/changelog
index 0dd1ea7..3bbfeeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ openbve-data (1.4.0.0+dfsg-2) UNRELEASED; urgency=low
   * debian/source/options: single-debian-patch
   * debian/README.source: document 'mask.bin'
   * debian/control: bump standards to 3.9.2
+  * debian/rules+control: convert to minimal debhelper 7 + bumps build-dep
 
  -- Paul Sladen <debian at paul.sladen.org>  Thu, 12 Jan 2012 00:31:00 +0100
 
diff --git a/debian/control b/debian/control
index 0f61b1f..cca2da8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Paul Sladen <debian at paul.sladen.org>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 7)
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-cli-apps/packages/openbve-data.git
 Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/openbve-data.git
 Standards-Version: 3.9.2
diff --git a/debian/rules b/debian/rules
index 2859ff8..3eca986 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,50 +1,20 @@
 #!/usr/bin/make -f
 export DH_VERBOSE=15
-TARGET = $(CURDIR)/debian/openbve-data
+TARGET=$(CURDIR)/debian/openbve-data
 DATATARGET=$(TARGET)/usr/share/games/openbve
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
+%:
+	dh $@
 
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
+override_dh_clean:
+	dh_clean --before clean
 	rm -f build-stamp configure-stamp
 	rm -rf $(TARGET)
-	dh_clean 
+	dh_clean --after clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
+override_dh_install:
+	dh_install
 	cp -rp $(CURDIR)/Data $(DATATARGET)/
 	(cd $(TARGET)/usr/share/pixmaps/ && ln -s ../games/openbve/Data/Menu/logo.png openbve.128.png)
 	# This package is contextual data, not plugin-executables
 	-rmdir $(DATATARGET)/Data/Plugins
-
-binary-arch:
-	# Do nothing
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_install
-	dh_installchangelogs
-	dh_installdocs
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary install configure

-- 
openbve-data