[Pkg-cli-libs-commits] [SCM] mono-zeroconf branch, master, updated. debian/0.9.0-3-3-g7d8ea43

[Iain Lane]

The following commit has been merged in the master branch:
commit 1cbf0fc5319ad323ac806bf0e66ae1201928f9c0
Author: Iain Lane <laney at debian.org>
Date:   Sun Jan 22 13:19:40 2012 +0000

    Modernise packaging
    
      - Use dh override targets instead of --until/--after
      - Use 3.0 (quilt) instead of dpatch

diff --git a/debian/control b/debian/control
index 20089ab..013bef7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,8 @@ Section: libs
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 7), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.5.7),
- mono-devel (>= 2.4.3),
+Build-Depends: debhelper (>= 7.0.50~), cli-common-dev (>= 0.5.7)
+Build-Depends-Indep: mono-devel (>= 2.4.3),
  monodoc-base (>= 2.0),
  pkg-config
 Standards-Version: 3.8.3
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 32f4077..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_pkg-config-path.dpatch
-02_provider-factory-path.dpatch
-03_fix-multiple-dispose.patch.dpatch
diff --git a/debian/patches/01_pkg-config-path.dpatch b/debian/patches/01_pkg-config-path
similarity index 100%
rename from debian/patches/01_pkg-config-path.dpatch
rename to debian/patches/01_pkg-config-path
diff --git a/debian/patches/02_provider-factory-path.dpatch b/debian/patches/02_provider-factory-path
similarity index 100%
rename from debian/patches/02_provider-factory-path.dpatch
rename to debian/patches/02_provider-factory-path
diff --git a/debian/patches/03_fix-multiple-dispose.patch.dpatch b/debian/patches/03_fix-multiple-dispose.patch
old mode 100755
new mode 100644
similarity index 100%
rename from debian/patches/03_fix-multiple-dispose.patch.dpatch
rename to debian/patches/03_fix-multiple-dispose.patch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..534ed27
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_pkg-config-path
+02_provider-factory-path
+03_fix-multiple-dispose.patch
diff --git a/debian/rules b/debian/rules
index 5c7a1dd..15229a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,31 +12,14 @@ DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^
 VERSION = $(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
 
 
-# provide patch and unpatch targets
-include /usr/share/dpatch/dpatch.make
-include /usr/share/cli-common/cli.make
-
-build: build-stamp
-build-stamp: $(DPATCH_STAMPFN)
-	dh build --before dh_auto_configure
+override_dh_auto_configure:
 	dh_auto_configure -- MCS=/usr/bin/mono-csc --prefix=/usr --disable-mdnsresponder
-	dh build --after dh_auto_configure
-	touch $@
-
-clean: unpatch
-	dh $@
-
-install:
-	dh $@
 
-binary-indep: build install
-	dh $@ --before dh_makeclilibs
+override_dh_makeclilibs:
 	dh_makeclilibs -m0.9.0
-	dh $@ --after dh_makeclilibs
 
-binary-arch:
-
-binary: binary-indep binary-arch
+%:
+	dh $@ --with cli
 
 get-orig-source:
 	uscan \
@@ -47,5 +30,3 @@ get-orig-source:
 		--destdir . \
 		--force-download \
 		--rename
-
-.PHONY: build clean binary-indep binary-arch binary install 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
mono-zeroconf