[Pkg-cli-apps-commits] [SCM] openbve branch, master, updated. debian/1.4.0.0-1-4-g2db0cd2

[Paul Sladen]

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

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

diff --git a/debian/changelog b/debian/changelog
index 0e2fe82..7526389 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ openbve (1.4.0.0-3) UNRELEASED; urgency=low
   * debian/filesystem.cfg: use 'SpecialFolder.LocalApplicationData'
     + emulate behaviour until upstream allows LocalApplicationData
   * debian/README.source: document 'mask.bin'
+  * debian/rules+control: convert to minimal debhelper 7 + bumps build-dep
 
  -- Paul Sladen <debian at paul.sladen.org>  Fri, 13 Jan 2012 23:00:00 +0100
 
diff --git a/debian/control b/debian/control
index 9453550..5b58d91 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 <ubuntu at paul.sladen.org>
-Build-Depends: debhelper (>= 5), mono-xbuild, lynx
+Build-Depends: debhelper (>= 8.9.7), mono-xbuild, lynx
 Build-Depends-Indep: cli-common-dev (>= 0.8~), mono-devel (>= 2.10), libtaoframework-openal-cil-dev, libtaoframework-opengl-cil-dev, libtaoframework-sdl-cil-dev
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-cli-apps/packages/openbve.git
 Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/openbve.git
diff --git a/debian/rules b/debian/rules
index e74670e..84366b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,37 +10,26 @@ EXEC_PLUGIN_TARGET = $(EXEC_TARGET)/Plugins
 #DEBUG_CONFIGURATION=Debug
 DEBUG_CONFIGURATION=Release
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
+%:
+	dh $@
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
+# It works, but only because of the kludge below
+override_dh_build-indep:
 	for builddir in $(BUILDDIRS); do \
 	  (cd $$builddir && xbuild /p:Configuration=$(DEBUG_CONFIGURATION) *.csproj) || exit 1; \
 	done
-	touch build-stamp
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
+override_dh_clean:
+	dh_clean
 	rm -rf $(TARGET)
 	for builddir in $(BUILDDIRS); do \
 	  (cd $$builddir && xbuild /t:Clean *.csproj); \
 	  rm -rf $$builddir/bin $$builddir/obj; \
 	done
-	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
+# kludge: can't get it to build without the forced 'build-indep' dependency
+override_dh_install: override_dh_build-indep
+	dh_install
 	install -m 755 $(CURDIR)/openBVE/OpenBve/bin/$(DEBUG_CONFIGURATION)/OpenBve.exe $(EXEC_TARGET)
 	#install -m 644 $(CURDIR)/openBVE/OpenBve/bin/$(DEBUG_CONFIGURATION)/OpenBve.exe.mdb $(EXEC_TARGET)
 	install -m 755 $(CURDIR)/openBVE/OpenBveApi/bin/$(DEBUG_CONFIGURATION)/OpenBveApi.dll $(EXEC_TARGET)
@@ -53,36 +42,8 @@ install: build
 	install -m 755 $(CURDIR)/openBVE/Texture.BmpGifJpegPngTiff/bin/$(DEBUG_CONFIGURATION)/Texture.BmpGifJpegPngTiff.dll $(EXEC_PLUGIN_TARGET)
 	lynx -dump -nolist $(CURDIR)/debian/changelog.html > $(TARGET)/usr/share/doc/openbve/changelog
 
-binary-arch:
-	# Do nothing
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installmenu
-	dh_install
-	dh_installcligac
-	dh_installchangelogs
-	dh_installdocs
-	dh_fixperms
-	dh_clifixperms
-	dh_installman
-	dh_installdeb
-	dh_shlibdeps
-	#dh_makeclilibs -i -V
-	#dh_installcligac -i
-	dh_clistrip
-	dh_clideps -d -r --exclude-moduleref=AtsPluginProxy.dll
-	dh_compress
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
 # For running manually
 fetch-html:
 	wget http://trainsimframework.org/changelog.html && mv changelog.html.1 changelog.html
 	#wget http://trainsimframework.org/releasenotes.html && mv releasenotes.html.1 releasenotes.html
 	wget http://trainsimframework.org/credits.html && mv credits.html.1 credits.html
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary install configure

-- 
openbve