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

[Iain Lane]

The following commit has been merged in the master branch:
commit 8a1e57b025838ef67e04d05780ac4d87078ebe12
Author: Iain Lane <laney at ubuntu.com>
Date:   Mon Apr 11 17:59:04 2011 +0100

    Drop dh_autoreconf support, no longer necessary and causes FTBFS due to a bug somewhere
    
    Closes: #622207

diff --git a/debian/control b/debian/control
index 807315d..a5bb2d7 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ 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~),
-               dh-autoreconf,
                intltool,
                pngquant,
                mono-devel (>= 2.4.3),
diff --git a/debian/rules b/debian/rules
index 4fba352..6c72c3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,12 +11,6 @@ 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.*//')
 
-override_dh_autoreconf:
-	cp /usr/share/gnome-doc-utils/gnome-doc-utils.make $(CURDIR)
-	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
-
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--disable-scrollkeeper \
@@ -49,6 +43,6 @@ get-orig-source:
 		--rename
 
 %:
-	dh --with=quilt,autoreconf $@
+	dh --with=quilt $@
 
-.PHONY: autoreconf get-orig-source
+.PHONY: get-orig-source

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