libappindicator

Merge lp:~arges/libappindicator/fix-multiarch-python-includes into lp:libappindicator/13.04

  1. fix-multiarch-python-includes
  2. Merge into trunk.13.04
Proposed by Chris J Arges
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 247
Merged at revision: 247
Proposed branch: lp:~arges/libappindicator/fix-multiarch-python-includes
Merge into: lp:libappindicator/13.04
Diff against target: 26 lines (+7/-1)
2 files modified
acinclude.m4 (+1/-1)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~arges/libappindicator/fix-multiarch-python-includes
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+143775@code.launchpad.net

Description of the change

This fixes python multi-arch include issues.

This changes fixes a FTBFS issue found during an archive rebuild:
http://people.ubuntuwire.org/~wgrant/rebuild-ftbfs-test/test-rebuild-20121221-raring.html

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

This is obviously correct. Approve.

review: Approve
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Now why didn't jenkins see this particular merge yet?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'acinclude.m4'
2--- acinclude.m4 2009-12-12 02:23:37 +0000
3+++ acinclude.m4 2013-01-17 21:29:42 +0000
4@@ -230,7 +230,7 @@
5 dnl deduce PYTHON_INCLUDES
6 py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
7 py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
8-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
9+PYTHON_INCLUDES="`$PYTHON-config --includes`"
10 if test "$py_prefix" != "$py_exec_prefix"; then
11 PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
12 fi
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2012-11-30 22:36:23 +0000
16+++ debian/changelog 2013-01-17 21:29:42 +0000
17@@ -1,3 +1,9 @@
18+libappindicator (12.10.1-0ubuntu2) UNRELEASED; urgency=low
19+
20+ * acinclude.m4: Fix python multi-arch include issues.
21+
22+ -- Chris J Arges <chris.j.arges@canonical.com> Thu, 17 Jan 2013 15:25:28 -0600
23+
24 libappindicator (12.10.1-0ubuntu1) UNRELEASED; urgency=low
25
26 * debian/control:

Subscribers

People subscribed via source and target branches