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

[David Paleino]

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

    debian/rules: use cli-common integration, debian/control: raise dependency on cli-common-dev to >= 0.5.7

diff --git a/debian/changelog b/debian/changelog
index d6a522c..2e0b781 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,14 @@ semweb (1.05+dfsg-3) UNRELEASED; urgency=low
 
   * debian/rules:
     + fix docs generation commands (Closes: #533928)
-    + rewritten using override targets
+    + rewritten using override targets and cli-common integration
   * debian/control:
     + raise dependency on debhelper to >= 7.0.50, to use override
       targets
+    + raise dependency on cli-common-dev to >= 0.5.7, to use dh7
+      integration
 
- -- David Paleino <d.paleino at gmail.com>  Fri, 25 Sep 2009 22:41:08 +0200
+ -- David Paleino <d.paleino at gmail.com>  Fri, 25 Sep 2009 22:43:26 +0200
 
 semweb (1.05+dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 9a99717..a271351 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ 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.0.50), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.5.4),
+Build-Depends-Indep: cli-common-dev (>= 0.5.7),
  sharutils,
  mono-devel (>= 2.0.1),
  pkg-config,
diff --git a/debian/rules b/debian/rules
index e50831b..525b60c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ LIBS =  bin_generics/SemWeb.dll \
 	bin_generics/SemWeb.SqliteStore.dll \
 	bin_generics/SemWeb.SQLServerStore.dll
 
+include /usr/share/cli-common/cli.make
 include /usr/share/dpatch/dpatch.make
 
 override_dh_auto_build:
@@ -37,13 +37,8 @@ override_dh_auto_install:
 	perl -pe 's/#DEB_CLI_ABI_VERSION#/$(DEB_CLI_ABI_VERSION)/' -i \
 	  $(CURDIR)/debian/tmp/usr/lib/pkgconfig/semweb-$(DEB_CLI_ABI_VERSION).pc
 
-override_dh_install:
-	dh_install
-	dh_installcligac -i
-
-override_dh_fixperms:
-	dh_fixperms
-	dh_clifixperms -i
+override_dh_makeclilibs:
+	dh_makeclilibs -i -m $(DEB_CLI_API_VERSION)
 
 build: build-stamp
 build-stamp: $(DPATCH_STAMPFN)
@@ -67,10 +62,6 @@ install-stamp: build-stamp
 
 binary: binary-indep
 binary-indep: install
-	dh_clistrip -i
-	dh_makeclilibs -i -m $(DEB_CLI_API_VERSION)
-	dh_shlibdeps -i
-	dh_clideps -i
 	dh $@
 
 clean: unpatch

-- 
semweb