Ubuntu
gnome-menus package

Merge lp:~rodrigo-moya/ubuntu/natty/gnome-menus/2_30_5_release into lp:~ubuntu-desktop/gnome-menus/ubuntu

  1. Natty (11.04)
  2. 2_30_5_release
  3. Merge into ubuntu
Proposed by Rodrigo Moya
Status: Merged
Approved by: Michael Terry
Approved revision: 85
Merged at revision: 83
Proposed branch: lp:~rodrigo-moya/ubuntu/natty/gnome-menus/2_30_5_release
Merge into: lp:~ubuntu-desktop/gnome-menus/ubuntu
Diff against target: 51 lines (+15/-5)
2 files modified
debian/changelog (+10/-0)
debian/rules (+5/-5)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntu/natty/gnome-menus/2_30_5_release
Reviewer Review Type Date Requested Status
Michael Terry Pending
Review via email: mp+41520@code.launchpad.net
To post a comment you must log in.
lp:~rodrigo-moya/ubuntu/natty/gnome-menus/2_30_5_release updated
85. By Rodrigo Moya

Removed wrong comment on the changelog

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-09-27 14:30:15 +0000
3+++ debian/changelog 2010-11-22 22:04:25 +0000
4@@ -1,3 +1,13 @@
5+gnome-menus (2.30.5-0ubuntu1) natty; urgency=low
6+
7+ * New upstream release 2.30.5
8+
9+ [ Michael Terry ]
10+ * debian/rules:
11+ - Work around build problems with different Python versions installed
12+
13+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Wed, 17 Nov 2010 15:44:58 +0100
14+
15 gnome-menus (2.30.4-0ubuntu1) maverick; urgency=low
16
17 * New upstream release 2.30.4.
18
19=== modified file 'debian/rules'
20--- debian/rules 2010-08-10 05:05:13 +0000
21+++ debian/rules 2010-11-22 22:04:25 +0000
22@@ -50,24 +50,24 @@
23 configure/python-gmenu-dbg:: $(addprefix dbg-configure-stamp-, $(PY_VERSIONS))
24
25 build-stamp-%:
26- make -C build-$*
27+ make -C build-$* PYTHON=`which $*`
28 touch $@
29
30 dbg-build-stamp-%:
31- make -C dbg-build-$*
32+ make -C dbg-build-$* PYTHON=`which $*-dbg`
33 touch $@
34
35 build/python-gmenu:: $(addprefix build-stamp-, $(PY_VERSIONS))
36 build/python-gmenu-dbg:: $(addprefix dbg-build-stamp-, $(PY_VERSIONS))
37
38 install-stamp-%:
39- make -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
40+ make -C build-$* install DESTDIR=$(CURDIR)/debian/tmp PYTHON=`which $*`
41 touch $@
42 cd po; intltool-update -p
43
44 dbg-install-stamp-%:
45- make -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gmenu-dbg
46-
47+ make -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gmenu-dbg PYTHON=`which $*-dbg`
48+
49 install/python-gmenu:: $(addprefix install-stamp-, $(PY_VERSIONS))
50
51 install/python-gmenu-dbg:: $(addprefix dbg-install-stamp-, $(PY_VERSIONS))

Subscribers

People subscribed via source and target branches