[Pkg-cli-libs-commits] r3721 - in /packages/semweb/trunk/debian: changelog clean control rules

[meebey at users.alioth.debian.org]

Author: meebey
Date: Wed May  7 19:59:50 2008
New Revision: 3721

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3721
Log:
yay, cli-common-dev + dh rocks


Modified:
    packages/semweb/trunk/debian/changelog
    packages/semweb/trunk/debian/clean
    packages/semweb/trunk/debian/control
    packages/semweb/trunk/debian/rules

Modified: packages/semweb/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/semweb/trunk/debian/changelog?rev=3721&op=diff
==============================================================================
--- packages/semweb/trunk/debian/changelog (original)
+++ packages/semweb/trunk/debian/changelog Wed May  7 19:59:50 2008
@@ -1,3 +1,15 @@
+semweb (1.05+dfsg-2~pre1) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * debian/control:
+    + Updated cli-common-dev build-dependency to >= 0.5.7
+      (needed for cli.make)
+  * debian/rules:
+    + Include /usr/share/cli-common/cli.make
+    + Removed many dh hooks, as cli.make takes care now.
+
+ -- Mirco Bauer <meebey at debian.org>  Wed, 07 May 2008 21:56:39 +0200
+
 semweb (1.05+dfsg-1) unstable; urgency=low
 
   * DFSG version of SemWeb 1.05

Modified: packages/semweb/trunk/debian/clean
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/semweb/trunk/debian/clean?rev=3721&op=diff
==============================================================================
--- packages/semweb/trunk/debian/clean (original)
+++ packages/semweb/trunk/debian/clean Wed May  7 19:59:50 2008
@@ -1,1 +1,5 @@
 bin_generics/SemWeb.SQLServerStore.dll*
+bin_generics/SemWeb.tree
+bin_generics/SemWeb.zip
+bin_generics/monodocer
+debian/semweb.snk

Modified: packages/semweb/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/semweb/trunk/debian/control?rev=3721&op=diff
==============================================================================
--- packages/semweb/trunk/debian/control (original)
+++ packages/semweb/trunk/debian/control Wed May  7 19:59:50 2008
@@ -4,7 +4,7 @@
 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-Indep: cli-common-dev (>= 0.5.4),
+Build-Depends-Indep: cli-common-dev (>= 0.5.7),
  sharutils,
  mono-gmcs (>= 1.1.6),
  mono-gac,

Modified: packages/semweb/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/semweb/trunk/debian/rules?rev=3721&op=diff
==============================================================================
--- packages/semweb/trunk/debian/rules (original)
+++ packages/semweb/trunk/debian/rules Wed May  7 19:59:50 2008
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 export DH_VERBOSE=1
-export MONO_DISABLE_SHM=1
 
 DEB_VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
 VERSION = $(shell echo $(DEB_VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,')
@@ -12,6 +11,7 @@
 	bin_generics/SemWeb.SqliteStore.dll \
 	bin_generics/SemWeb.SQLServerStore.dll
 
+include /usr/share/cli-common/cli.make
 include /usr/share/dpatch/dpatch.make
 
 build: patch-stamp
@@ -28,7 +28,8 @@
 	done
 	dh $@ --after build
 	
-	# build API docs
+	# build API docs for all libraries
+	# BUG: this only generates docs for the last library
 	#for LIB in $(LIBS); do \
 	#	monodocer \
 	#	  --assembly:$$LIB \
@@ -54,31 +55,15 @@
 	  $(CURDIR)/debian/tmp/usr/lib/pkgconfig/semweb-$(DEB_CLI_ABI_VERSION).pc
 	dh $@ --remaining
 
-	dh $@ --until dh_install
-	dh_installcligac -i
-	dh $@ --after dh_install
-
-	dh $@ --until dh_fixperms
-	dh_clifixperms -i
-	dh $@ --after dh_fixperms
-
 binary: binary-indep
 binary-indep: install
-	dh_clistrip -i
+	dh $@ --before dh_makeclilibs
 	dh_makeclilibs -i -m $(DEB_CLI_API_VERSION)
-	dh_shlibdeps -i
-	dh_clideps -i
-	
-	dh $@
+	dh $@ --after dh_makeclilibs
 
 clean: unpatch
-	# clean up our signing key
-	rm -f debian/semweb.snk
-	# clean up our API docs
-	rm -f bin_generics/SemWeb.tree \
-	      bin_generics/SemWeb.zip
-	rm -rf bin_generics/monodocer
-	
+	# delete the API docs we generated
+	rm -rf bin_generics/monodocer/
 	# workaround for broken "make clean"
 	for FILE in $(LIBS) \
 	  bin_generics/SemWeb.Sparql.dll \