[Pkg-cli-libs-commits] [SCM] db4o branch, master, updated. upstream/6.1.604+dfsg-10-g79251b9

[David Paleino]

The following commit has been merged in the master branch:
commit 79251b91351ae6814481f9288ce6c520079d99e6
Author: David Paleino <d.paleino at gmail.com>
Date:   Sat Sep 26 19:36:38 2009 +0200

    debian/rules rewritten using overriden targets and dh7
    
      * debian/control:
        - bumped B-D on quilt (>= 0.46-7~), debhelper (>= 7.0.50) and
          cli-common-dev (>= 0.5.7)
      * debian/rules:
        - rewritten using overriden targets and dh7

diff --git a/debian/changelog b/debian/changelog
index 1dc87ec..ae9926e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,15 @@ db4o (6.1.604+dfsg-4) UNRELEASED; urgency=low
     - Vcs-* fields updated, package moved to Git
     - moved from Section libs to cli-mono
     - replaced Build-Dependency on dpatch with quilt
+    - bumped B-D on quilt (>= 0.46-7~), debhelper (>= 7.0.50) and
+      cli-common-dev (>= 0.5.7)
   * debian/rules:
     - fixed monodoc calls to use mdoc (Closes: #534009)
     - include quilt makefile instead of dpatch's
+    - rewritten using overriden targets and dh7
   * debian/patches/* converted to quilt
 
- -- David Paleino <d.paleino at gmail.com>  Sat, 26 Sep 2009 19:10:15 +0200
+ -- David Paleino <d.paleino at gmail.com>  Sat, 26 Sep 2009 19:35:19 +0200
 
 db4o (6.1.604+dfsg-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8a778cb..f58add5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: cli-mono
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 5), quilt
-Build-Depends-Indep: cli-common-dev (>= 0.5.4),
+Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~)
+Build-Depends-Indep: cli-common-dev (>= 0.5.7),
  mono-devel (>= 2.0),
  libmono-cecil0.5-cil,
  libmono-cecil-flowanalysis0.1-cil,
diff --git a/debian/rules b/debian/rules
index a4cffd3..191b71f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,48 +1,21 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
-export MONO_SHARED_DIR=$(CURDIR)
 
 DEB_CLI_ABI_VERSION = 6.0
 DEB_CLI_API_VERSION = 6.1.604
 
+include /usr/share/cli-common/cli.make
 include /usr/share/quilt/quilt.make
 
-configure: configure-stamp
-configure-stamp: patch-stamp
-	dh_testdir
-	touch configure-stamp
+override_dh_build:
+	dh_auto_build -D src -- MCS=/usr/bin/csc core admin
 
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	cd src && MCS=/usr/bin/csc $(MAKE) core admin
-	mdoc update \
-	  -i $(CURDIR)/src/bin/Db4objects.Db4o.dll.xml \
-	  -o $(CURDIR)/src/bin/monodocer \
-	  $(CURDIR)/src/bin/Db4objects.Db4o.dll
-	mdoc assemble \
-	  -f ecma \
-	  -o $(CURDIR)/src/bin/Db4objects.Db4o \
-	  $(CURDIR)/src/bin/monodocer
-	touch build-stamp
-
-clean: clean-patched unpatch
-clean-patched:
-	dh_testdir
-	dh_testroot
-	cd src && $(MAKE) clean
+override_dh_clean:
+	dh_auto_clean -D src
 	rm -rf src/bin
-	rm -rf $(MONO_SHARED_DIR)/.wapi
-	rm -f build-stamp configure-stamp
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	
+
+override_dh_auto-install:
 	# <$(MAKE) install>
 
 	# db4o libs / admin tool
@@ -83,28 +56,38 @@ install: build
 
 	perl -pe 's/#PACKAGE_ABI_VERSION#/$(DEB_CLI_ABI_VERSION)/' -i \
 	  $(CURDIR)/debian/tmp/usr/lib/pkgconfig/db4o-$(DEB_CLI_ABI_VERSION).pc
-	
-binary-arch:
 
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_install -i --sourcedir=debian/tmp
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_installcligac -i
-	dh_link -i
-	dh_strip -i
-	dh_clistrip -i
+override_dh_compress:
 	dh_compress -i -Xapi/ -Xtutorial/ -Xreference/
-	dh_fixperms -i
-	dh_clifixperms -i
+
+override_dh_makeclilibs:
 	dh_makeclilibs -i -m $(DEB_CLI_API_VERSION)
-	dh_installdeb -i
-	dh_clideps -i -d
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
+	dh --with cli build
+	mdoc update \
+	  -i $(CURDIR)/src/bin/Db4objects.Db4o.dll.xml \
+	  -o $(CURDIR)/src/bin/monodocer \
+	  $(CURDIR)/src/bin/Db4objects.Db4o.dll
+	mdoc assemble \
+	  -f ecma \
+	  -o $(CURDIR)/src/bin/Db4objects.Db4o \
+	  $(CURDIR)/src/bin/monodocer
+	touch $@
+
+clean: clean-patched unpatch
+clean-patched:
+	dh --with cli clean
+
+install: install-stamp
+install-stamp: build-stamp
+	dh --with cli install
+	touch $@
+
+binary-arch:
+binary-indep: build install
+	dh $@
 
 binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install

-- 
db4o