[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, master-devel, updated. debian/1.2.1-1-12-g96075af

[Iain Lane]

The following commit has been merged in the master-devel branch:
commit b57ab2b08840df8f03ffb8e480812b43fd1c0749
Author: Iain Lane <laney at ubuntu.com>
Date:   Sun Jul 4 18:13:02 2010 +0100

    debian/{control,rules}: Replace manual autoreconf with dh-autoreconf

diff --git a/debian/control b/debian/control
index 67a8029..e5c86cd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.
 Uploaders: Sebastian Dröge <slomo at debian.org>, Iain Lane <laney at ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50),
                quilt (>= 0.46-7~),
-               autotools-dev,
-               libtool,
+               dh-autoreconf,
                intltool,
                pngquant,
                mono-devel (>= 2.4.3),
diff --git a/debian/rules b/debian/rules
index e060181..3f96ed8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,15 +11,13 @@ DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^
 DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Version | cut -d" " -f2)   
 VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
 
-autoreconf: autoreconf-stamp
-autoreconf-stamp:
+override_dh_autoreconf:
 	cp /usr/share/gnome-doc-utils/gnome-doc-utils.make $(CURDIR)
-	autoreconf -f -i -s
+	dh_autoreconf
 	# replace ltmain.sh with our patched one that supports --as-needed
 	install --mode=755 $(CURDIR)/debian/ltmain-as-needed.sh $(CURDIR)/ltmain.sh
-	touch $@
 
-override_dh_auto_configure: autoreconf-stamp
+override_dh_auto_configure:
 	dh_auto_configure -- \
 		--disable-scrollkeeper \
 		--disable-update-mimedb \
@@ -38,11 +36,6 @@ override_dh_auto_install:
 	# create pot file for Ubuntu - doesn't affect built debs for Debian
 	cd po; intltool-update --pot
 
-override_dh_clean:
-	dh_clean
-	rm -rf autoreconf-stamp configure config.sub config.guess ltmain.sh gnome-doc-utils.make aclocal.m4 autom4te.cache/ po/*.pot
-	find . -name "Makefile.in" -delete
-
 # disable tests
 override_dh_auto_test:
 
@@ -57,6 +50,6 @@ get-orig-source:
 		--rename
 
 %:
-	dh --with=quilt $@
+	dh --with=quilt,autoreconf $@
 
 .PHONY: autoreconf get-orig-source

-- 
Tomboy - desktop note taking program using Wiki style links