[Pkg-cli-libs-commits] [SCM] sublib branch, master, updated. debian/0.9-4

[Iain Lane]

The following commit has been merged in the master branch:
commit 89860cb205d3471c77d7f14cf07369d18030c6a4
Author: Iain Lane <laney at debian.org>
Date:   Sat Jan 21 22:56:27 2012 +0000

    Modernise packaging to use 3.0 (quilt) and dh completely
    
    Also remove cli.make in favour of --with cli

diff --git a/debian/control b/debian/control
index 5e2df17..221d5a1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,7 @@ Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org
 Uploaders: Tiago Bortoletto Vaz <tiago at debian-ba.org>, Mirco Bauer <meebey at debian.org>
 Build-Depends: cli-common-dev (>= 0.5.7),
  debhelper (>= 7.0.50~),
- mono-devel (>= 2.0),
- monodoc-base,
- dpatch
+ mono-devel (>= 2.0)
 Standards-Version: 3.9.2
 Homepage: http://sublib.sourceforge.net/
 Vcs-Git: git://git.debian.org/pkg-cli-libs/packages/sublib
diff --git a/debian/patches/01_fix_sublib.pc.dpatch b/debian/patches/01_fix_sublib.pc
similarity index 100%
rename from debian/patches/01_fix_sublib.pc.dpatch
rename to debian/patches/01_fix_sublib.pc
diff --git a/debian/patches/99_autoreconf.dpatch b/debian/patches/99_autoreconf
similarity index 100%
rename from debian/patches/99_autoreconf.dpatch
rename to debian/patches/99_autoreconf
diff --git a/debian/patches/generate_xml_doc.dpatch b/debian/patches/generate_xml_doc
similarity index 100%
rename from debian/patches/generate_xml_doc.dpatch
rename to debian/patches/generate_xml_doc
diff --git a/debian/patches/00list b/debian/patches/series
similarity index 100%
rename from debian/patches/00list
rename to debian/patches/series
diff --git a/debian/rules b/debian/rules
index 97394a4..9671bdf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,51 +1,17 @@
 #!/usr/bin/make -f
 export DH_VERBOSE=1
 
-include /usr/share/cli-common/cli.make
-include /usr/share/dpatch/dpatch.make
-
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
-BUILD_DIR = $(CURDIR)/build
-LIB = $(BUILD_DIR)/sublib.dll
-DEB_CLI_API_VERSION = 0.9
-
-build: build-stamp
-build-stamp: patch-stamp
-	dh build
 
-	# build API docs
-	# unstable libs don't deserve docs
-	#monodocer \
-	#  -importslashdoc:$(LIB).xml \
-	#  --assembly:$(LIB) \
-	#  --path:$(BUILD_DIR)/monodocer; \
-	#mdassembler \
-	#  --ecma $(BUILD_DIR)/monodocer \
-	#  --out $(BUILD_DIR)/sublib
-	touch $@
-
-install: build
-	dh $@ --before dh_auto_install
+override_dh_auto_install:
 	dh_auto_install -- DESTDIR=$(CURDIR)/debian/tmp
 
-	dh $@ --before dh_install
+override_dh_install:
 	sed -i 's,#PACKAGE_UPSTREAM_VERSION#,$(VERSION),' $(CURDIR)/debian/tmp/usr/lib/pkgconfig/sublib.pc
-	dh $@ --remaining
-
-binary: binary-indep
-binary-indep: install
-	dh $@
-
-clean: clean-patched unpatch
-clean-patched:
-	dh clean
-	# cleanup API docs
-	rm -rf $(BUILD_DIR)
-
-%:
-	dh $@
+	dh_install
 
 override_dh_auto_configure:
 	dh_auto_configure -- MCS=/usr/bin/mono-csc
 
-.PHONY: build clean clean-patched binary-indep binary-arch binary install
+%:
+	dh $@ --with cli
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)

-- 
sublib