diff -Nru boost1.53-1.53.0/debian/changelog boost1.53-1.53.0/debian/changelog --- boost1.53-1.53.0/debian/changelog 2013-08-08 11:01:12.000000000 +0200 +++ boost1.53-1.53.0/debian/changelog 2013-08-27 00:47:17.000000000 +0200 @@ -1,3 +1,10 @@ +boost1.53 (1.53.0-6+exp2ubuntu3) saucy; urgency=low + + * Create symlinks in the multiarch-locations, this fixes linking with + -lboost-python and CMAKE detction of boost-python. (LP: #1217237) + + -- Andreas Moog Tue, 27 Aug 2013 00:24:04 +0200 + boost1.53 (1.53.0-6+exp2ubuntu2) saucy; urgency=low * libbost1.53-dev: change Depends from obsolete libstdc++6-4.4 to diff -Nru boost1.53-1.53.0/debian/rtupdate boost1.53-1.53.0/debian/rtupdate --- boost1.53-1.53.0/debian/rtupdate 2009-12-15 07:01:05.000000000 +0100 +++ boost1.53-1.53.0/debian/rtupdate 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -#! /bin/sh -# -# Update link-library symlinks after a Python default runtime change - -set -e - -die() { - echo "$@" >&2 - exit 1 -} - -update_linklibs() { - py=$1 - suf=$2 - - cd /usr/lib - for base in libboost_python libboost_mpi_python; do - target=${base}-${py}.${suf} - link=${base}.${suf} - test -e $target && ln -s -f $target $link || rm -f $link - done -} - -remove_linklibs() { - suf=$1 - - cd /usr/lib - for thread in "" -mt; do - rm -f libboost_python${thread}.${suf} - rm -f libboost_mpi_python${thread}.${suf} - done -} - -rtupdate() { - case "$1" in - python*) py=py`echo ${1#python} | tr -d .` ;; - *) remove ; return ;; - esac - - update_linklibs $py a - update_linklibs $py so -} - -remove() { - remove_linklibs a - remove_linklibs so -} - - -action="$1" -shift - -case "$action" in - pre-rtupdate) ;; - post-rtupdate) ;; - rtupdate) rtupdate $2 ;; - remove) remove ;; - *) die "$0 called with unknown argument '$action'" ;; -esac - diff -Nru boost1.53-1.53.0/debian/rtupdate.in boost1.53-1.53.0/debian/rtupdate.in --- boost1.53-1.53.0/debian/rtupdate.in 1970-01-01 01:00:00.000000000 +0100 +++ boost1.53-1.53.0/debian/rtupdate.in 2013-08-27 00:40:04.000000000 +0200 @@ -0,0 +1,60 @@ +#! /bin/sh +# +# Update link-library symlinks after a Python default runtime change + +set -e + +die() { + echo "$@" >&2 + exit 1 +} + +update_linklibs() { + py=$1 + suf=$2 + + cd /usr/lib/@DEB_HOST_MULTIARCH@ + for base in libboost_python libboost_mpi_python; do + target=${base}-${py}.${suf} + link=${base}.${suf} + test -e $target && ln -s -f $target $link || rm -f $link + done +} + +remove_linklibs() { + suf=$1 + + cd /usr/lib/@DEB_HOST_MULTIARCH@ + for thread in "" -mt; do + rm -f libboost_python${thread}.${suf} + rm -f libboost_mpi_python${thread}.${suf} + done +} + +rtupdate() { + case "$1" in + python*) py=py`echo ${1#python} | tr -d .` ;; + *) remove ; return ;; + esac + + update_linklibs $py a + update_linklibs $py so +} + +remove() { + remove_linklibs a + remove_linklibs so +} + + +action="$1" +shift + +case "$action" in + pre-rtupdate) ;; + post-rtupdate) ;; + rtupdate) rtupdate $2 ;; + remove) remove ;; + *) die "$0 called with unknown argument '$action'" ;; +esac + diff -Nru boost1.53-1.53.0/debian/rules boost1.53-1.53.0/debian/rules --- boost1.53-1.53.0/debian/rules 2013-08-06 11:17:50.000000000 +0200 +++ boost1.53-1.53.0/debian/rules 2013-08-27 10:33:47.000000000 +0200 @@ -22,12 +22,15 @@ filtered_files = \ debian/libboost-doc.doc-base \ debian/libboost-python-dev.postinst \ - debian/libboost-python-dev.prerm + debian/libboost-python-dev.prerm \ + debian/rtupdate DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk include /usr/share/dpkg/architecture.mk +DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + %: dh $@ --with python2 --with python3 @@ -325,7 +328,7 @@ done $(filtered_files): % : %.in - sed -e 's/@PKGVERSION@/$(PKGVERSION)/g' < $< > $@ + sed -e 's/@PKGVERSION@/$(PKGVERSION)/g;s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' < $< > $@ clean-debhelper: rm -rf debian/*.install