[Pkg-cli-apps-commits] [SCM] f-spot branch, master-experimental, updated. debian/0.7.0-1-16-g75c0894

[Iain Lane]

The following commit has been merged in the master-experimental branch:
commit 6b9fab8c6af5928e4ff5fafbedbc5b97fbdd05a6
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed Jul 14 13:06:49 2010 +0100

    No longer need to autoreconf

diff --git a/debian/control b/debian/control
index 71f6850..3dfa05b 100644
--- a/debian/control
+++ b/debian/control
@@ -33,12 +33,7 @@ Build-Depends: debhelper (>= 7.0.50),
 # libglitz-glx1-dev,
  libjpeg-dev,
  libunique-dev,
- gnome-doc-utils (>= 0.3.2),
- docbook-xml,
- intltool,
- libtool,
- autoconf,
- automake1.10
+ intltool (>= 0.35.0)
 Standards-Version: 3.9.0
 Homepage: http://www.f-spot.org/
 Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/f-spot.git
diff --git a/debian/rules b/debian/rules
index da4d3de..2f88116 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,20 +5,12 @@ include /usr/share/cli-common/cli.make
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
 UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,') 
 
-# robbed from tomboy
-autoreconf: autoreconf-stamp
-autoreconf-stamp:
-	autoreconf -f -i -s -I $(CURDIR)/build/m4/shamrock -I $(CURDIR)/build/m4/shave -I $(CURDIR)/build/m4/f-spot
-	# 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_clean:
 	dh_clean
-	rm -rf autoreconf-stamp configure config.sub config.guess ltmain.sh aclocal.m4 autom4te.cache/ po/*.pot
-	find . -name "Makefile.in" -delete
+	rm -rf po/*.pot
 
-override_dh_auto_configure: autoreconf-stamp
+override_dh_auto_configure:
+	install --mode=755 $(CURDIR)/debian/ltmain-as-needed.sh $(CURDIR)/ltmain.sh
 	dh_auto_configure -- \
 		--disable-scrollkeeper \
 		--with-gnome-screensaver=/usr \

-- 
f-spot