Package: libpthread-stubs Version: 0.3-2.1 Followup-For: Bug #632555 User: [email protected] Usertags: origin-ubuntu precise ubuntu-patch
Hello, Attached is a slightly modified version of this patch, which has been uploaded to Ubuntu. Note that because libpthread-stubs0 is currently an empty package on most architectures, the multiarch dpkg has some trouble with it, considering all but one of the packages to be "disappeared": (Noting disappearance of libpthread-stubs0:armel, which has been completely replaced.) This is, however, a bug in dpkg, not a bug in the libpthread-stubs multiarch implementation. Cheers, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ [email protected] [email protected]
diff -u libpthread-stubs-0.3/debian/control libpthread-stubs-0.3/debian/control --- libpthread-stubs-0.3/debian/control +++ libpthread-stubs-0.3/debian/control @@ -3,7 +3,7 @@ Section: libdevel Maintainer: XCB Developers <[email protected]> Uploaders: Jamey Sharp <[email protected]>, Josh Triplett <[email protected]>, Julien Danjou <[email protected]> -Build-Depends: cdbs (>= 0.4.40), debhelper (>= 5.0.0) +Build-Depends: cdbs (>= 0.4.93), debhelper (>= 8.1.3) Standards-Version: 3.8.3 XS-Vcs-Git: git://anongit.freedesktop.org/git/xcb/pthread-stubs XS-Vcs-Browser: http://gitweb.freedesktop.org/?p=xcb/pthread-stubs.git @@ -11,6 +12,8 @@ Package: libpthread-stubs0 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: pthread stubs not provided by native libc This library provides weak aliases for pthread functions not provided @@ -33,6 +36,7 @@ Package: libpthread-stubs0-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: ${misc:Depends}, libpthread-stubs0 (= ${binary:Version}) Description: pthread stubs not provided by native libc, development files This library provides weak aliases for pthread functions not provided diff -u libpthread-stubs-0.3/debian/rules libpthread-stubs-0.3/debian/rules --- libpthread-stubs-0.3/debian/rules +++ libpthread-stubs-0.3/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -DEB_CONFIGURE_EXTRA_FLAGS=--prefix=/ +DEB_CONFIGURE_EXTRA_FLAGS=--prefix=/ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) DEB_DH_MAKESHLIBS_ARGS_libpthread-stubs0=--add-udeb=libpthread-stubs0-udeb debian/copyright: debian/copyright.debian COPYING @@ -20,10 +20,10 @@ - if test -f debian/tmp/lib/libpthread-stubs.so.0.0.0; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/libpthread-stubs.so.0.0.0; fi - if test -L debian/tmp/lib/libpthread-stubs.so.0; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/libpthread-stubs.so.0; fi + if test -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0.0.0; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0.0.0; fi + if test -L debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0; fi install/libpthread-stubs0-udeb:: - if test -f debian/tmp/lib/libpthread-stubs.so.0.0.0; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/libpthread-stubs.so.0.0.0; fi - if test -L debian/tmp/lib/libpthread-stubs.so.0; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/libpthread-stubs.so.0; fi + if test -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0.0.0; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0.0.0 lib; fi + if test -L debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0 lib; fi install/libpthread-stubs0-dev:: - if test -f debian/tmp/lib/libpthread-stubs.a; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/libpthread-stubs.a usr/lib; ln -s /lib/libpthread-stubs.so.0.0.0 debian/libpthread-stubs0-dev/usr/lib/libpthread-stubs.so; fi - dh_install -p$(cdbs_curpkg) debian/tmp/lib/pkgconfig/pthread-stubs.pc usr/share/pkgconfig/ + if test -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.a; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.a usr/lib/$(DEB_HOST_MULTIARCH); ln -s /lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0.0.0 debian/libpthread-stubs0-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so; fi + dh_install -p$(cdbs_curpkg) debian/tmp/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/pthread-stubs.pc usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
