Ubuntu
gnome-menus package

Merge lp:~mterry/ubuntu/natty/gnome-menus/python-fix into lp:~rodrigo-moya/ubuntu/natty/gnome-menus/2_30_5_release

  1. Natty (11.04)
  2. python-fix
  3. Merge into 2_30_5_release
Proposed by Michael Terry on 2010-11-22
Status: Merged
Merge reported by: Rodrigo Moya
Merged at revision: not available
Proposed branch: lp:~mterry/ubuntu/natty/gnome-menus/python-fix
Merge into: lp:~rodrigo-moya/ubuntu/natty/gnome-menus/2_30_5_release
Diff against target: 30 lines (+4/-4)
1 file modified
debian/rules (+4/-4)
To merge this branch: bzr merge lp:~mterry/ubuntu/natty/gnome-menus/python-fix
Reviewer Review Type Date Requested Status
Rodrigo Moya 2010-11-22 Approve on 2010-11-22
Review via email: mp+41499@code.launchpad.net

Description of the Change

I didn't test this, but it's what fixed it for my other package, and makes sense given the error. When installing, if configure is caused to be rerun, you want to make sure it's using the same version of python as the original configure used.

To post a comment you must log in.
Rodrigo Moya (rodrigo-moya) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2010-11-22 17:23:35 +0000
3+++ debian/rules 2010-11-22 18:49:54 +0000
4@@ -50,23 +50,23 @@
5 configure/python-gmenu-dbg:: $(addprefix dbg-configure-stamp-, $(PY_VERSIONS))
6
7 build-stamp-%:
8- make -C build-$*
9+ make -C build-$* PYTHON=`which $*`
10 touch $@
11
12 dbg-build-stamp-%:
13- make -C dbg-build-$*
14+ make -C dbg-build-$* PYTHON=`which $*-dbg`
15 touch $@
16
17 build/python-gmenu:: $(addprefix build-stamp-, $(PY_VERSIONS))
18 build/python-gmenu-dbg:: $(addprefix dbg-build-stamp-, $(PY_VERSIONS))
19
20 install-stamp-%:
21- make -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
22+ make -C build-$* install DESTDIR=$(CURDIR)/debian/tmp PYTHON=`which $*`
23 touch $@
24 cd po; intltool-update -p
25
26 dbg-install-stamp-%:
27- make -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gmenu-dbg
28+ make -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gmenu-dbg PYTHON=`which $*-dbg`
29
30 install/python-gmenu:: $(addprefix install-stamp-, $(PY_VERSIONS))
31

Subscribers

People subscribed via source and target branches

to all changes: