[Pkg-cli-libs-commits] [SCM] semweb branch, master, updated. upstream/1.05+dfsg-5-g82140d7

[David Paleino]

The following commit has been merged in the master branch:
commit 82140d7e7dca5390245109399ce5129a3d72b124
Author: David Paleino <d.paleino at gmail.com>
Date:   Fri Sep 25 22:42:06 2009 +0200

    debian/rules rewritten using override targets, debian/control: raise dependency on debhelper to >= 7.0.50

diff --git a/debian/changelog b/debian/changelog
index 0f036c1..d6a522c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 semweb (1.05+dfsg-3) UNRELEASED; urgency=low
 
-  * debian/rules: fix docs generation commands (Closes: #533928)
-
- -- David Paleino <d.paleino at gmail.com>  Fri, 25 Sep 2009 22:22:53 +0200
+  * debian/rules:
+    + fix docs generation commands (Closes: #533928)
+    + rewritten using override targets
+  * debian/control:
+    + raise dependency on debhelper to >= 7.0.50, to use override
+      targets
+
+ -- David Paleino <d.paleino at gmail.com>  Fri, 25 Sep 2009 22:41:08 +0200
 
 semweb (1.05+dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a32c16c..9a99717 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 7), dpatch
+Build-Depends: debhelper (>= 7.0.50), dpatch
 Build-Depends-Indep: cli-common-dev (>= 0.5.4),
  sharutils,
  mono-devel (>= 2.0.1),
diff --git a/debian/rules b/debian/rules
index 07403e7..e50831b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,31 +14,19 @@ LIBS =  bin_generics/SemWeb.dll \
 
 include /usr/share/dpatch/dpatch.make
 
-build: patch-stamp
-	dh $@ --before build
+override_dh_auto_build:
 	# unpack signing key
 	cd debian && uudecode < semweb.snk.uu
 
 	# compile
-	$(MAKE) PROFILE=DOTNET2 $(LIBS)
+	dh_auto_build -- PROFILE=DOTNET2 $(LIBS)
 
 	# sign libs
 	for LIB in $(LIBS); do \
 		sn -R $$LIB debian/semweb.snk; \
 	done
-	dh $@ --after build
-	
-	# build API docs
-	#for LIB in $(LIBS); do \
-	#	mdoc update -i $$LIB -o $(CURDIR)/bin_generics/monodocer; \
-	#done
-	mdoc update -i bin_generics/SemWeb.dll \
-	  -o $(CURDIR)/bin_generics/monodocer
-	mdoc assemble -o $(CURDIR)/bin_generics/SemWeb \
-	  -f ecma $(CURDIR)/bin_generics/monodocer
 
-install: build
-	dh $@ --before dh_install
+override_dh_auto_install:
 	# pkg-config
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
 	cp debian/semweb.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig/
@@ -48,15 +36,34 @@ install: build
 	  $(CURDIR)/debian/tmp/usr/lib/pkgconfig/semweb-$(DEB_CLI_ABI_VERSION).pc
 	perl -pe 's/#DEB_CLI_ABI_VERSION#/$(DEB_CLI_ABI_VERSION)/' -i \
 	  $(CURDIR)/debian/tmp/usr/lib/pkgconfig/semweb-$(DEB_CLI_ABI_VERSION).pc
-	dh $@ --remaining
 
-	dh $@ --until dh_install
+override_dh_install:
+	dh_install
 	dh_installcligac -i
-	dh $@ --after dh_install
 
-	dh $@ --until dh_fixperms
+override_dh_fixperms:
+	dh_fixperms
 	dh_clifixperms -i
-	dh $@ --after dh_fixperms
+
+build: build-stamp
+build-stamp: $(DPATCH_STAMPFN)
+	dh build
+
+	# build API docs
+	#for LIB in $(LIBS); do \
+	#	mdoc update -i $$LIB -o $(CURDIR)/bin_generics/monodocer; \
+	#done
+	mdoc update -i bin_generics/SemWeb.dll \
+	  -o $(CURDIR)/bin_generics/monodocer
+	mdoc assemble -o $(CURDIR)/bin_generics/SemWeb \
+	  -f ecma $(CURDIR)/bin_generics/monodocer
+
+	touch $@
+
+install: install-stamp
+install-stamp: build-stamp
+	dh install
+	touch $@
 
 binary: binary-indep
 binary-indep: install
@@ -64,7 +71,6 @@ binary-indep: install
 	dh_makeclilibs -i -m $(DEB_CLI_API_VERSION)
 	dh_shlibdeps -i
 	dh_clideps -i
-	
 	dh $@
 
 clean: unpatch

-- 
semweb