Merge lp:~libavg-team/python-libavg/packaging.cxxfixes into lp:~libavg-team/python-libavg/packaging

Proposed by OXullo Intersecans
Status: Merged
Merged at revision: 8
Proposed branch: lp:~libavg-team/python-libavg/packaging.cxxfixes
Merge into: lp:~libavg-team/python-libavg/packaging
Diff against target: 40 lines (+10/-2)
3 files modified
debian/changelog (+8/-0)
debian/control (+1/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~libavg-team/python-libavg/packaging.cxxfixes
Reviewer Review Type Date Requested Status
Chase Douglas Approve
Review via email: mp+56670@code.launchpad.net

Description of the change

Fixes for:

Bug #735548: Fails to build under powerpc and armel
Bug #752924: Setting CXXFLAGS drops the autoconf default "-g -O2"

thanks!

To post a comment you must log in.
Revision history for this message
Chase Douglas (chasedouglas) wrote :

Looks good to me :). The next beta freeze is Monday, so we want to get this in asap. After Monday it will be very hard to get it into natty before release.

review: Approve

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 2011-03-11 19:25:11 +0000
3+++ debian/changelog 2011-04-06 22:38:23 +0000
4@@ -1,3 +1,11 @@
5+libavg (1.5.4-0ubuntu2) natty; urgency=low
6+
7+ * Build arch restricted to the supported i386 and amd64 (LP: #735548)
8+ * STDC macros define moved from CXXFLAGS to CPPFLAGS in order to autoconf
9+ to set correctly the default (LP: #752924)
10+
11+ -- OXullo Intersecans <x@brainrapers.org> Wed, 06 Apr 2011 23:46:15 +0200
12+
13 libavg (1.5.4-0ubuntu1) natty; urgency=low
14
15 [ OXullo Intersecans ]
16
17=== modified file 'debian/control'
18--- debian/control 2011-03-05 23:12:50 +0000
19+++ debian/control 2011-04-06 22:38:23 +0000
20@@ -15,7 +15,7 @@
21 Standards-Version: 3.9.1
22
23 Package: python-libavg
24-Architecture: any
25+Architecture: i386 amd64
26 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
27 Provides: ${python:Provides}
28 XB-Python-Version: ${python:Versions}
29
30=== modified file 'debian/rules'
31--- debian/rules 2011-03-08 16:11:43 +0000
32+++ debian/rules 2011-04-06 22:38:23 +0000
33@@ -9,7 +9,7 @@
34 --with-boost-thread=boost_thread-mt
35
36 CHECK_DIRS := base graphics lmfit player conradrelais imaging parport python video
37-CXXFLAGS := -D__STDC_CONSTANT_MACROS
38+CPPFLAGS := -D__STDC_CONSTANT_MACROS
39
40 DEB_INSTALL_MANPAGES_python-libavg := $(DEB_SRCDIR)/debian/*.1
41

Subscribers

People subscribed via source and target branches

to all changes: