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

Proposed by Evgeni Golov
Status: Merged
Merged at revision: 296
Proposed branch: lp:~evgeni/libappindicator/use-autoreconf.mk
Merge into: lp:~ubuntu-desktop/libappindicator/ubuntu
Diff against target: 24 lines (+2/-2)
1 file modified
debian/rules (+2/-2)
To merge this branch: bzr merge lp:~evgeni/libappindicator/use-autoreconf.mk
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Ken VanDine Pending
Review via email: mp+106750@code.launchpad.net

Description of the change

  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

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Looks good, uploaded to quantal.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
8export MONO_SHARED_DIR=$(CURDIR)8export MONO_SHARED_DIR=$(CURDIR)
9export CSC=/usr/bin/mono-csc9export CSC=/usr/bin/mono-csc
1010
11include /usr/share/cdbs/1/rules/patchsys-quilt.mk
12include /usr/share/cdbs/1/rules/autoreconf.mk
11include /usr/share/cdbs/1/rules/debhelper.mk13include /usr/share/cdbs/1/rules/debhelper.mk
12include /usr/share/cdbs/1/class/gnome.mk14include /usr/share/cdbs/1/class/gnome.mk
13include /usr/share/cdbs/1/rules/utils.mk15include /usr/share/cdbs/1/rules/utils.mk
14include /usr/share/cdbs/1/rules/patchsys-quilt.mk
1516
16API_VERSION = 0.117API_VERSION = 0.1
1718
@@ -20,7 +21,6 @@
20DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection21DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection
2122
22configure-stamp-%:23configure-stamp-%:
23 dh_autoreconf
24 mkdir build-$*24 mkdir build-$*
25 cd build-$* && PYTHON=`which $*` \25 cd build-$* && PYTHON=`which $*` \
26 $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) --srcdir=..26 $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) --srcdir=..

Subscribers

People subscribed via source and target branches

to all changes: