[tbb] 02/64: Imported Debian patch 2.0r014-2
Graham Inggs
ginggs at moszumanska.debian.org
Mon Jul 3 12:27:35 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 c8d2532b6e23d4751b3a8cd7199a83f6c14f682f
Author: Roberto C. Sanchez <roberto at connexer.com>
Date: Wed Dec 19 21:17:16 2007 -0500
Imported Debian patch 2.0r014-2
---
debian/changelog | 12 ++++
debian/compat | 1 +
debian/control | 57 ++++++++++++++++
debian/copyright | 41 +++++++++++
debian/libtbb-dev.README.Debian | 19 ++++++
debian/libtbb-dev.dirs | 1 +
debian/libtbb-dev.install | 2 +
debian/libtbb2.dirs | 1 +
debian/libtbb2.install | 2 +
debian/lintian-overrides/libtbb2 | 1 +
debian/patches/00list | 2 +
debian/patches/01_add_soname.dpatch | 60 ++++++++++++++++
debian/patches/02_replace_arch_command.dpatch | 27 ++++++++
debian/rules | 98 +++++++++++++++++++++++++++
debian/shlibs.local | 1 +
debian/source.lintian-overrides | 2 +
debian/tbb-examples.README.Debian | 19 ++++++
debian/tbb-examples.docs | 1 +
debian/tbb-examples.examples | 1 +
19 files changed, 348 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..46c3749
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,12 @@
+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 --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..e9d670c
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,57 @@
+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
+Section: libs
+Homepage: http://threadingbuildingblocks.org/
+
+Package: libtbb-dev
+Section: libdevel
+Architecture: i386 amd64 ia64
+Depends: libtbb2 (= ${binary:Version})
+Recommends: 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
+ 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 sybmols
+ 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: tbb-examples
+Section: doc
+Architecture: all
+Description: parallelism library for C++ - examples 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 --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..3eae396
--- /dev/null
+++ b/debian/copyright
@@ -0,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
+
+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.
+
diff --git a/debian/libtbb-dev.README.Debian b/debian/libtbb-dev.README.Debian
new file mode 100644
index 0000000..f65b7d0
--- /dev/null
+++ b/debian/libtbb-dev.README.Debian
@@ -0,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.
+
+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 --git a/debian/libtbb-dev.dirs b/debian/libtbb-dev.dirs
new file mode 100644
index 0000000..e43b95c
--- /dev/null
+++ b/debian/libtbb-dev.dirs
@@ -0,0 +1 @@
+usr/include
diff --git a/debian/libtbb-dev.install b/debian/libtbb-dev.install
new file mode 100644
index 0000000..daea6c6
--- /dev/null
+++ b/debian/libtbb-dev.install
@@ -0,0 +1,2 @@
+include/tbb usr/include
+build/linux_*_release/*.so usr/lib
diff --git a/debian/libtbb2.dirs b/debian/libtbb2.dirs
new file mode 100644
index 0000000..6845771
--- /dev/null
+++ b/debian/libtbb2.dirs
@@ -0,0 +1 @@
+usr/lib
diff --git a/debian/libtbb2.install b/debian/libtbb2.install
new file mode 100644
index 0000000..1f36429
--- /dev/null
+++ b/debian/libtbb2.install
@@ -0,0 +1,2 @@
+build/linux_*_release/*.so.* usr/lib
+debian/lintian-overrides/libtbb2 usr/share/lintian/overrides
diff --git a/debian/lintian-overrides/libtbb2 b/debian/lintian-overrides/libtbb2
new file mode 100644
index 0000000..fe7b58b
--- /dev/null
+++ b/debian/lintian-overrides/libtbb2
@@ -0,0 +1 @@
+libtbb2: several-sonames-in-same-package libtbb.so.2 libtbbmalloc.so.2
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..9f79922
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1,2 @@
+01_add_soname.dpatch
+02_replace_arch_command.dpatch
diff --git a/debian/patches/01_add_soname.dpatch b/debian/patches/01_add_soname.dpatch
new file mode 100644
index 0000000..351264f
--- /dev/null
+++ b/debian/patches/01_add_soname.dpatch
@@ -0,0 +1,60 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_add_soname.dpatch by <roberto at connexer.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds a SONAME to the library
+
+ at DPATCH@
+
+diff -ur tbb-2.0r014/build/Makefile.tbb tbb-2.0r014.test/build/Makefile.tbb
+--- tbb-2.0r014/build/Makefile.tbb 2007-09-21 21:16:34.000000000 -0400
++++ tbb-2.0r014.test/build/Makefile.tbb 2007-12-15 17:28:09.000000000 -0500
+@@ -74,9 +74,12 @@
+
+ # Object files that gmake up TBB (TBB_ASM.OBJ is platform-specific)
+ TBB.OBJ = $(TBB_CPLUS.OBJ) $(TBB_ASM.OBJ)
++LIB_LINK_FLAGS += -Wl,-soname=$(TBB.DLL).$(SONAME_SUFFIX)
+
+ $(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)
+
+
+ #clean:
+diff -ur tbb-2.0r014/build/Makefile.tbbmalloc tbb-2.0r014.test/build/Makefile.tbbmalloc
+--- tbb-2.0r014/build/Makefile.tbbmalloc 2007-09-21 21:16:34.000000000 -0400
++++ tbb-2.0r014.test/build/Makefile.tbbmalloc 2007-12-15 17:28:32.000000000 -0500
+@@ -58,6 +58,7 @@
+ # MALLOC_CPLUS.OBJ is built in two steps due to Intel Compiler Tracker # C69574
+ MALLOC.OBJ := $(MALLOC_CPLUS.OBJ) $(MALLOC_ASM.OBJ) $(MALLOC_CUSTOM.OBJ) MemoryAllocator.$(OBJ)
+ MALLOC_CPLUS.OBJ += MemoryAllocator.$(OBJ)
++LIB_LINK_FLAGS += -Wl,-soname=$(MALLOC.DLL).$(SONAME_SUFFIX)
+
+
+ $(MALLOC_CPLUS.OBJ): %.$(OBJ): %.cpp
+@@ -69,7 +70,9 @@
+
+ $(MALLOC.DLL): TBB.DEF=$(MALLOC.DEF)
+ $(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)
+
+ malloc: $(MALLOC.DLL)
+
+diff -ur tbb-2.0r014/build/common.inc tbb-2.0r014.test/build/common.inc
+--- tbb-2.0r014/build/common.inc 2007-09-21 21:16:34.000000000 -0400
++++ tbb-2.0r014.test/build/common.inc 2007-12-15 16:43:10.000000000 -0500
+@@ -24,6 +24,9 @@
+ # invalidate any other reasons why the executable file might be covered by
+ # the GNU General Public License.
+
++VERSION=2.0.014
++SONAME_SUFFIX=2
++
+ ifndef tbb_os
+ ifeq ($(OS), Windows_NT)
+ export tbb_os=windows
diff --git a/debian/patches/02_replace_arch_command.dpatch b/debian/patches/02_replace_arch_command.dpatch
new file mode 100644
index 0000000..25ab90f
--- /dev/null
+++ b/debian/patches/02_replace_arch_command.dpatch
@@ -0,0 +1,27 @@
+#! /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.
+
+ 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
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..439a3eb
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,98 @@
+#!/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
+ 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)
+ dh_link -s
+ dh_strip -s --dbg-package=libtbb2-dbg
+ dh_compress -s
+ dh_fixperms -s
+ dh_makeshlibs -s
+ 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 --git a/debian/shlibs.local b/debian/shlibs.local
new file mode 100644
index 0000000..0a9cbff
--- /dev/null
+++ b/debian/shlibs.local
@@ -0,0 +1 @@
+libtbb 2 tbb (>= 2.0r014)
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..d72143e
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,2 @@
+# The package does not use autotools and depends on obsolete commands
+tbb source: debian-rules-ignores-make-clean-error
diff --git a/debian/tbb-examples.README.Debian b/debian/tbb-examples.README.Debian
new file mode 100644
index 0000000..f65b7d0
--- /dev/null
+++ b/debian/tbb-examples.README.Debian
@@ -0,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.
+
+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 --git a/debian/tbb-examples.docs b/debian/tbb-examples.docs
new file mode 100644
index 0000000..567609b
--- /dev/null
+++ b/debian/tbb-examples.docs
@@ -0,0 +1 @@
+build/
diff --git a/debian/tbb-examples.examples b/debian/tbb-examples.examples
new file mode 100644
index 0000000..e39721e
--- /dev/null
+++ b/debian/tbb-examples.examples
@@ -0,0 +1 @@
+examples/*
--
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