Your message dated Sat, 05 Sep 2015 22:08:17 +0000
with message-id <[email protected]>
and subject line Bug#751689: fixed in tbb 4.3~20150611-0.1
has caused the Debian Bug report #751689,
regarding libtbb-dev: multiarch
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
751689: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=751689
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: libtbb-dev
Version: 4.2~20140122-1.1
Severity: wishlist
Tags: patch
Dear Maintainer,
it would be nice if libtbb-dev could be co-installed for amd64 and i386.
Here is a patch that seems to work for me, though you may want to adapt
it a bit and test it more. I used git for the diff to try and make it
more visible: the files where I added dh-exec need "chmod +x", and I
removed the .dirs files which seem unnecessary.
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (500, 'testing'), (500, 'stable'), (50, 'unstable'), (1,
'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
armhf
powerpc
Kernel: Linux 3.14-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages libtbb-dev depends on:
ii libtbb2 4.2~20140122-1.1
libtbb-dev recommends no packages.
Versions of packages libtbb-dev suggests:
pn libtbb-doc <none>
pn tbb-examples <none>
-- no debconf information
diff --git a/tbb-4.2~20140122/debian/control b/marc/debian/control
index 9dc785f..f9f3b72 100644
--- a/tbb-4.2~20140122/debian/control
+++ b/marc/debian/control
@@ -1,7 +1,7 @@
Source: tbb
Priority: extra
Maintainer: Steve Capper <[email protected]>
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), libjs-jquery
+Build-Depends: debhelper (>= 9), dh-exec (>=0.3), dpkg-dev (>= 1.16.1~), libjs-jquery
Standards-Version: 3.9.4
Section: libs
Homepage: http://threadingbuildingblocks.org/
@@ -9,6 +9,7 @@ Homepage: http://threadingbuildingblocks.org/
Package: libtbb-dev
Section: libdevel
Architecture: any
+Multi-arch: same
Depends: libtbb2 (= ${binary:Version}), ${misc:Depends}
Suggests: tbb-examples, libtbb-doc
Description: parallelism library for C++ - development files
@@ -25,7 +26,9 @@ Description: parallelism library for C++ - development files
Package: libtbb2
Architecture: any
+Multi-arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Description: parallelism library for C++ - runtime files
TBB is a library that helps you leverage multi-core processor
performance without having to be a threading expert. It represents a
@@ -41,6 +44,7 @@ Description: parallelism library for C++ - runtime files
Package: libtbb2-dbg
Section: debug
Architecture: any
+Multi-arch: same
Depends: libtbb2 (= ${binary:Version}), ${misc:Depends}
Description: parallelism library for C++ - debugging symbols
TBB is a library that helps you leverage multi-core processor
diff --git a/tbb-4.2~20140122/debian/libtbb-dev.dirs b/tbb-4.2~20140122/debian/libtbb-dev.dirs
deleted file mode 100644
index 13cdd2e..0000000
--- a/tbb-4.2~20140122/debian/libtbb-dev.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include
-usr/lib
-usr/lib/pkgconfig
diff --git a/tbb-4.2~20140122/debian/libtbb-dev.install b/marc/debian/libtbb-dev.install
old mode 100644
new mode 100755
index d1207d3..80f6d75
--- a/tbb-4.2~20140122/debian/libtbb-dev.install
+++ b/marc/debian/libtbb-dev.install
@@ -1,3 +1,4 @@
+#! /usr/bin/dh-exec
include/tbb usr/include
-build/linux_*_release/lib*.so usr/lib
-debian/tbb.pc usr/lib/pkgconfig
+build/linux_*_release/lib*.so usr/lib/${DEB_HOST_MULTIARCH}
+debian/tbb.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/tbb-4.2~20140122/debian/libtbb-dev.links b/marc/debian/libtbb-dev.links
old mode 100644
new mode 100755
index 670c903..6ec86aa
--- a/tbb-4.2~20140122/debian/libtbb-dev.links
+++ b/marc/debian/libtbb-dev.links
@@ -1,3 +1,4 @@
-usr/lib/libtbb.so.2 usr/lib/libtbb.so
-usr/lib/libtbbmalloc.so.2 usr/lib/libtbbmalloc.so
-usr/lib/libtbbmalloc_proxy.so.2 usr/lib/libtbbmalloc_proxy.so
+#! /usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libtbb.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libtbb.so
+usr/lib/${DEB_HOST_MULTIARCH}/libtbbmalloc.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libtbbmalloc.so
+usr/lib/${DEB_HOST_MULTIARCH}/libtbbmalloc_proxy.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libtbbmalloc_proxy.so
diff --git a/tbb-4.2~20140122/debian/libtbb2.dirs b/tbb-4.2~20140122/debian/libtbb2.dirs
deleted file mode 100644
index 6845771..0000000
--- a/tbb-4.2~20140122/debian/libtbb2.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/tbb-4.2~20140122/debian/libtbb2.install b/marc/debian/libtbb2.install
old mode 100644
new mode 100755
index a94ab11..c61a3cd
--- a/tbb-4.2~20140122/debian/libtbb2.install
+++ b/marc/debian/libtbb2.install
@@ -1 +1,2 @@
-build/linux_*_release/lib*.so.* usr/lib
+#! /usr/bin/dh-exec
+build/linux_*_release/lib*.so.* usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/tbb-4.2~20140122/debian/rules b/marc/debian/rules
index 0e0296c..7c95052 100755
--- a/tbb-4.2~20140122/debian/rules
+++ b/marc/debian/rules
@@ -13,7 +13,7 @@ CXXFLAGS+=$(CPPFLAGS)
VERSION = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)
debian/tbb.pc: debian/tbb.pc.in
- sed -e"s/@VERSION@/$(VERSION)/g" $< > $@
+ sed -e"s/@VERSION@/$(VERSION)/g;s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g" $< > $@
build-arch: debian/tbb.pc
diff --git a/tbb-4.2~20140122/debian/tbb-examples.README.Debian b/marc/debian/tbb-examples.README.Debian
index a8742ca..884abed 100644
--- a/tbb-4.2~20140122/debian/tbb-examples.README.Debian
+++ b/marc/debian/tbb-examples.README.Debian
@@ -4,7 +4,7 @@ tbb for Debian
This is the Intel Threading Building Blocks package. It comes from the
"Commercial Aligned Release" series of TBB releases.
-This package ships a pkg-config file in /usr/lib/pkgconfig/tbb.pc. Here is
+This package ships a pkg-config file in /usr/lib/*/pkgconfig/tbb.pc. Here is
an example of how it is used:
gcc -o test test.c `pkg-config --libs --cflags tbb`
diff --git a/tbb-4.2~20140122/debian/tbb.pc.in b/marc/debian/tbb.pc.in
index 140fe33..6bcf5f8 100644
--- a/tbb-4.2~20140122/debian/tbb.pc.in
+++ b/marc/debian/tbb.pc.in
@@ -1,11 +1,11 @@
prefix=/usr
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/lib/@DEB_HOST_MULTIARCH@
includedir=${prefix}/include
Name: Threading Building Blocks
Description: Intel's parallelism library for C++
URL: http://www.threadingbuildingblocks.org/
Version: @VERSION@
-Libs: -L${libdir} -ltbb
-Cflags: -I${includedir}
+Libs: -ltbb
+Cflags:
--- End Message ---
--- Begin Message ---
Source: tbb
Source-Version: 4.3~20150611-0.1
We believe that the bug you reported is fixed in the latest version of
tbb, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Matthias Klose <[email protected]> (supplier of updated tbb package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sat, 05 Sep 2015 19:06:39 +0200
Source: tbb
Binary: libtbb-dev libtbb2 libtbb2-dbg libtbb-doc tbb-examples
Architecture: source amd64 all
Version: 4.3~20150611-0.1
Distribution: unstable
Urgency: medium
Maintainer: Steve Capper <[email protected]>
Changed-By: Matthias Klose <[email protected]>
Description:
libtbb-dev - parallelism library for C++ - development files
libtbb-doc - parallelism library for C++ - documentation
libtbb2 - parallelism library for C++ - runtime files
libtbb2-dbg - parallelism library for C++ - debugging symbols
tbb-examples - parallelism library for C++ - example files
Closes: 748876 751689 778139 779553 787084
Changes:
tbb (4.3~20150611-0.1) unstable; urgency=medium
.
* Non-maintainer upload.
.
[ Matthias Klose ]
* Upload version from experimental to sid, fixing build with GCC 5.
Closes: #778139.
* The architecture list is now marked as linux-any. Closes: #748876.
* Multiarchify the packages (Marc Glisse). Closes: #751689.
* The new upstream fixes the check for __TBB_CPP11_TYPE_PROPERTIES_PRESENT.
Closes: #779553.
.
[ Adam Conrad ]
* gcc-atomic-detection.patch: Fix the gcc atomic detection to work for
gcc-5.x and up, as well as adding -latomic to LIBS (closes: #787084)
* gcc-atomic-always.patch: Always define TBB_USE_GCC_BUILTINS for GCC.
* debian/tbb.pc.in: Add -latomic to the pkg-config file for the above.
Checksums-Sha1:
23e88fa18ae539534dd910c11e815845a5c996a3 2011 tbb_4.3~20150611-0.1.dsc
69b84a17270b7aa3cf8cd087cc24149ddca07d0d 10300
tbb_4.3~20150611-0.1.debian.tar.xz
8bb6a67f1152ff242792a4c5e50e379eb86da08b 236390
libtbb-dev_4.3~20150611-0.1_amd64.deb
ab2de8d35dab53fcad6b25387bf9b013b71ce8d3 373870
libtbb-doc_4.3~20150611-0.1_all.deb
bd2c5c84c61e7cf3aa970813241ecce7ba0e59d6 889486
libtbb2-dbg_4.3~20150611-0.1_amd64.deb
5dd023840b086251fd36f3ede63fabde4fa8886b 136476
libtbb2_4.3~20150611-0.1_amd64.deb
b9fdd518f96857eb4796a2b28d508567cba26524 932800
tbb-examples_4.3~20150611-0.1_amd64.deb
Checksums-Sha256:
849292f5ca48e907e8e7f5ca0566870fb0e1b13621712ea57c4e5e0b25399d30 2011
tbb_4.3~20150611-0.1.dsc
2da015c30f1cc9532027d687d28832ff5cb99c5126fe05529d1ced98512e1856 10300
tbb_4.3~20150611-0.1.debian.tar.xz
5e4b4399927089ef095acb00add8bf3a0d4e38c66f0332b08ac6795299d2db24 236390
libtbb-dev_4.3~20150611-0.1_amd64.deb
ab2ae63bbdfb0f18b848455a4f6e6a1a19743edcc46e663e712507825cd9219d 373870
libtbb-doc_4.3~20150611-0.1_all.deb
fe6fa0ad4fb0ba79d49920433be681bdf2e40bc42f1cbe9df79ec60645fbdd00 889486
libtbb2-dbg_4.3~20150611-0.1_amd64.deb
67e3b7ba4fca75b4aa5a0b8bd74a0be74618f168401364c7274db8131a0ece80 136476
libtbb2_4.3~20150611-0.1_amd64.deb
13f2102094a19c31594baa4b03edd7f1b793e00b1c46e4e368241025cb10bf50 932800
tbb-examples_4.3~20150611-0.1_amd64.deb
Files:
7137b8b2bede9cbd7bb8130fd0a1d4a2 2011 libs extra tbb_4.3~20150611-0.1.dsc
e56347681bca25537ff3dd03a183a324 10300 libs extra
tbb_4.3~20150611-0.1.debian.tar.xz
44bcaf147a1a92be224f26e3a08d3dce 236390 libdevel extra
libtbb-dev_4.3~20150611-0.1_amd64.deb
f0b394fbebf87ae051b1c9706c364110 373870 doc extra
libtbb-doc_4.3~20150611-0.1_all.deb
f09dd51ab67f2bd53e445cab1a85fe81 889486 debug extra
libtbb2-dbg_4.3~20150611-0.1_amd64.deb
09665b953a6bc3bfc95707baa5ef8f1f 136476 libs extra
libtbb2_4.3~20150611-0.1_amd64.deb
c7647c7590ecc838226118c57be45215 932800 doc extra
tbb-examples_4.3~20150611-0.1_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJV6zD3AAoJEL1+qmB3j6b1CUQQAITTV8eiYmlxhqTESCE8Mcu1
4BpzWAdjO2DjPTnH982VS3j8eTNgmc6c7JMkWajrbPHs1k5EPNTaGAY6JzRbuf/j
I/hRWLgSTxe/qz84dAy+T04sh+jEJxp1heyWkPQry6bLIMM470uNmsxqJ/pS2bI+
mV9EwZSmGkMdUZLQBrUn+xg5gGtjC6Cvso5ymR9FuIavF9KCFMxN5DdBVNDDqrno
IyILrQlEtyay+mpEqni9tHIagv19NR28C2qMkKqWxIBQ/r74qgkcD8WdQwhtmi70
fhCEsBhNBsGpE4gkzd1M5OMxEeGIGX4WvtB3LMQOFHXKf/G1SLQFGi7JYnCHa8XY
8jQ+uftmblRHNlygLY3VKqekjZGXemRnRGM/wPoV0Q4c503vWg2YcKCQP74IDxk0
/V1D/af0pKuUp8R2CxBYrrf4p3p/aV7oDjGYVGkllmECftl3/TXUOEKxG6wbn5VB
m6Ng9ITbOdEixkng5N1101vqHRA9ZnMC/qmnXdYGY3P0XEPWolFHT1+72oWZn3xK
NM/gEklJW4Km9FOHmWtQuG+vH2irClf7fkcZgnUTyZTKXyB5Oq8Vcp+VKZweFESC
BeL6QSKcCyPYbfhUVQqc08c2U+NpBSue3OIMOpZ53iT+yVB64jzsvZSVFVqFCIGy
ySaUBnYp27a2AYJ4vCas
=EAXU
-----END PGP SIGNATURE-----
--- End Message ---
