Merge lp:~cosmos-door/ubuntu/oneiric/scenic/fix-ftbfs-852540 into lp:ubuntu/oneiric/scenic

Proposed by Mitsuya Shibata
Status: Merged
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp:~cosmos-door/ubuntu/oneiric/scenic/fix-ftbfs-852540
Merge into: lp:ubuntu/oneiric/scenic
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~cosmos-door/ubuntu/oneiric/scenic/fix-ftbfs-852540
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Matthias Klose Approve
Ubuntu branches Pending
Review via email: mp+76892@code.launchpad.net

Description of the change

Fix FTBFS LP: #852540

On amd64, configure script uses "/usr/lib64" as boost library path.
However Ubuntu/Debian boost packages use "/usr/lib" for libraries.

And so, I modified package to use --with-boost-libdir at debian/rules.

To post a comment you must log in.
Revision history for this message
Matthias Klose (doko) wrote :

looks fine.

review: Approve
Revision history for this message
Michael Vogt (mvo) wrote :

This is in the archive now:
scenic (0.6.3-1ubuntu3) oneiric; urgency=low

  * Use --with-boost-libdir=/usr/lib to fix FTBFS (LP: #852540).

 -- Mitsuya Shibata <email address hidden> Sun, 25 Sep 2011 17:41:45 +0900

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-09-14 12:27:01 +0000
3+++ debian/changelog 2011-09-25 09:08:26 +0000
4@@ -1,3 +1,9 @@
5+scenic (0.6.3-1ubuntu3) oneiric; urgency=low
6+
7+ * Use --with-boost-libdir=/usr/lib to fix FTBFS (LP: #852540).
8+
9+ -- Mitsuya Shibata <mty.shibata@gmail.com> Sun, 25 Sep 2011 17:41:45 +0900
10+
11 scenic (0.6.3-1ubuntu2) oneiric; urgency=low
12
13 * Make v4lsrc optional; it's gone, and v4l2src will do (LP: #756010).
14
15=== modified file 'debian/rules'
16--- debian/rules 2010-11-07 14:45:32 +0000
17+++ debian/rules 2011-09-25 09:08:26 +0000
18@@ -6,7 +6,7 @@
19 DEB_PYTHON_SYSTEM = pysupport
20 DEB_PYTHON_MODULE_PACKAGES = scenic midistream
21
22-DEB_CONFIGURE_EXTRA_FLAGS := --enable-mt
23+DEB_CONFIGURE_EXTRA_FLAGS := --enable-mt --with-boost-libdir=/usr/lib
24
25 # Suppress generating shlibs file for non-public shared libraries
26 DEB_DH_MAKESHLIBS_ARGS_scenic-utils = -X/usr/lib

Subscribers

People subscribed via source and target branches