[Pkg-cli-libs-commits] [SCM] gnome-desktop-sharp2 branch, master, updated. debian/2.26.0-7

[Iain Lane]

The following commit has been merged in the master branch:
commit 7259281b6fc166fcc0f89c8cb6da0326156d7fbb
Author: Iain Lane <laney at debian.org>
Date:   Mon Dec 5 18:39:50 2011 +0000

    Use dh-autoreconf --as-needed instead of doing it manually

diff --git a/debian/control b/debian/control
index 8763eaa..d16d7c3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org
 Uploaders: Mirco Bauer <meebey at debian.org>,
            Sebastian Dröge <slomo at debian.org>,
            Jo Shields <directhex at apebox.org>
-Build-Depends: autoconf,
-               automake,
+Build-Depends: dh-autoreconf (>= 4),
                cli-common-dev (>= 0.5.4),
                debhelper (>= 7),
                gtk-sharp2-gapi (>= 2.12.7),
diff --git a/debian/rules b/debian/rules
index 06ec337..ae6d907 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,15 +19,10 @@ VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
 NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(VERSION))
 
 
-autoreconf: autoreconf-stamp
-autoreconf-stamp:
-	autoreconf -f -i
-	patch -p3 < debian/ltmain-add-as-needed.patch
-	touch $@
-
 config: config-stamp
-config-stamp: autoreconf-stamp
+config-stamp:
 	dh_testdir
+	dh_autoreconf --as-needed
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \
 		--prefix=/usr \
 		CSC=/usr/bin/mono-csc \
@@ -46,20 +41,15 @@ build-arch-stamp: config-stamp
 	$(MAKE)
 	touch $@
 
-clean: clean-patched
-clean-patched:
+clean:
 	dh_testdir
 	dh_testroot
 
-	rm -f autoreconf-stamp config-stamp build-indep-stamp build-arch-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean RUNTIME=/usr/bin/cli
 
-	# delete generated autofoo stuff from above
-	find . -name "Makefile.in" | xargs rm -rf
-	rm -f config.status config.sub config.guess configure ltmain.sh
-
 	rm -rf $(MONO_SHARED_DIR)/.wapi
 
+	dh_autoreconf_clean
 	dh_clean
 
 install:
@@ -134,4 +124,4 @@ get-orig-source:
 		--force-download \
 		--rename
 
-.PHONY: autoreconf config build-indep build-arch clean binary-indep binary-arch build binary patch get-orig-source
+.PHONY: config build-indep build-arch clean binary-indep binary-arch build binary get-orig-source

-- 
gnome-desktop-sharp2