Merge lp:~evgeni/libappindicator/use-autoreconf.mk into lp:~ubuntu-desktop/libappindicator/ubuntu

[Evgeni Golov]

  use autoreconf.mk instead of calling dh_autoreconf by hand

  - fixes FTBFS when there are multiple Python versions
    (dh_autoreconf would be called multiple times in this case, which isn't
     allowed)
  - properly cleans autoreconf'ed files in the clean target
  - patchsys-quilt.mk needs to be included *before* autoreconf.mk or
    debhelper will leave uncleaned files in debian/, leading to
    E: libappindicator source: temporary-debhelper-file
       python-appindicator.debhelper.log and 9 others
    from lintian

[Robert Ancell (robert-ancell)]

Looks good, uploaded to quantal.

review: Approve

=== modified file 'debian/rules'
--- debian/rules	2012-03-09 20:47:45 +0000
+++ debian/rules	2012-05-22 07:28:22 +0000
@@ -8,10 +8,11 @@
 export MONO_SHARED_DIR=$(CURDIR)
 export CSC=/usr/bin/mono-csc
 
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 API_VERSION = 0.1
 
@@ -20,7 +21,6 @@
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection
 
 configure-stamp-%:
-	dh_autoreconf
 	mkdir build-$*
 	cd build-$* && PYTHON=`which $*` \
 		$(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) --srcdir=..