[tbb] 10/64: Imported Debian patch 2.1~20080605-1
Graham Inggs
ginggs at moszumanska.debian.org
Mon Jul 3 12:27:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
ginggs pushed a commit to branch master
in repository tbb.
commit feeaa20dbe1006fd87a3b664892928b1e3374114
Merge: 22ef5a2 533dc05
Author: Roberto C. Sanchez <roberto at connexer.com>
Date: Tue Jul 8 18:51:22 2008 -0400
Imported Debian patch 2.1~20080605-1
CHANGES | 368 ++++
Makefile | 96 +-
README | 10 +-
build/FreeBSD.gcc.inc | 21 +-
build/FreeBSD.inc | 22 +-
build/Makefile.tbb | 46 +-
build/Makefile.tbbmalloc | 63 +-
build/Makefile.test | 124 +-
build/SunOS.gcc.inc | 15 +-
build/SunOS.inc | 31 +-
build/{linux.gcc.inc => SunOS.suncc.inc} | 42 +-
build/codecov.txt | 1 +
build/common.inc | 107 +-
build/common_rules.inc | 53 +-
build/generate_tbbvars.bat | 40 +-
build/generate_tbbvars.sh | 43 +-
build/index.html | 65 +-
build/linux.gcc.inc | 19 +-
build/linux.icc.inc | 25 +-
build/linux.inc | 30 +-
build/macos.gcc.inc | 12 +-
build/macos.icc.inc | 17 +-
build/macos.inc | 14 +-
build/suncc.map.pause | 1 +
.../test_launcher.sh | 10 +-
build/version_info_linux.sh | 18 +-
build/version_info_macos.sh | 14 +-
...version_info_macos.sh => version_info_sunos.sh} | 12 +-
build/windows.cl.inc | 47 +-
build/windows.icl.inc | 44 +-
build/windows.inc | 31 +-
debian/changelog | 13 +
debian/control | 18 +-
debian/copyright | 6 +-
debian/libtbb-dev.README.Debian | 8 +-
debian/libtbb-dev.docs | 1 +
debian/libtbb-dev.links | 2 +
debian/libtbb-doc.doc-base | 10 +
debian/libtbb-doc.docs | 2 +
debian/libtbb2-dbg.docs | 1 +
debian/libtbb2.docs | 1 +
debian/libtbb2.install | 1 -
debian/lintian-overrides/libtbb2 | 1 -
debian/patches/00list | 2 -
debian/patches/01_add_soname.dpatch | 60 -
debian/patches/02_replace_arch_command.dpatch | 29 +-
debian/patches/03_ias_patch.dpatch | 20 -
debian/rules | 10 +-
debian/source.lintian-overrides | 2 +
debian/tbb-examples.docs | 2 +-
doc/Release_Notes.txt | 154 ++
doc/html/a00001.html | 19 +
doc/html/a00013.html | 30 +
doc/html/a00014.html | 26 +
doc/html/a00015.html | 28 +
doc/html/a00016.html | 34 +
doc/html/a00018.html | 20 +
doc/html/a00020.html | 24 +
doc/html/a00022.html | 35 +
doc/html/a00023.html | 32 +
doc/html/a00024.html | 75 +
doc/html/a00025.html | 26 +
doc/html/a00026.html | 24 +
doc/html/a00030.html | 38 +
doc/html/a00031.html | 19 +
doc/html/a00032.html | 26 +
doc/html/a00033.html | 32 +
doc/html/a00034.html | 55 +
doc/html/a00036.html | 48 +
doc/html/a00038.html | 19 +
doc/html/a00039.html | 41 +
doc/html/a00041.html | 104 ++
doc/html/a00044.html | 23 +
doc/html/a00045.html | 24 +
doc/html/a00046.html | 18 +
doc/html/a00054.html | 20 +
doc/html/a00055.html | 18 +
doc/html/a00056.html | 63 +
doc/html/a00058.html | 21 +
doc/html/a00059.html | 63 +
doc/html/a00061.html | 63 +
doc/html/a00062.html | 62 +
doc/html/a00063.html | 63 +
doc/html/a00064.html | 63 +
doc/html/a00065.html | 63 +
doc/html/a00066.html | 63 +
doc/html/a00067.html | 18 +
doc/html/a00068.html | 18 +
doc/html/a00069.html | 66 +
doc/html/a00070.html | 67 +
doc/html/a00071.html | 66 +
doc/html/a00072.html | 65 +
doc/html/a00073.html | 25 +
doc/html/a00074.html | 18 +
doc/html/a00075.html | 64 +
doc/html/a00076.html | 63 +
doc/html/a00077.html | 63 +
doc/html/a00078.html | 23 +
doc/html/a00079.html | 20 +
doc/html/a00080.html | 22 +
doc/html/a00081.html | 21 +
doc/html/a00083.html | 21 +
doc/html/a00085.html | 23 +
doc/html/a00087.html | 27 +
doc/html/a00088.html | 24 +
doc/html/a00089.html | 22 +
doc/html/a00090.html | 24 +
doc/html/a00091.html | 23 +
doc/html/a00092.html | 26 +
doc/html/a00093.html | 23 +
doc/html/a00094.html | 24 +
doc/html/a00095.html | 22 +
doc/html/a00096.html | 24 +
doc/html/a00097.html | 21 +
doc/html/a00098.html | 26 +
doc/html/a00104.html | 24 +
doc/html/a00105.html | 65 +
doc/html/a00106.html | 62 +
doc/html/a00107.html | 25 +
doc/html/a00108.html | 26 +
doc/html/a00110.html | 38 +
doc/html/a00112.html | 20 +
doc/html/a00114.html | 19 +
doc/html/a00115.html | 21 +
doc/html/a00122.html | 18 +
doc/html/a00126.html | 21 +
doc/html/a00128.html | 31 +
doc/html/a00130.html | 20 +
doc/html/a00131.html | 26 +
doc/html/a00162.html | 44 +
doc/html/a00163.html | 42 +
doc/html/a00164.html | 43 +
doc/html/a00165.html | 34 +
doc/html/a00166.html | 42 +
doc/html/a00167.html | 44 +
doc/html/a00168.html | 33 +
doc/html/a00169.html | 257 +++
doc/html/a00170.html | 69 +
doc/html/a00171.html | 76 +
doc/html/a00172.html | 90 +
doc/html/a00173.html | 42 +
doc/html/a00174.html | 649 +++++++
doc/html/a00175.html | 49 +
doc/html/a00176.html | 72 +
doc/html/a00177.html | 328 ++++
doc/html/a00178.html | 138 ++
doc/html/a00179.html | 36 +
doc/html/a00180.html | 95 ++
doc/html/a00181.html | 70 +
doc/html/a00182.html | 423 +++++
doc/html/a00183.html | 156 ++
doc/html/a00184.html | 36 +
doc/html/a00185.html | 43 +
doc/html/a00186.html | 43 +
doc/html/a00187.html | 43 +
doc/html/a00188.html | 31 +
doc/html/a00189.html | 124 ++
doc/html/a00190.html | 36 +
doc/html/a00191.html | 48 +
doc/html/a00192.html | 41 +
doc/html/a00193.html | 41 +
doc/html/a00194.html | 52 +
doc/html/a00195.html | 58 +
doc/html/a00196.html | 96 ++
doc/html/a00197.html | 88 +
doc/html/a00198.html | 50 +
doc/html/a00199.html | 88 +
doc/html/a00200.html | 36 +
doc/html/a00201.html | 52 +
doc/html/a00202.html | 46 +
doc/html/a00203.html | 42 +
doc/html/a00204.html | 147 ++
doc/html/a00205.html | 47 +
doc/html/a00206.html | 60 +
doc/html/a00207.html | 36 +
doc/html/a00208.html | 48 +
doc/html/a00209.html | 116 ++
doc/html/a00210.html | 54 +
doc/html/a00211.html | 162 ++
doc/html/a00212.html | 39 +
doc/html/a00213.html | 64 +
doc/html/a00214.html | 50 +
doc/html/a00215.html | 88 +
doc/html/a00216.html | 44 +
doc/html/a00217.html | 79 +
doc/html/a00218.html | 56 +
doc/html/a00219.html | 44 +
doc/html/a00220.html | 162 ++
doc/html/a00221.html | 34 +
doc/html/a00222.html | 41 +
doc/html/a00223.html | 45 +
doc/html/a00224.html | 45 +
doc/html/a00225.html | 48 +
doc/html/a00226.html | 36 +
doc/html/a00227.html | 54 +
doc/html/a00228.html | 699 ++++++++
doc/html/a00229.html | 62 +
doc/html/a00230.html | 53 +
doc/html/a00231.html | 166 ++
doc/html/a00232.html | 100 ++
doc/html/a00233.html | 42 +
doc/html/a00234.html | 82 +
doc/html/a00235.html | 48 +
doc/html/a00236.html | 44 +
doc/html/a00237.html | 66 +
doc/html/a00238.html | 118 ++
doc/html/a00239.html | 26 +
doc/html/a00240.html | 43 +
doc/html/a00241.html | 46 +
doc/html/a00242.html | 43 +
doc/html/a00278.html | 384 +++++
doc/html/a00279.html | 668 ++++++++
doc/html/a00281.html | 407 +++++
doc/html/a00282.html | 92 +
doc/html/a00283.html | 59 +
doc/html/a00284.html | 429 +++++
doc/html/a00285.html | 113 ++
doc/html/a00286.html | 99 ++
doc/html/a00287.html | 117 ++
doc/html/a00288.html | 127 ++
doc/html/a00289.html | 888 ++++++++++
doc/html/a00290.html | 327 ++++
doc/html/a00291.html | 787 +++++++++
doc/html/a00292.html | 185 ++
doc/html/a00293.html | 409 +++++
doc/html/a00294.html | 161 ++
doc/html/a00295.html | 318 ++++
doc/html/a00296.html | 321 ++++
doc/html/a00297.html | 147 ++
doc/html/a00298.html | 182 ++
doc/html/a00299.html | 209 +++
doc/html/a00300.html | 154 ++
doc/html/a00301.html | 102 ++
doc/html/a00302.html | 149 ++
doc/html/a00303.html | 195 +++
doc/html/a00304.html | 142 ++
doc/html/a00305.html | 131 ++
doc/html/a00306.html | 172 ++
doc/html/a00307.html | 556 ++++++
doc/html/a00308.html | 83 +
doc/html/a00309.html | 76 +
doc/html/a00310.html | 133 ++
doc/html/a00311.html | 207 +++
doc/html/a00312.html | 563 ++++++
doc/html/a00313.html | 198 +++
doc/html/a00314.html | 275 +++
doc/html/a00315.html | 151 ++
doc/html/annotated.html | 99 ++
doc/html/concepts.html | 20 +
doc/html/doxygen.css | 271 +++
doc/html/files.html | 52 +
doc/html/functions.html | 250 +++
doc/html/functions_enum.html | 24 +
doc/html/functions_eval.html | 28 +
doc/html/functions_func.html | 211 +++
doc/html/functions_rela.html | 23 +
doc/html/functions_type.html | 35 +
doc/html/functions_vars.html | 35 +
doc/html/graph_legend.html | 78 +
doc/html/hierarchy.html | 118 ++
doc/html/index.html | 23 +
doc/html/modules.html | 19 +
doc/html/namespacemembers.html | 77 +
doc/html/namespacemembers_enum.html | 22 +
doc/html/namespacemembers_eval.html | 24 +
doc/html/namespacemembers_func.html | 40 +
doc/html/namespacemembers_type.html | 28 +
doc/html/namespacemembers_vars.html | 22 +
doc/html/namespaces.html | 20 +
doc/html/pages.html | 32 +
doc/html/parallel_do_body_req.html | 31 +
doc/html/parallel_for_body_req.html | 21 +
doc/html/parallel_reduce_body_req.html | 22 +
doc/html/parallel_scan_body_req.html | 23 +
doc/html/parallel_sort_iter_req.html | 20 +
doc/html/range_req.html | 23 +
examples/GettingStarted/sub_string_finder/Makefile | 12 +-
.../sub_string_finder/Makefile.windows | 14 +-
.../sub_string_finder/sub_string_finder.cpp | 2 +-
.../sub_string_finder_extended.cpp | 2 +-
.../sub_string_finder/sub_string_finder_pretty.cpp | 2 +-
.../vc7.1/sub_string_finder.vcproj | 12 +-
.../vc7.1/sub_string_finder_extended.vcproj | 12 +-
.../vc7.1/sub_string_finder_pretty.vcproj | 12 +-
.../sub_string_finder/vc8/sub_string_finder.vcproj | 24 +-
.../vc8/sub_string_finder_extended.vcproj | 24 +-
.../vc8/sub_string_finder_pretty.vcproj | 24 +-
.../sub_string_finder/vc9/sub_string_finder.suo | Bin 16384 -> 9728 bytes
.../sub_string_finder/vc9/sub_string_finder.vcproj | 24 +-
.../vc9/sub_string_finder_extended.vcproj | 24 +-
.../vc9/sub_string_finder_pretty.vcproj | 24 +-
.../sub_string_finder.xcodeproj/project.pbxproj | 8 +-
examples/Makefile | 31 +-
examples/common/gui/convideo.cpp | 14 +-
examples/common/gui/gdivideo.cpp | 2 +-
examples/common/index.html | 2 +-
.../concurrent_hash_map/count_strings/Makefile | 10 +-
.../count_strings/Makefile.windows | 12 +-
.../count_strings/count_strings.cpp | 165 +-
.../count_strings/vc7.1/count_strings.vcproj | 12 +-
.../count_strings/vc8/count_strings.vcproj | 24 +-
.../count_strings/vc9/count_strings.suo | Bin 11776 -> 7680 bytes
.../count_strings/vc9/count_strings.vcproj | 34 +-
.../xcode/count_strings.xcodeproj/project.pbxproj | 8 +-
examples/index.html | 2 +
examples/{parallel_for => parallel_do}/index.html | 8 +-
.../parallel_preorder/Graph.cpp | 5 +-
.../parallel_do/parallel_preorder/Graph.h | 80 +-
.../parallel_preorder/Makefile | 4 +-
.../parallel_preorder/Makefile.windows | 8 +-
.../parallel_do/parallel_preorder/Matrix.h | 56 +-
examples/parallel_do/parallel_preorder/index.html | 94 +
.../parallel_preorder/parallel_preorder.cpp | 38 +-
.../parallel_preorder/vc7.1/parallel_preorder.sln | 21 +
.../parallel_preorder/vc7.1/parallel_preorder.suo | Bin 0 -> 7168 bytes
.../vc7.1/parallel_preorder.vcproj | 12 +-
.../parallel_preorder/vc8/parallel_preorder.sln | 25 +
.../parallel_preorder/vc8/parallel_preorder.suo | Bin 0 -> 7680 bytes
.../parallel_preorder/vc8/parallel_preorder.vcproj | 24 +-
.../parallel_preorder/vc9/parallel_preorder.sln | 25 +
.../parallel_preorder/vc9/parallel_preorder.suo | Bin 0 -> 7680 bytes
.../parallel_preorder/vc9/parallel_preorder.vcproj | 24 +-
.../parallel_preorder.xcodeproj/project.pbxproj | 8 +-
examples/parallel_for/index.html | 4 +-
.../{seismic => polygon_overlay}/Makefile | 27 +-
.../{seismic => polygon_overlay}/Makefile.windows | 10 +-
examples/parallel_for/polygon_overlay/index.html | 133 ++
examples/parallel_for/polygon_overlay/polymain.cpp | 625 +++++++
.../parallel_for/polygon_overlay/polymain.h | 30 +-
examples/parallel_for/polygon_overlay/polyover.cpp | 405 +++++
.../parallel_for/polygon_overlay/polyover.h | 24 +-
.../parallel_for/polygon_overlay/pover_global.h | 101 ++
.../parallel_for/polygon_overlay/pover_video.cpp | 160 ++
.../parallel_for/polygon_overlay/pover_video.h | 72 +-
examples/parallel_for/polygon_overlay/rpolygon.h | 175 ++
examples/parallel_for/polygon_overlay/speedup.gif | Bin 0 -> 7162 bytes
.../gui.rc => polygon_overlay/vc7.1/pover.rc} | 41 +-
.../parallel_for/polygon_overlay/vc7.1/pover.sln | 35 +
.../parallel_for/polygon_overlay/vc7.1/pover.suo | Bin 0 -> 10240 bytes
.../polygon_overlay/vc7.1/pover.vcproj | 494 ++++++
.../parallel_for/polygon_overlay/vc7.1/resource.h | 14 +
.../vc7.1/gui.rc => polygon_overlay/vc8/pover.rc} | 41 +-
.../parallel_for/polygon_overlay/vc8/pover.sln | 37 +
.../parallel_for/polygon_overlay/vc8/pover.suo | Bin 0 -> 21504 bytes
.../vc8/pover.vcproj} | 122 +-
.../parallel_for/polygon_overlay/vc8/resource.h | 14 +
.../vc7.1/gui.rc => polygon_overlay/vc9/pover.rc} | 41 +-
.../parallel_for/polygon_overlay/vc9/pover.sln | 37 +
.../parallel_for/polygon_overlay/vc9/pover.suo | Bin 0 -> 8192 bytes
.../vc9/pover.vcproj} | 120 +-
.../parallel_for/polygon_overlay/vc9/resource.h | 14 +
.../xcode/English.lproj/InfoPlist.strings | 0
.../xcode/English.lproj/main.nib/classes.nib | 0
.../xcode/English.lproj/main.nib/info.nib | 0
.../xcode/English.lproj/main.nib/objects.xib | 6 +-
.../{tacheon => polygon_overlay}/xcode/Info.plist | 2 +-
.../polygon_overlay/xcode/PolygonOverlay.pch | 5 +
.../PolygonOverlay.xcodeproj}/project.pbxproj | 72 +-
examples/parallel_for/seismic/Makefile | 15 +-
examples/parallel_for/seismic/Makefile.windows | 4 +-
.../parallel_for/seismic/SeismicSimulation.cpp | 124 +-
.../seismic/vc7.1/SeismicSimulation.rc | 4 +-
.../seismic/vc7.1/SeismicSimulation.vcproj | 24 +-
.../parallel_for/seismic/vc8/SeismicSimulation.rc | 4 +-
.../seismic/vc8/SeismicSimulation.vcproj | 48 +-
.../parallel_for/seismic/vc9/SeismicSimulation.rc | 4 +-
.../parallel_for/seismic/vc9/SeismicSimulation.suo | Bin 9728 -> 8192 bytes
.../seismic/vc9/SeismicSimulation.vcproj | 48 +-
.../SeismicSimulation.xcodeproj/project.pbxproj | 4 +-
.../tacheon/vc7.1/tacheon.threads.vcproj | 239 ---
.../tacheon/vc8/tacheon.threads.vcproj | 691 --------
examples/parallel_for/tacheon/vc9/tacheon.suo | Bin 18432 -> 0 bytes
.../tacheon/vc9/tacheon.threads.vcproj | 687 --------
examples/parallel_for/tacheon/xcode/tacheon.pch | 5 -
.../parallel_for/{tacheon => tachyon}/Makefile | 24 +-
.../{tacheon => tachyon}/Makefile.windows | 31 +-
.../{tacheon => tachyon}/dat/820spheres.dat | 0
.../{tacheon => tachyon}/dat/balls.dat | 0
.../{tacheon => tachyon}/dat/balls3.dat | 0
.../{tacheon => tachyon}/dat/lattice.dat | 0
.../{tacheon => tachyon}/dat/model2.dat | 0
.../{tacheon => tachyon}/dat/teapot.dat | 0
.../{tacheon => tachyon}/dat/trypsin4pti.dat | 0
.../parallel_for/{tacheon => tachyon}/index.html | 17 +-
.../parallel_for/{tacheon => tachyon}/src/api.cpp | 11 +-
.../parallel_for/{tacheon => tachyon}/src/api.h | 9 +-
.../{tacheon => tachyon}/src/apigeom.cpp | 7 +-
.../{tacheon => tachyon}/src/apitrigeom.cpp | 7 +-
.../{tacheon => tachyon}/src/apitrigeom.h | 7 +-
.../{tacheon => tachyon}/src/bndbox.cpp | 9 +-
.../parallel_for/{tacheon => tachyon}/src/bndbox.h | 7 +-
.../parallel_for/{tacheon => tachyon}/src/box.cpp | 7 +-
.../parallel_for/{tacheon => tachyon}/src/box.h | 7 +-
.../{tacheon => tachyon}/src/camera.cpp | 7 +-
.../parallel_for/{tacheon => tachyon}/src/camera.h | 7 +-
.../{tacheon => tachyon}/src/coordsys.cpp | 7 +-
.../{tacheon => tachyon}/src/coordsys.h | 7 +-
.../{tacheon => tachyon}/src/cylinder.cpp | 7 +-
.../{tacheon => tachyon}/src/cylinder.h | 7 +-
.../{tacheon => tachyon}/src/extvol.cpp | 7 +-
.../parallel_for/{tacheon => tachyon}/src/extvol.h | 7 +-
.../{tacheon => tachyon}/src/getargs.cpp | 7 +-
.../{tacheon => tachyon}/src/getargs.h | 7 +-
.../{tacheon => tachyon}/src/global.cpp | 7 +-
.../parallel_for/{tacheon => tachyon}/src/global.h | 7 +-
.../parallel_for/{tacheon => tachyon}/src/grid.cpp | 7 +-
.../parallel_for/{tacheon => tachyon}/src/grid.h | 7 +-
.../{tacheon => tachyon}/src/imageio.cpp | 7 +-
.../{tacheon => tachyon}/src/imageio.h | 7 +-
.../parallel_for/{tacheon => tachyon}/src/imap.cpp | 7 +-
.../parallel_for/{tacheon => tachyon}/src/imap.h | 7 +-
.../{tacheon => tachyon}/src/intersect.cpp | 7 +-
.../{tacheon => tachyon}/src/intersect.h | 7 +-
.../parallel_for/{tacheon => tachyon}/src/jpeg.cpp | 7 +-
.../parallel_for/{tacheon => tachyon}/src/jpeg.h | 7 +-
.../{tacheon => tachyon}/src/light.cpp | 7 +-
.../parallel_for/{tacheon => tachyon}/src/light.h | 7 +-
.../{tacheon => tachyon}/src/machine.h | 11 +-
.../parallel_for/{tacheon => tachyon}/src/macros.h | 7 +-
.../{tacheon => tachyon}/src/objbound.cpp | 7 +-
.../{tacheon => tachyon}/src/objbound.h | 7 +-
.../{tacheon => tachyon}/src/parse.cpp | 11 +-
.../parallel_for/{tacheon => tachyon}/src/parse.h | 9 +-
.../{tacheon => tachyon}/src/plane.cpp | 7 +-
.../parallel_for/{tacheon => tachyon}/src/plane.h | 7 +-
.../parallel_for/{tacheon => tachyon}/src/ppm.cpp | 7 +-
.../parallel_for/{tacheon => tachyon}/src/ppm.h | 7 +-
.../{tacheon => tachyon}/src/pthread.cpp | 7 +-
.../{tacheon => tachyon}/src/pthread.h | 7 +-
.../{tacheon => tachyon}/src/quadric.cpp | 7 +-
.../{tacheon => tachyon}/src/quadric.h | 7 +-
.../{tacheon => tachyon}/src/render.cpp | 9 +-
.../parallel_for/{tacheon => tachyon}/src/render.h | 7 +-
.../parallel_for/{tacheon => tachyon}/src/ring.cpp | 7 +-
.../parallel_for/{tacheon => tachyon}/src/ring.h | 7 +-
.../{tacheon => tachyon}/src/shade.cpp | 7 +-
.../parallel_for/{tacheon => tachyon}/src/shade.h | 7 +-
.../{tacheon => tachyon}/src/sphere.cpp | 7 +-
.../parallel_for/{tacheon => tachyon}/src/sphere.h | 7 +-
.../{tacheon => tachyon}/src/texture.cpp | 13 +-
.../{tacheon => tachyon}/src/texture.h | 7 +-
.../{tacheon => tachyon}/src/tgafile.cpp | 7 +-
.../{tacheon => tachyon}/src/tgafile.h | 7 +-
.../parallel_for/{tacheon => tachyon}/src/trace.h | 7 +-
.../{tacheon => tachyon}/src/trace.serial.cpp | 13 +-
.../{tacheon => tachyon}/src/trace.tbb.cpp | 7 +-
.../{tacheon => tachyon}/src/trace.tbb1d.cpp | 7 +-
.../{tacheon => tachyon}/src/trace_rest.cpp | 7 +-
.../{tacheon => tachyon}/src/triangle.cpp | 9 +-
.../{tacheon => tachyon}/src/triangle.h | 7 +-
.../parallel_for/{tacheon => tachyon}/src/types.h | 9 +-
.../parallel_for/{tacheon => tachyon}/src/ui.cpp | 13 +-
.../parallel_for/{tacheon => tachyon}/src/ui.h | 9 +-
.../parallel_for/{tacheon => tachyon}/src/util.cpp | 11 +-
.../parallel_for/{tacheon => tachyon}/src/util.h | 11 +-
.../{tacheon => tachyon}/src/vector.cpp | 7 +-
.../parallel_for/{tacheon => tachyon}/src/vector.h | 7 +-
.../{tacheon => tachyon}/src/video.cpp | 31 +-
.../parallel_for/{tacheon => tachyon}/src/video.h | 7 +-
.../parallel_for/{tacheon => tachyon}/src/vol.cpp | 7 +-
.../parallel_for/{tacheon => tachyon}/src/vol.h | 7 +-
.../{tacheon => tachyon}/vc7.1/gui.ico | Bin
.../parallel_for/{tacheon => tachyon}/vc7.1/gui.rc | 0
.../{tacheon => tachyon}/vc7.1/resource.h | 0
.../{tacheon => tachyon}/vc7.1/small.ico | Bin
.../vc7.1/tachyon.serial.vcproj} | 6 +-
.../tacheon.sln => tachyon/vc7.1/tachyon.sln} | 8 +-
.../tacheon.suo => tachyon/vc7.1/tachyon.suo} | Bin
.../vc7.1/tachyon.tbb.vcproj} | 30 +-
.../vc7.1/tachyon.tbb1d.vcproj} | 30 +-
.../vc7.1/tachyon.vcproj} | 4 +-
.../vc8/tachyon.serial.vcproj} | 6 +-
.../vc8/tacheon.sln => tachyon/vc8/tachyon.sln} | 10 +-
.../vc8/tacheon.suo => tachyon/vc8/tachyon.suo} | Bin
.../vc8/tachyon.tbb.vcproj} | 54 +-
.../vc8/tachyon.tbb1d.vcproj} | 54 +-
.../tacheon.vcproj => tachyon/vc8/tachyon.vcproj} | 4 +-
.../vc9/tachyon.serial.vcproj} | 4 +-
.../vc9/tacheon.sln => tachyon/vc9/tachyon.sln} | 10 +-
examples/parallel_for/tachyon/vc9/tachyon.suo | Bin 0 -> 15872 bytes
.../vc9/tachyon.tbb.vcproj} | 52 +-
.../vc9/tachyon.tbb1d.vcproj} | 52 +-
.../tacheon.vcproj => tachyon/vc9/tachyon.vcproj} | 4 +-
.../xcode/English.lproj/InfoPlist.strings | 0
.../xcode/English.lproj/main.nib/classes.nib | 0
.../xcode/English.lproj/main.nib/info.nib | 0
.../xcode/English.lproj/main.nib/objects.xib | 6 +-
.../{tacheon => tachyon}/xcode/Info.plist | 2 +-
examples/parallel_for/tachyon/xcode/tachyon.pch | 5 +
.../xcode/tachyon.xcodeproj}/project.pbxproj | 98 +-
examples/parallel_reduce/convex_hull/Makefile | 8 +-
.../parallel_reduce/convex_hull/Makefile.windows | 14 +-
examples/parallel_reduce/convex_hull/convex_hull.h | 89 +-
.../convex_hull/vc7.1/convex_hull_bench.vcproj | 12 +-
.../convex_hull/vc7.1/convex_hull_sample.vcproj | 12 +-
.../convex_hull/vc8/convex_hull_benchmark.vcproj | 24 +-
.../convex_hull/vc8/convex_hull_sample.vcproj | 24 +-
.../convex_hull/vc9/convex_hull.suo | Bin 9728 -> 8704 bytes
.../convex_hull/vc9/convex_hull_benchmark.vcproj | 36 +-
.../convex_hull/vc9/convex_hull_sample.vcproj | 24 +-
.../xcode/convex_hull.xcodeproj/project.pbxproj | 8 +-
examples/parallel_reduce/primes/Makefile | 4 +-
examples/parallel_reduce/primes/Makefile.windows | 8 +-
.../parallel_reduce/primes/vc7.1/primes.vcproj | 12 +-
examples/parallel_reduce/primes/vc8/primes.vcproj | 24 +-
examples/parallel_reduce/primes/vc9/primes.suo | Bin 8192 -> 7680 bytes
examples/parallel_reduce/primes/vc9/primes.vcproj | 24 +-
.../primes/xcode/primes.xcodeproj/project.pbxproj | 8 +-
.../parallel_while/parallel_preorder/Graph.cpp | 5 +-
examples/parallel_while/parallel_preorder/Makefile | 4 +-
.../parallel_preorder/Makefile.windows | 8 +-
.../parallel_preorder/parallel_preorder.cpp | 11 +-
.../vc7.1/parallel_preorder.vcproj | 12 +-
.../parallel_preorder/vc8/parallel_preorder.vcproj | 24 +-
.../parallel_preorder/vc9/parallel_preorder.suo | Bin 8704 -> 7680 bytes
.../parallel_preorder/vc9/parallel_preorder.vcproj | 24 +-
.../parallel_preorder.xcodeproj/project.pbxproj | 8 +-
examples/pipeline/text_filter/Makefile | 12 +-
examples/pipeline/text_filter/Makefile.windows | 15 +-
examples/pipeline/text_filter/text_filter.cpp | 32 +-
.../pipeline/text_filter/vc7.1/text_filter.vcproj | 16 +-
.../pipeline/text_filter/vc8/text_filter.vcproj | 32 +-
examples/pipeline/text_filter/vc9/text_filter.suo | Bin 8192 -> 7680 bytes
.../pipeline/text_filter/vc9/text_filter.vcproj | 32 +-
.../xcode/text_filter.xcodeproj/project.pbxproj | 10 +-
examples/task/tree_sum/Makefile | 6 +-
examples/task/tree_sum/Makefile.windows | 8 +-
examples/task/tree_sum/vc7.1/tree_sum.vcproj | 12 +-
examples/task/tree_sum/vc8/tree_sum.vcproj | 24 +-
examples/task/tree_sum/vc9/tree_sum.suo | Bin 9216 -> 8704 bytes
examples/task/tree_sum/vc9/tree_sum.vcproj | 24 +-
.../xcode/tree_sum.xcodeproj/project.pbxproj | 8 +-
examples/test_all/fibonacci/Fibonacci.cpp | 54 +-
examples/test_all/fibonacci/Makefile | 6 +-
examples/test_all/fibonacci/Makefile.windows | 10 +-
examples/test_all/fibonacci/vc7.1/fibonacci.vcproj | 12 +-
examples/test_all/fibonacci/vc8/fibonacci.vcproj | 24 +-
examples/test_all/fibonacci/vc9/fibonacci.suo | Bin 9216 -> 8704 bytes
examples/test_all/fibonacci/vc9/fibonacci.vcproj | 24 +-
.../xcode/fibonacci.xcodeproj/project.pbxproj | 8 +-
include/tbb/_tbb_windef.h | 31 +-
include/tbb/aligned_space.h | 13 +-
include/tbb/atomic.h | 79 +-
include/tbb/blocked_range.h | 11 +-
include/tbb/concurrent_hash_map.h | 921 ++++++----
include/tbb/concurrent_queue.h | 102 +-
include/tbb/concurrent_vector.h | 669 ++++++--
.../tbb/machine/ibm_aix51.h | 29 +-
include/tbb/machine/linux_em64t.h | 24 +-
include/tbb/machine/linux_ia32.h | 52 +-
include/tbb/machine/linux_itanium.h | 23 +-
include/tbb/machine/mac_ppc.h | 40 +-
include/tbb/machine/windows_em64t.h | 30 +-
include/tbb/machine/windows_ia32.h | 49 +-
include/tbb/machine/windows_ia32_inline.h | 10 +
include/tbb/mutex.h | 13 +-
include/tbb/parallel_do.h | 450 +++++
include/tbb/parallel_for.h | 141 +-
include/tbb/parallel_reduce.h | 304 +++-
include/tbb/parallel_scan.h | 148 +-
include/tbb/parallel_sort.h | 29 +-
include/tbb/parallel_while.h | 3 -
include/tbb/partitioner.h | 175 +-
include/tbb/pipeline.h | 47 +-
include/tbb/queuing_mutex.h | 5 +
include/tbb/queuing_rw_mutex.h | 5 +
include/tbb/{mutex.h => recursive_mutex.h} | 77 +-
include/tbb/scalable_allocator.h | 23 +-
include/tbb/spin_mutex.h | 11 +-
include/tbb/spin_rw_mutex.h | 72 +-
include/tbb/task.h | 277 ++-
include/tbb/task_scheduler_init.h | 27 +-
.../tbb/task_scheduler_observer.h | 43 +-
.../tbb/{scalable_allocator.h => tbb_allocator.h} | 120 +-
include/tbb/tbb_exception.h | 242 +++
include/tbb/tbb_machine.h | 252 +--
include/tbb/tbb_stddef.h | 113 +-
include/tbb/tbb_thread.h | 285 ++++
include/tbb/tick_count.h | 19 +
index.html | 4 +
src/Makefile | 156 ++
src/old/concurrent_queue_v2.cpp | 383 +++++
.../old/concurrent_queue_v2.h | 2 +-
.../concurrent_vector_v2.cpp} | 13 +-
.../old/concurrent_vector_v2.h | 10 +-
.../spin_rw_mutex.cpp => old/spin_rw_mutex_v2.cpp} | 6 +-
.../spin_rw_mutex.h => src/old/spin_rw_mutex_v2.h | 2 +-
.../test_concurrent_queue_v2.cpp} | 4 +-
.../test_concurrent_vector_v2.cpp} | 38 +-
src/{test/test_mutex.cpp => old/test_mutex_v2.cpp} | 32 +-
.../aligned_space.h => src/perf/harness_barrier.h | 62 +-
src/perf/perf_util.h | 291 ++++
src/perf/statistics.cpp | 411 +++++
src/perf/statistics.h | 188 ++
src/perf/statistics_xml.h | 208 +++
src/perf/time_base.cpp | 260 +++
src/perf/time_framework.h | 280 +++
src/perf/time_hash_map.cpp | 347 ++++
src/perf/time_unit.cpp | 291 ++++
src/perf/time_vector.cpp | 256 +++
src/tbb/Makefile | 45 -
src/tbb/cache_aligned_allocator.cpp | 151 +-
src/tbb/concurrent_hash_map.cpp | 2 +-
src/tbb/concurrent_queue.cpp | 735 ++++----
src/tbb/concurrent_vector.cpp | 385 +++--
src/tbb/em64t-tbb-mac-export.txt | 127 --
src/tbb/gate.h | 103 +-
src/tbb/ia32-masm/atomic_support.asm | 24 +-
src/tbb/ia32-tbb-mac-export.txt | 127 --
.../atomic_support.c} | 30 +-
src/tbb/itanium-gas/lock_byte.s | 2 +-
src/tbb/itanium-tbb.def | 169 --
src/tbb/itt_notify.cpp | 56 +-
src/tbb/lin32-tbb-export.def | 292 ++++
src/tbb/lin64-tbb-export.def | 288 ++++
src/tbb/lin64ipf-tbb-export.def | 332 ++++
src/tbb/mac32-tbb-export.def | 276 +++
src/tbb/mac64-tbb-export.def | 275 +++
src/tbb/mutex.cpp | 40 +-
src/tbb/pipeline.cpp | 137 +-
src/tbb/recursive_mutex.cpp | 141 ++
src/tbb/spin_mutex.cpp | 2 +-
src/tbb/spin_rw_mutex.cpp | 152 +-
src/tbb/task.cpp | 1799 +++++++++++++++++---
src/tbb/tbb_assert_impl.h | 93 +
src/tbb/tbb_misc.cpp | 150 +-
src/tbb/tbb_misc.h | 106 +-
src/tbb/tbb_thread.cpp | 209 +++
src/tbb/tbb_version.h | 16 +-
src/tbb/{ia32-tbb.def => win32-tbb-export.def} | 99 +-
src/tbb/{em64t-tbb.def => win64-tbb-export.def} | 101 +-
src/tbbmalloc/Customize.h | 32 +-
src/tbbmalloc/MemoryAllocator.cpp | 391 ++---
src/tbbmalloc/TypeDefinitions.h | 4 +-
.../lin-tbbmalloc-export.def} | 20 +-
...c-mac-export.txt => mac32-tbbmalloc-export.def} | 0
...c-mac-export.txt => mac64-tbbmalloc-export.def} | 0
src/tbbmalloc/tbbmalloc.cpp | 33 +-
...em64t-malloc.def => win32-tbbmalloc-export.def} | 0
...{ia32-malloc.def => win64-tbbmalloc-export.def} | 0
src/test/Makefile | 44 -
src/test/harness.h | 55 +-
src/test/harness_allocator.h | 90 +-
src/test/harness_assert.h | 4 +-
src/test/harness_bad_expr.h | 4 +-
src/test/harness_cpu.h | 49 +-
..._cache_aligned_allocator.cpp => harness_m128.h} | 18 +-
src/test/harness_memory.h | 2 +-
src/test/harness_trace.h | 132 ++
src/test/test_ScalableAllocator.cpp | 26 +-
src/test/test_ScalableAllocator_STL.cpp | 15 +-
src/test/test_aligned_space.cpp | 61 +-
src/test/test_assembly.cpp | 44 +-
src/test/test_atomic.cpp | 166 +-
src/test/test_blocked_range.cpp | 14 +-
src/test/test_blocked_range2d.cpp | 4 +-
src/test/test_blocked_range3d.cpp | 4 +-
src/test/test_cache_aligned_allocator.cpp | 3 +
src/test/test_cache_aligned_allocator_STL.cpp | 11 +-
...aligned_allocator_STL.cpp => test_compiler.cpp} | 58 +-
src/test/test_concurrent_hash_map.cpp | 433 ++++-
src/test/test_concurrent_queue.cpp | 162 ++
src/test/test_concurrent_vector.cpp | 492 +++++-
src/test/test_eh_algorithms.cpp | 605 +++++++
src/test/test_eh_tasks.cpp | 806 +++++++++
src/test/test_inits_loop.cpp | 16 +-
src/test/test_malloc_compliance.cpp | 24 +-
src/test/test_model_plugin.cpp | 116 +-
src/test/test_mutex.cpp | 189 +-
src/test/test_mutex_native_threads.cpp | 14 +-
src/test/test_parallel_do.cpp | 278 +++
src/test/test_parallel_for.cpp | 15 +-
src/test/test_parallel_reduce.cpp | 94 +-
src/test/test_parallel_scan.cpp | 6 +-
src/test/test_parallel_sort.cpp | 2 +-
src/test/test_parallel_while.cpp | 2 +-
src/test/test_pipeline.cpp | 154 +-
src/test/test_task.cpp | 224 ++-
src/test/test_task_assertions.cpp | 119 ++
src/test/test_task_leaks.cpp | 114 +-
src/test/test_task_scheduler_init.cpp | 18 +-
src/test/test_task_scheduler_observer.cpp | 165 ++
src/test/test_tbb_thread.cpp | 268 +++
src/test/test_tbb_version.cpp | 226 +++
684 files changed, 43513 insertions(+), 7738 deletions(-)
diff --cc debian/changelog
index 59143d8,0000000..f3eb627
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,42 -1,0 +1,55 @@@
++tbb (2.1~20080605-1) unstable; urgency=low
++
++ * New upstream release
++ * Drop patches
++ - 01_add_soname: suitable fascimile implemented upstream
++ - 03_ias_patch: upstream now using as instead of ias
++ * Update to Standards-Version 3.8.0 (no changes)
++ * Add new upstream Doxygen documentation (in libtbb-doc package)
++ * Register new documentation with doc-base
++ * debian/copyright: Update years of copyright
++
++ -- Roberto C. Sanchez <roberto at connexer.com> Tue, 08 Jul 2008 18:51:22 -0400
++
+tbb (2.0r020-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches/04_g++-4.3.dpatch: Removed, integrated upstream
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Tue, 29 Apr 2008 15:31:09 -0400
+
+tbb (2.0r017-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Sat, 08 Mar 2008 22:15:13 -0500
+
+tbb (2.0r014-4) unstable; urgency=low
+
+ * Make tbb-examples recommend libtbb-dev.
+ * Make libtbb-dev suggest tbb-examples.
+ * Patch to allow building with g++-4.3 (Closes: #462415)
+ * Only conditionally create symlink (Closes: #465617)
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Thu, 14 Feb 2008 18:36:15 -0500
+
+tbb (2.0r014-3) unstable; urgency=low
+
+ * Fix short descriptions of tbb-examples (Closes: #457442)
+ * Fix short descriptions of libtbb2-dbg (Closes: #457443)
+ * Add patch to allow build to succeed on Itanium
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Thu, 3 Jan 2008 15:21:50 -0500
+
+tbb (2.0r014-2) unstable; urgency=low
+
+ * debian/copyright: Fix license statement.
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Wed, 19 Dec 2007 21:17:16 -0500
+
+tbb (2.0r014-1) unstable; urgency=low
+
+ * Initial release (Closes: #434583)
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Fri, 14 Dec 2007 23:10:58 -0500
+
diff --cc debian/control
index c1943c3,0000000..c9793e1
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,58 -1,0 +1,70 @@@
+Source: tbb
+Priority: extra
+Maintainer: Athena Capital Research <acr-debian at athenacr.com>
+Uploaders: Roberto C. Sanchez <roberto at connexer.com>
+Build-Depends: debhelper (>= 5), dpatch
- Standards-Version: 3.7.3
++Standards-Version: 3.8.0
+Section: libs
+Homepage: http://threadingbuildingblocks.org/
+
+Package: libtbb-dev
+Section: libdevel
+Architecture: i386 amd64 ia64
+Depends: libtbb2 (= ${binary:Version})
- Suggests: tbb-examples
++Suggests: tbb-examples, libtbb-doc
+Description: parallelism library for C++ - development files
+ TBB is a library that helps you leverage multi-core processor
+ performance without having to be a threading expert. It represents a
+ higher-level, task-based parallelism that abstracts platform details
+ and threading mechanism for performance and scalability.
+ .
+ This package includes the TBB development files.
+
+Package: libtbb2
+Section: libs
+Architecture: i386 amd64 ia64
+Depends: ${shlibs:Depends}, ${misc: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
+ higher-level, task-based parallelism that abstracts platform details
+ and threading mechanism for performance and scalability.
+ .
+ This package includes the TBB runtime files.
+
+Package: libtbb2-dbg
+Section: libdevel
+Architecture: i386 amd64 ia64
+Depends: libtbb2 (= ${binary:Version})
+Description: parallelism library for C++ - debugging symbols
+ TBB is a library that helps you leverage multi-core processor
+ performance without having to be a threading expert. It represents a
+ higher-level, task-based parallelism that abstracts platform details
+ and threading mechanism for performance and scalability.
+ .
+ This package includes the TBB debugging symbols.
+
++Package: libtbb-doc
++Section: doc
++Architecture: all
++Recommends: libtbb-dev, tbb-examples
++Description: parallelism library for C++ - example files
++ TBB is a library that helps you leverage multi-core processor
++ performance without having to be a threading expert. It represents a
++ higher-level, task-based parallelism that abstracts platform details
++ and threading mechanism for performance and scalability.
++ .
++ This package includes the TBB documentation files.
++
+Package: tbb-examples
+Section: doc
+Architecture: all
- Recommends: libtbb-dev
++Recommends: libtbb-dev, libtbb-doc
+Description: parallelism library for C++ - example files
+ TBB is a library that helps you leverage multi-core processor
+ performance without having to be a threading expert. It represents a
+ higher-level, task-based parallelism that abstracts platform details
+ and threading mechanism for performance and scalability.
+ .
+ This package includes the TBB example files.
+
diff --cc debian/copyright
index 3eae396,0000000..f2a2fb9
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,41 -1,0 +1,41 @@@
+This package was debianized by Roberto C. Sanchez <roberto at connexer.com> on
+Fri, 14 Dec 2007 23:10:58 -0500.
+
+It was downloaded from http://threadingbuildingblocks.org
+
+Upstream Author: Intel Corporation
+
- Copyright: Copyright (c) 2005-2007 Intel Corporation
++Copyright: Copyright (c) 2005-2008 Intel Corporation
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+Additionally, the TBB code carries the following exception:
+
+ As a special exception, you may use this file as part of a free software
+ library without restriction. Specifically, if other files instantiate
+ templates or use macros or inline functions from this file, or you compile
+ this file and link it with other files to produce an executable, this
+ file does not by itself cause the resulting executable to be covered by
+ the GNU General Public License. This exception does not however
+ invalidate any other reasons why the executable file might be covered by
+ the GNU General Public License.
+
- The Debian packaging is (C) 2007, Athena Capital Research
- <acr-debian at athenacr.com> and is licensed under the GPL, see above.
++The Debian packaging is (c) 2007-2008, Athena Capital Research
++<acr-debian at athenacr.com> and is licensed under the GPL version 2, see above.
+
diff --cc debian/libtbb-dev.README.Debian
index f65b7d0,0000000..678d2f5
mode 100644,000000..100644
--- a/debian/libtbb-dev.README.Debian
+++ b/debian/libtbb-dev.README.Debian
@@@ -1,19 -1,0 +1,19 @@@
+tbb for Debian
+--------------
+
- This is the Intel Threading Building Blocks package. It comes from the
- "Commercial Aligned Release" series of TBB releases. This is to minimize lag
- in the availability of new features and to maximize compatibility with the
- commercial releases from Intel.
++This is the Intel Threading Building Blocks package. It comes from the "Stable
++Release" series of TBB releases. This is to minimize lag in the availability
++of new features while still providing a TBB package release that is stable and
++current.
+
+The examples are located in the tbb-examples package. In order to install
+and use them, you want to install that package and run something like this:
+
+cd ~
+cp -r /usr/share/doc/tbb-examples/ .
+cd tbb-examples
+find . -name '*.gz'| xargs gunzip
+cd examples
+make
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Fri, 14 Dec 2007 23:10:58 -0500
diff --cc debian/libtbb-dev.docs
index 0000000,0000000..df68263
new file mode 100644
--- /dev/null
+++ b/debian/libtbb-dev.docs
@@@ -1,0 -1,0 +1,1 @@@
++doc/Release_Notes.txt
diff --cc debian/libtbb-dev.links
index 0000000,0000000..07a4a19
new file mode 100644
--- /dev/null
+++ b/debian/libtbb-dev.links
@@@ -1,0 -1,0 +1,2 @@@
++usr/lib/libtbb.so.2 usr/lib/libtbb.so
++usr/lib/libtbbmalloc.so.2 usr/lib/libtbbmalloc.so
diff --cc debian/libtbb-doc.doc-base
index 0000000,0000000..48d1079
new file mode 100644
--- /dev/null
+++ b/debian/libtbb-doc.doc-base
@@@ -1,0 -1,0 +1,10 @@@
++Document: libtbb-doc
++Title: Threading Building Blocks Library Documentation
++Author: Intel Corporation
++Abstract: Documentation for developing against libtbb
++Section: Programming
++
++Format: HTML
++Index: /usr/share/doc/libtbb-doc/html/index.html
++Files: /usr/share/doc/libtbb-doc/html/*.html
++
diff --cc debian/libtbb-doc.docs
index 0000000,0000000..f3f2a78
new file mode 100644
--- /dev/null
+++ b/debian/libtbb-doc.docs
@@@ -1,0 -1,0 +1,2 @@@
++doc/html/
++doc/Release_Notes.txt
diff --cc debian/libtbb2-dbg.docs
index 0000000,0000000..df68263
new file mode 100644
--- /dev/null
+++ b/debian/libtbb2-dbg.docs
@@@ -1,0 -1,0 +1,1 @@@
++doc/Release_Notes.txt
diff --cc debian/libtbb2.docs
index 0000000,0000000..df68263
new file mode 100644
--- /dev/null
+++ b/debian/libtbb2.docs
@@@ -1,0 -1,0 +1,1 @@@
++doc/Release_Notes.txt
diff --cc debian/libtbb2.install
index 1f36429,0000000..4741c5f
mode 100644,000000..100644
--- a/debian/libtbb2.install
+++ b/debian/libtbb2.install
@@@ -1,2 -1,0 +1,1 @@@
+build/linux_*_release/*.so.* usr/lib
- debian/lintian-overrides/libtbb2 usr/share/lintian/overrides
diff --cc debian/patches/00list
index 7c53d5a,0000000..85ce859
mode 100644,000000..100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,3 -1,0 +1,1 @@@
- 01_add_soname.dpatch
+02_replace_arch_command.dpatch
- 03_ias_patch.dpatch
diff --cc debian/patches/02_replace_arch_command.dpatch
index 25ab90f,0000000..56bd9e8
mode 100644,000000..100644
--- a/debian/patches/02_replace_arch_command.dpatch
+++ b/debian/patches/02_replace_arch_command.dpatch
@@@ -1,27 -1,0 +1,20 @@@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_replace_arch_command.dpatch by <roberto at connexer.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Replace obsolote arch command with uname -m
+
+ at DPATCH@
+
- --- tbb-2.0r014/build/linux.inc 2007-09-21 21:16:34.000000000 -0400
- +++ tbb-2.0r014.test/build/linux.inc 2007-12-15 17:55:04.000000000 -0500
- @@ -25,13 +25,13 @@
- # the GNU General Public License.
++diff -uNr tbb21_20080605oss.orig/build/version_info_linux.sh tbb21_20080605oss/build/version_info_linux.sh
++--- tbb21_20080605oss.orig/build/version_info_linux.sh 2008-06-07 02:56:21.000000000 -0400
+++++ tbb21_20080605oss/build/version_info_linux.sh 2008-07-08 15:27:27.000000000 -0400
++@@ -28,7 +28,7 @@
+
- ifndef arch
- - ifeq ($(shell arch),i686)
- + ifeq ($(shell uname -m),i686)
- export arch:=ia32
- endif
- - ifeq ($(shell arch),ia64)
- + ifeq ($(shell uname -m),ia64)
- export arch:=itanium
- endif
- - ifeq ($(shell arch),x86_64)
- + ifeq ($(shell uname -m),x86_64)
- export arch:=em64t
- endif
- endif
++ # Script used to generate version info string
++ echo "#define __TBB_VERSION_STRINGS \\"
++-echo '"TBB:' "BUILD_HOST\t\t"`hostname -s`" ("`arch`")"'" ENDL \'
+++echo '"TBB:' "BUILD_HOST\t\t"`hostname -s`" ("`uname -m`")"'" ENDL \'
++ echo '"TBB:' "BUILD_OS\t\t"`head -1 /etc/issue | sed -e 's/\\\\//g'`'" ENDL \'
++ echo '"TBB:' "BUILD_KERNEL\t"`uname -rv`'" ENDL \'
++ echo '"TBB:' "BUILD_GCC\t\t"`g++ -v </dev/null 2>&1 | grep 'gcc.*version'`'" ENDL \'
diff --cc debian/rules
index e61b2e6,0000000..00857e0
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,98 -1,0 +1,104 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+# shared library versions, option 1
+version=2.0.014
+major=2
+
+configure: configure-stamp
+configure-stamp: patch
+ dh_testdir
+ # Add here commands to configure the package.
+ touch configure-stamp
+
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
- $(MAKE) tbb_release tbbmalloc_release
++ $(MAKE) tbb tbbmalloc
++ # Keep build-time tests disabled for now as they hang the package
++ # build process. They complete properly when called directly from
++ # the command line as part of a package build outside of debian/rules.
++ # $(MAKE) test
+ touch $@
+
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ -$(MAKE) clean
+ dh_clean
+
+patch: patch-stamp
+patch-stamp:
+ dpatch apply-all
+
+unpatch:
+ dpatch deapply-all
+ rm -rf patch-stamp debian/patched
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+ dh_testdir -i
+ dh_testroot -i
+ dh_installchangelogs -i
+ dh_installdocs -i -Xrelease -Xdebug
+ dh_installexamples -i
+ dh_install -i --sourcedir=$(CURDIR)
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir -s
+ dh_testroot -s
+ dh_installchangelogs -s
+ dh_installdocs -s -Xrelease -Xdebug
+ dh_installexamples -s
+ dh_install --sourcedir=$(CURDIR)
++ rm -f $(CURDIR)/debian/libtbb-dev/usr/lib/libtbb.so
++ rm -f $(CURDIR)/debian/libtbb-dev/usr/lib/libtbbmalloc.so
+ dh_link -s
+ dh_strip -s --dbg-package=libtbb2-dbg
+ dh_compress -s
+ dh_fixperms -s
- dh_makeshlibs -s -V 'libtbb2 (>= 2.0r020)'
++ dh_makeshlibs -s -V 'libtbb2 (>= 2.1~)'
+ dh_installdeb -s
+ dh_shlibdeps -s
+ dh_gencontrol -s
+ dh_md5sums -s
+ dh_builddeb -s
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --cc debian/source.lintian-overrides
index d72143e,0000000..f1338fd
mode 100644,000000..100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@@ -1,2 -1,0 +1,4 @@@
+# The package does not use autotools and depends on obsolete commands
+tbb source: debian-rules-ignores-make-clean-error
++# The download site is broken and cannot be scanned by uscan
++tbb source: debian-watch-file-is-missing
diff --cc debian/tbb-examples.docs
index 567609b,0000000..df68263
mode 100644,000000..100644
--- a/debian/tbb-examples.docs
+++ b/debian/tbb-examples.docs
@@@ -1,1 -1,0 +1,1 @@@
- build/
++doc/Release_Notes.txt
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tbb.git
More information about the debian-science-commits
mailing list