[Pkg-cli-libs-commits] [nini] 03/04: Update to vaguely modern DH7 rules file idioms

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to annotated tag debian/1.1.0+dfsg.2-5
in repository nini.

commit ca034bdbd3540816aac443d9b2ff8a22f5804651
Author: Jo Shields <jo.shields at xamarin.com>
Date:   Wed Sep 9 12:19:51 2015 +0100

    Update to vaguely modern DH7 rules file idioms
---
 debian/libnini-cil-dev.install |  2 +-
 debian/libnini1.1-cil.install  |  2 +-
 debian/rules                   | 31 +++++++------------------------
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/debian/libnini-cil-dev.install b/debian/libnini-cil-dev.install
index 34a6f27..dcddab9 100644
--- a/debian/libnini-cil-dev.install
+++ b/debian/libnini-cil-dev.install
@@ -1 +1 @@
-debian/tmp/usr/lib/pkgconfig
+debian/nini-1.1.pc /usr/lib/pkgconfig/
diff --git a/debian/libnini1.1-cil.install b/debian/libnini1.1-cil.install
index 6d77283..e7f15fd 100644
--- a/debian/libnini1.1-cil.install
+++ b/debian/libnini1.1-cil.install
@@ -1 +1 @@
-debian/tmp/usr/lib/cli
+build/Nini.dll* /usr/lib/cli/Nini-1.1/
diff --git a/debian/rules b/debian/rules
index 12f3f1b..d2ebcac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,37 +4,20 @@ export DH_VERBOSE=1
 DEB_CLI_ABI_VERSION = 1.1
 DEB_CLI_API_VERSION = 1.1
 
-include /usr/share/cli-common/cli.make
-
-build: patch-stamp build-stamp
-build-stamp:
+override_dh_auto_build:
 	uudecode -o debian/Nini.snk debian/Nini.snk.uue
 	$(MAKE) -f debian/Makefile
-	touch build-stamp
 
-clean: unpatch
+override_dh_clean:
 	rm -f build-stamp debian/Nini.snk
-	dh $@
+	dh_clean
 
-install: build
-	dh $@ --before dh_install
+override_dh_installchangelogs:
 	dh_installchangelogs CHANGELOG.txt
-	# install the file into the GAC
-	gacutil -i build/Nini.dll -root $(CURDIR)/debian/tmp/usr/lib
-	# install into /usr/lib/cli/Nini-1.1
-	mkdir -p debian/tmp/usr/lib/cli/Nini-1.1
-	cp build/Nini.dll* debian/tmp/usr/lib/cli/Nini-1.1
-	mkdir -p debian/tmp/usr/lib/pkgconfig
-	cp debian/nini-1.1.pc debian/tmp/usr/lib/pkgconfig
-	dh $@ --remaining
 
-binary: binary-indep
-binary-indep: install
-	dh $@ --before dh_makeclilibs
+override_dh_makeclilibs:
 	dh_makeclilibs -i -m $(DEB_CLI_API_VERSION)
-	dh $@ --after dh_makeclilibs
-
-binary-arch:
 
 %:
-	dh $@
+	dh $@ --with cli
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/nini.git