[Pkg-cli-libs-commits] [SCM] taglib-sharp branch, master, updated. debian/2.0.3.3+dfsg-3-6-gdaef9c0

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit daef9c0317a5447d5dabbe502901dbd6351b8f8a
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Wed Jan 27 14:24:18 2010 +0800

    Use DH7 for rules

diff --git a/debian/changelog b/debian/changelog
index 2ca9fce..72c015e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 taglib-sharp (2.0.3.4+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/control, debian/patches/*, debian/rules:
+    + Use quilt and DH 7.0.50
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 27 Jan 2010 13:34:00 +0800
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 65a12c4..c615d49 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,10 @@ Source: taglib-sharp
 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>, Sebastian Dröge <slomo at debian.org>, Chow Loong Jin <hyperair at ubuntu.com>
-Build-Depends: debhelper (>= 5), dpatch
+Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>,
+           Sebastian Dröge <slomo at debian.org>,
+           Chow Loong Jin <hyperair at ubuntu.com>
+Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~)
 Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-devel (>= 2.4.3), pkg-config, monodoc-base
 Standards-Version: 3.8.3
 Vcs-Browser: http://git.debian.org/git/pkg-cli-libs/packages/taglib-sharp.git
diff --git a/debian/rules b/debian/rules
index 3702440..455d0d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is for the .wapi directory for Mono.
-export MONO_SHARED_DIR=$(CURDIR)
-
 MAKEFILE = $(firstword $(MAKEFILE_LIST))
 DEBIAN_DIR = $(dir $(MAKEFILE))
 SOURCE_DIR = $(DEBIAN_DIR)/..
@@ -15,82 +12,15 @@ DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Vers
 DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
 VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
 
+PACKAGES = $(shell sed -n 's/^Package: //p' $(DEBIAN_DIR)/control)
+
 # provide patch and unpatch targets
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
+include /usr/share/cli-common/cli.make
 
 DEB_API_VERSION = 2.0.3.3
 DEB_ABI_VERSION = 2.0
 
-configure: configure-stamp
-configure-stamp: patch-stamp
-	dh_testdir
-	
-	./configure --prefix=/usr MCS=/usr/bin/mono-csc
-
-	touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-	
-	$(MAKE)
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f docs/taglib-sharp-docs.zip
-	rm -f docs/taglib-sharp-docs.tree
-	rm -f config.status
-	rm -f build-stamp configure-stamp
-
-	-$(MAKE) clean
-	-rm -rf $(MONO_SHARED_DIR)/.wapi
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-
-	dh_installdirs
-
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-	
-	mkdir -p debian/tmp/usr/lib/cli/taglib-sharp-$(DEB_ABI_VERSION) debian/tmp/usr/share/pkgconfig
-	cp src/taglib-sharp.dll debian/tmp/usr/lib/cli/taglib-sharp-$(DEB_ABI_VERSION)/
-	cp src/taglib-sharp.dll.mdb debian/tmp/usr/lib/cli/taglib-sharp-$(DEB_ABI_VERSION)/
-	cp src/policy.2.0.taglib-sharp.dll debian/tmp/usr/lib/cli/taglib-sharp-$(DEB_ABI_VERSION)/
-	cp src/policy.2.0.taglib-sharp.config debian/tmp/usr/lib/cli/taglib-sharp-$(DEB_ABI_VERSION)/
-
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	find debian/tmp -type f -name "*.mdb" -delete
-endif
-
-binary-arch:
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_install --sourcedir=debian/tmp/
-	dh_installcligac
-	dh_compress
-	dh_clifixperms
-	dh_fixperms
-	dh_makeclilibs -m $(DEB_API_VERSION)
-	dh_clideps -d
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-
 get-orig-source:
 	uscan \
 		--package $(DEB_SOURCE_NAME) \
@@ -111,4 +41,23 @@ get-orig-source:
 	tar -czf $(DEB_SOURCE_NAME)_$(VERSION)+dfsg.orig.tar.gz $(DEB_SOURCE_NAME)-$(VERSION)
 	rm -r $(DEB_SOURCE_NAME)-$(VERSION)
 
-.PHONY: build clean binary-indep binary-arch binary install get-orig-source
+override_dh_auto_configure:
+	dh_auto_configure -- --prefix=/usr MCS=/usr/bin/cli-csc
+
+	touch configure-stamp
+
+override_dh_auto_install:
+	dh_auto_install
+	mkdir -p debian/tmp/usr/lib/cli/taglib-sharp-$(DEB_ABI_VERSION) debian/tmp/usr/share/pkgconfig
+	cp src/taglib-sharp.dll debian/tmp/usr/lib/cli/taglib-sharp-$(DEB_ABI_VERSION)/
+	cp src/taglib-sharp.dll.mdb debian/tmp/usr/lib/cli/taglib-sharp-$(DEB_ABI_VERSION)/
+	cp src/policy.2.0.taglib-sharp.dll debian/tmp/usr/lib/cli/taglib-sharp-$(DEB_ABI_VERSION)/
+	cp src/policy.2.0.taglib-sharp.config debian/tmp/usr/lib/cli/taglib-sharp-$(DEB_ABI_VERSION)/
+
+override_dh_makeclilibs:
+	dh_makeclilibs -m $(DEB_API_VERSION)
+
+%:
+	dh --with=quilt $@
+
+.PHONY: get-orig-source

-- 
taglib-sharp