[tbb] 48/64: Imported Debian patch 4.2~20130725-2
Graham Inggs
ginggs at moszumanska.debian.org
Mon Jul 3 12:28:02 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 0c333ea2e064a1545e1382949668c87b3e679d80
Author: Roberto C. Sanchez <roberto at connexer.com>
Date: Sun Mar 2 13:05:59 2014 -0500
Imported Debian patch 4.2~20130725-2
---
debian/changelog | 34 ++++++++++---------
debian/control | 9 +++--
debian/patches/adddebug.patch | 6 ++--
debian/patches/armhf.patch | 18 +++++-----
debian/patches/fixnonlinux.patch | 41 ++++++++++++++---------
debian/rules | 4 +++
debian/source/include-binaries | 71 ----------------------------------------
7 files changed, 63 insertions(+), 120 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6f78afb..f45ce07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,33 +1,35 @@
-tbb (4.2~20130725-1.4~exp2) experimental; urgency=low
+tbb (4.2~20130725-2) unstable; urgency=low
- * Non-maintainer upload.
- * Fix buildd on x32/hurd/kFreeBSD
+ * Oprhan the package, set maintainer to Debian QA Group
- -- Mathieu Malaterre <malat at debian.org> Wed, 18 Sep 2013 10:31:59 +0200
+ -- Roberto C. Sanchez <roberto at connexer.com> Sun, 02 Mar 2014 13:05:59 -0500
-tbb (4.2~20130725-1.3~exp2) experimental; urgency=low
+tbb (4.2~20130725-1.2) unstable; urgency=medium
* Non-maintainer upload.
- * Fix compilation on hurd/kFreeBSD/sparc
+ * Add mips mipsel to the list of supported arches in debian/control
+ Closes: #739965
- -- Mathieu Malaterre <malat at debian.org> Wed, 11 Sep 2013 14:09:10 +0200
+ -- Anibal Monsalve Salazar <anibal at debian.org> Mon, 24 Feb 2014 12:27:06 +0000
-tbb (4.2~20130725-1.2~exp2) experimental; urgency=low
+tbb (4.2~20130725-1.1) unstable; urgency=low
* Non-maintainer upload.
- * Build on sparc/sparc64/kfreebsd and hurd
- * Add more debug info on x32
- * Fix hardening compilation
+ * New upstream
+ * Fix buildds: x32/sparc/sparc64
+ * Do not compress Makefiles in tbb-examples
- -- Mathieu Malaterre <malat at debian.org> Tue, 10 Sep 2013 08:50:57 +0200
+ -- Mathieu Malaterre <malat at debian.org> Tue, 08 Oct 2013 08:23:25 +0000
-tbb (4.2~20130725-1.1~exp2) experimental; urgency=low
+tbb (4.1~20130613-1.2) unstable; urgency=medium
* Non-maintainer upload.
- * New stable release: 4.2
- * Fix d/watch page to use new https redirection
+ * Fix armhf buildd
+ + debian/patches/armhf.patch
+ * Fix hardening flags (missing CPPFLAGS)
+ * Fix d/watch file
- -- Mathieu Malaterre <malat at debian.org> Mon, 09 Sep 2013 12:12:17 +0200
+ -- Mathieu Malaterre <malat at debian.org> Wed, 18 Sep 2013 09:22:27 +0200
tbb (4.1~20130613-1.1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 3eb9791..ce9ef91 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,6 @@
Source: tbb
Priority: extra
-Maintainer: Athena Capital Research <acr-debian at athenacr.com>
-Uploaders: Roberto C. Sanchez <roberto at connexer.com>
+Maintainer: Debian QA Group <packages at qa.debian.org>
Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~)
Standards-Version: 3.9.4
Section: libs
@@ -9,7 +8,7 @@ Homepage: http://threadingbuildingblocks.org/
Package: libtbb-dev
Section: libdevel
-Architecture: i386 amd64 ia64 powerpc powerpcspe ppc64 x32 armhf sparc sparc64 kfreebsd-amd64 kfreebsd-i386 hurd-i386
+Architecture: i386 amd64 ia64 powerpc powerpcspe ppc64 x32 armhf sparc sparc64 mips mipsel
Depends: libtbb2 (= ${binary:Version}), ${misc:Depends}
Suggests: tbb-examples, libtbb-doc
Description: parallelism library for C++ - development files
@@ -25,7 +24,7 @@ Description: parallelism library for C++ - development files
This package includes the TBB development files.
Package: libtbb2
-Architecture: i386 amd64 ia64 powerpc powerpcspe ppc64 x32 armhf sparc sparc64 kfreebsd-amd64 kfreebsd-i386 hurd-i386
+Architecture: i386 amd64 ia64 powerpc powerpcspe ppc64 x32 armhf sparc sparc64 mips mipsel
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: parallelism library for C++ - runtime files
TBB is a library that helps you leverage multi-core processor
@@ -41,7 +40,7 @@ Description: parallelism library for C++ - runtime files
Package: libtbb2-dbg
Section: debug
-Architecture: i386 amd64 ia64 powerpc powerpcspe ppc64 x32 armhf sparc sparc64 kfreebsd-amd64 kfreebsd-i386 hurd-i386
+Architecture: i386 amd64 ia64 powerpc powerpcspe ppc64 x32 armhf sparc sparc64 mips mipsel
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/debian/patches/adddebug.patch b/debian/patches/adddebug.patch
index 8d9cc31..dfeead8 100644
--- a/debian/patches/adddebug.patch
+++ b/debian/patches/adddebug.patch
@@ -3,8 +3,8 @@ Author: Mathieu Malaterre <malat at debian.org>
Index: tbb-4.2~20130725/build/linux.inc
===================================================================
---- tbb-4.2~20130725.orig/build/linux.inc 2013-09-11 12:18:47.604872826 +0200
-+++ tbb-4.2~20130725/build/linux.inc 2013-09-11 12:46:45.232858209 +0200
+--- tbb-4.2~20130725.orig/build/linux.inc 2013-10-08 09:54:09.000000000 +0200
++++ tbb-4.2~20130725/build/linux.inc 2013-10-08 09:54:10.000000000 +0200
@@ -44,6 +44,11 @@
ifndef arch
@@ -17,7 +17,7 @@ Index: tbb-4.2~20130725/build/linux.inc
ifeq ($(uname_m),i686)
export arch:=ia32
endif
-@@ -64,6 +69,8 @@
+@@ -61,6 +66,8 @@
endif
ifndef arch
export arch:=$(uname_m)
diff --git a/debian/patches/armhf.patch b/debian/patches/armhf.patch
index d88124a..7da5232 100644
--- a/debian/patches/armhf.patch
+++ b/debian/patches/armhf.patch
@@ -1,18 +1,16 @@
-Description: remove whitespace in export
- It looks like on debian armv7l is returned while armv71 seems to be expected...
+Description: It looks like on debian armv7l is returned while armv71 seems to
+ be expected...
Author: Mathieu Malaterre <malat at debian.org>
+Bug-Debian: http://bugs.debian.org/692033
-Index: tbb-4.2~20130725/build/linux.inc
-===================================================================
---- tbb-4.2~20130725.orig/build/linux.inc 2013-09-11 12:17:45.648873366 +0200
-+++ tbb-4.2~20130725/build/linux.inc 2013-09-11 12:18:03.708873207 +0200
-@@ -57,7 +57,10 @@
+--- tbb-4.1~20130613.orig/build/linux.inc
++++ tbb-4.1~20130613/build/linux.inc
+@@ -56,8 +56,8 @@ ifndef arch
+ ifeq ($(uname_m),sparc64)
export arch:=sparc
endif
- ifeq ($(uname_m),armv71)
+- ifeq ($(uname_m),armv71)
- export arch :=armv7
-+ export arch:=armv7
-+ endif
+ ifeq ($(uname_m),armv7l)
+ export arch:=armv7
endif
diff --git a/debian/patches/fixnonlinux.patch b/debian/patches/fixnonlinux.patch
index 2cdb442..9bd1dd0 100644
--- a/debian/patches/fixnonlinux.patch
+++ b/debian/patches/fixnonlinux.patch
@@ -3,8 +3,8 @@ Author: Mathieu Malaterre <malat at debian.org>
Index: tbb-4.2~20130725/build/common.inc
===================================================================
---- tbb-4.2~20130725.orig/build/common.inc 2013-09-18 10:30:03.399660045 +0200
-+++ tbb-4.2~20130725/build/common.inc 2013-09-18 10:30:23.927659866 +0200
+--- tbb-4.2~20130725.orig/build/common.inc 2013-10-08 09:54:04.000000000 +0200
++++ tbb-4.2~20130725/build/common.inc 2013-10-08 09:54:14.000000000 +0200
@@ -41,6 +41,14 @@
ifeq ($(OS), Linux)
export tbb_os=linux
@@ -22,8 +22,8 @@ Index: tbb-4.2~20130725/build/common.inc
endif
Index: tbb-4.2~20130725/build/linux.inc
===================================================================
---- tbb-4.2~20130725.orig/build/linux.inc 2013-09-18 10:30:23.199659872 +0200
-+++ tbb-4.2~20130725/build/linux.inc 2013-09-18 10:30:23.927659866 +0200
+--- tbb-4.2~20130725.orig/build/linux.inc 2013-10-08 09:54:10.000000000 +0200
++++ tbb-4.2~20130725/build/linux.inc 2013-10-08 09:54:14.000000000 +0200
@@ -52,6 +52,9 @@
ifeq ($(uname_m),i686)
export arch:=ia32
@@ -34,16 +34,13 @@ Index: tbb-4.2~20130725/build/linux.inc
ifeq ($(uname_m),ia64)
export arch:=ia64
endif
-@@ -59,7 +62,7 @@
+@@ -59,11 +62,17 @@
export arch:=intel64
endif
ifeq ($(uname_m),sparc64)
- export arch:=sparc
+ export arch:=sparc64
endif
- ifeq ($(uname_m),armv71)
- export arch:=armv7
-@@ -67,6 +70,12 @@
ifeq ($(uname_m),armv7l)
export arch:=armv7
endif
@@ -56,7 +53,7 @@ Index: tbb-4.2~20130725/build/linux.inc
ifndef arch
export arch:=$(uname_m)
$(warning "Unknown arch: " $(arch))
-@@ -115,7 +124,7 @@
+@@ -112,7 +121,7 @@
ifeq ($(arch),ia64)
def_prefix = lin64ipf
endif
@@ -67,8 +64,8 @@ Index: tbb-4.2~20130725/build/linux.inc
ifeq ($(arch),armv7)
Index: tbb-4.2~20130725/build/linux.gcc.inc
===================================================================
---- tbb-4.2~20130725.orig/build/linux.gcc.inc 2013-09-18 10:30:03.423660043 +0200
-+++ tbb-4.2~20130725/build/linux.gcc.inc 2013-09-18 10:30:23.927659866 +0200
+--- tbb-4.2~20130725.orig/build/linux.gcc.inc 2013-10-08 09:54:04.000000000 +0200
++++ tbb-4.2~20130725/build/linux.gcc.inc 2013-10-08 09:54:14.000000000 +0200
@@ -104,13 +104,18 @@
LIB_LINK_FLAGS += -m32
endif
@@ -91,10 +88,24 @@ Index: tbb-4.2~20130725/build/linux.gcc.inc
endif
Index: tbb-4.2~20130725/build/FreeBSD.inc
===================================================================
---- tbb-4.2~20130725.orig/build/FreeBSD.inc 2013-09-18 10:30:03.367660045 +0200
-+++ tbb-4.2~20130725/build/FreeBSD.inc 2013-09-18 10:30:23.927659866 +0200
-@@ -34,6 +34,11 @@
- ifeq ($(shell uname -m),amd64)
+--- tbb-4.2~20130725.orig/build/FreeBSD.inc 2013-10-08 09:54:04.000000000 +0200
++++ tbb-4.2~20130725/build/FreeBSD.inc 2013-10-08 09:54:14.000000000 +0200
+@@ -25,15 +25,22 @@
+ # the GNU General Public License.
+
+ ifndef arch
+- ifeq ($(shell uname -m),i386)
++ uname_m:=$(shell uname -m)
++ uname_a:=$(shell uname -a)
++ ifeq ($(uname_m),i386)
+ export arch:=ia32
+ endif
+- ifeq ($(shell uname -m),ia64)
++ ifeq ($(uname_m),ia64)
+ export arch:=ia64
+ endif
+- ifeq ($(shell uname -m),amd64)
++ ifeq ($(uname_m),amd64)
export arch:=intel64
endif
+ ifndef arch
diff --git a/debian/rules b/debian/rules
index 7abcbfe..0e0296c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,5 +17,9 @@ debian/tbb.pc: debian/tbb.pc.in
build-arch: debian/tbb.pc
+# Makefiles should not be compressed (tbb-examples)
+override_dh_compress-indep:
+ dh_compress -X*/examples/*
+
get-orig-source:
uscan --verbose --force-download --rename
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
deleted file mode 100644
index 785457b..0000000
--- a/debian/source/include-binaries
+++ /dev/null
@@ -1,71 +0,0 @@
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/arena.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/cache_aligned_allocator.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/concurrent_hash_map.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/concurrent_monitor.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/concurrent_queue.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/concurrent_queue_v2.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/concurrent_vector.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/concurrent_vector_v2.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/condition_variable.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/critical_section.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/dynamic_link.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/governor.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/itt_notify.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/libtbb_debug.so.2
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/market.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/observer_proxy.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/pipeline.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/private_server.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/queuing_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/queuing_rw_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/reader_writer_lock.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/recursive_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/rml_tbb.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/scheduler.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/semaphore.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/spin_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/spin_rw_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/spin_rw_mutex_v2.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/task.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/task_group_context.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/task_v2.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/tbb_main.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/tbb_misc.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/tbb_misc_ex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/tbb_statistics.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/tbb_thread.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/arena.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/cache_aligned_allocator.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/concurrent_hash_map.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/concurrent_monitor.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/concurrent_queue.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/concurrent_queue_v2.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/concurrent_vector.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/concurrent_vector_v2.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/condition_variable.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/critical_section.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/dynamic_link.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/governor.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/itt_notify.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/market.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/observer_proxy.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/pipeline.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/private_server.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/queuing_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/queuing_rw_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/reader_writer_lock.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/recursive_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/rml_tbb.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/semaphore.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/spin_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/spin_rw_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/spin_rw_mutex_v2.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/task.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/task_group_context.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/task_v2.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/tbb_main.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/tbb_misc_ex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/tbb_statistics.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/tbb_thread.o
--
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