[tbb] 04/64: Imported Debian patch 2.0r014-4

[Graham Inggs]

This is an automated email from the git hooks/post-receive script.

ginggs pushed a commit to branch master
in repository tbb.

commit c96d05f9de0cfb01375e5f48a62d87fc058a6e9c
Author: Roberto C. Sanchez <roberto at connexer.com>
Date:   Thu Feb 14 18:36:15 2008 -0500

    Imported Debian patch 2.0r014-4
---
 debian/changelog                    |  9 +++++++++
 debian/control                      |  3 ++-
 debian/patches/00list               |  1 +
 debian/patches/01_add_soname.dpatch |  8 ++++----
 debian/patches/04_g++-4.3.dpatch    | 19 +++++++++++++++++++
 5 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c47a8fd..c857086 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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)
diff --git a/debian/control b/debian/control
index d9d7661..c1943c3 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Package: libtbb-dev
 Section: libdevel
 Architecture: i386 amd64 ia64
 Depends: libtbb2 (= ${binary:Version})
-Recommends: tbb-examples
+Suggests: tbb-examples
 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
@@ -47,6 +47,7 @@ Description: parallelism library for C++ - debugging symbols
 Package: tbb-examples
 Section: doc
 Architecture: all
+Recommends: libtbb-dev
 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
diff --git a/debian/patches/00list b/debian/patches/00list
index 7c53d5a..3e69e8f 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 01_add_soname.dpatch
 02_replace_arch_command.dpatch
 03_ias_patch.dpatch
+04_g++-4.3.dpatch
diff --git a/debian/patches/01_add_soname.dpatch b/debian/patches/01_add_soname.dpatch
index 351264f..26fc95d 100644
--- a/debian/patches/01_add_soname.dpatch
+++ b/debian/patches/01_add_soname.dpatch
@@ -18,8 +18,8 @@ diff -ur tbb-2.0r014/build/Makefile.tbb tbb-2.0r014.test/build/Makefile.tbb
  $(TBB.DLL): $(TBB.OBJ) $(TBB.DEF) $(TBB.RES) tbbvars
 -	$(CPLUS) $(TBB.OBJ) $(TBB.RES) $(LIBS) $(PIC_KEY) $(OUTPUT_KEY)$(TBB.DLL) $(LIB_LINK_FLAGS)
 +	$(CPLUS) $(TBB.OBJ) $(TBB.RES) $(LIBS) $(PIC_KEY) $(OUTPUT_KEY)$(TBB.DLL).$(VERSION) $(LIB_LINK_FLAGS)
-+	ln -s $(TBB.DLL).$(VERSION) $(TBB.DLL).$(SONAME_SUFFIX)
-+	ln -s $(TBB.DLL).$(VERSION) $(TBB.DLL)
++	[ -L $(TBB.DLL).$(SONAME_SUFFIX) ] || ln -s $(TBB.DLL).$(VERSION) $(TBB.DLL).$(SONAME_SUFFIX)
++	[ -L $(TBB.DLL) ] || ln -s $(TBB.DLL).$(VERSION) $(TBB.DLL)
  
  
  #clean:
@@ -40,8 +40,8 @@ diff -ur tbb-2.0r014/build/Makefile.tbbmalloc tbb-2.0r014.test/build/Makefile.tb
  $(MALLOC.DLL): $(MALLOC.OBJ) $(MALLOC.DEF) $(TBBMALLOC.RES)
 -	$(CPLUS) $(MALLOC.OBJ) $(TBBMALLOC.RES) $(LIBS) $(PIC_KEY) $(OUTPUT_KEY)$(MALLOC.DLL) $(LIB_LINK_FLAGS)
 +	$(CPLUS) $(MALLOC.OBJ) $(TBBMALLOC.RES) $(LIBS) $(PIC_KEY) $(OUTPUT_KEY)$(MALLOC.DLL).$(VERSION) $(LIB_LINK_FLAGS)
-+	ln -s $(MALLOC.DLL).$(VERSION) $(MALLOC.DLL).$(SONAME_SUFFIX)
-+	ln -s $(MALLOC.DLL).$(VERSION) $(MALLOC.DLL)
++	[ -L $(MALLOC.DLL).$(SONAME_SUFFIX) ] || ln -s $(MALLOC.DLL).$(VERSION) $(MALLOC.DLL).$(SONAME_SUFFIX)
++	[ -L $(MALLOC.DLL) ] || ln -s $(MALLOC.DLL).$(VERSION) $(MALLOC.DLL)
  
  malloc: $(MALLOC.DLL)
  
diff --git a/debian/patches/04_g++-4.3.dpatch b/debian/patches/04_g++-4.3.dpatch
new file mode 100644
index 0000000..ed568aa
--- /dev/null
+++ b/debian/patches/04_g++-4.3.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_g++-4.3.dpatch by  <roberto at connexer.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build with g++-4.3
+
+ at DPATCH@
+
+diff -uNr tbb20_014oss_src.orig/src/tbb/concurrent_vector.cpp tbb20_014oss_src/src/tbb/concurrent_vector.cpp
+--- tbb20_014oss_src.orig/src/tbb/concurrent_vector.cpp	2007-09-21 21:16:38.000000000 -0400
++++ tbb20_014oss_src/src/tbb/concurrent_vector.cpp	2008-02-14 18:13:31.000000000 -0500
+@@ -31,6 +31,7 @@
+ #include <stdexcept>
+ #include "itt_notify.h"
+ #include "tbb/task.h"
++#include <cstring>
+ 
+ 
+ namespace tbb {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tbb.git