[tbb] 03/64: Imported Debian patch 2.0r014-3

[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 863903b8a31ed8cdb9d5acaaf4a76647cfe10145
Author: Roberto C. Sanchez <roberto at connexer.com>
Date:   Thu Jan 3 15:21:50 2008 -0500

    Imported Debian patch 2.0r014-3
---
 debian/changelog                   |  8 ++++++++
 debian/control                     |  4 ++--
 debian/patches/00list              |  1 +
 debian/patches/03_ias_patch.dpatch | 20 ++++++++++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46c3749..c47a8fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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.
diff --git a/debian/control b/debian/control
index e9d670c..d9d7661 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Package: libtbb2-dbg
 Section: libdevel
 Architecture: i386 amd64 ia64
 Depends: libtbb2 (= ${binary:Version})
-Description: parallelism library for C++ - debugging sybmols
+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
@@ -47,7 +47,7 @@ Description: parallelism library for C++ - debugging sybmols
 Package: tbb-examples
 Section: doc
 Architecture: all
-Description: parallelism library for C++ - examples files
+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
diff --git a/debian/patches/00list b/debian/patches/00list
index 9f79922..7c53d5a 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
 01_add_soname.dpatch
 02_replace_arch_command.dpatch
+03_ias_patch.dpatch
diff --git a/debian/patches/03_ias_patch.dpatch b/debian/patches/03_ias_patch.dpatch
new file mode 100644
index 0000000..22d1566
--- /dev/null
+++ b/debian/patches/03_ias_patch.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_ias_patch.dpatch by  <roberto at connexer.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Switch from ias to as for Itanium build
+
+ at DPATCH@
+
+diff -uNr tbb20_014oss_src.orig/build/linux.gcc.inc tbb20_014oss_src/build/linux.gcc.inc
+--- tbb20_014oss_src.orig/build/linux.gcc.inc	2007-09-21 21:16:34.000000000 -0400
++++ tbb20_014oss_src/build/linux.gcc.inc	2008-01-03 15:17:09.000000000 -0500
+@@ -81,7 +81,7 @@
+ 
+ ASSEMBLY_SOURCE=$(arch)-gas
+ ifeq (itanium,$(arch))
+-    ASM=ias
++    ASM=as
+     TBB_ASM.OBJ = atomic_support.o lock_byte.o log2.o pause.o
+ endif 
+ #------------------------------------------------------------------------------

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