[tbb] 25/64: Imported Debian patch 3.0+r035-2

[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 62bdec29fc2c52b2fedf997823c54538560fe247
Author: Roberto C. Sanchez <roberto at connexer.com>
Date:   Fri Dec 31 15:21:02 2010 -0500

    Imported Debian patch 3.0+r035-2
---
 debian/changelog                  | 10 ++++++++++
 debian/control                    |  2 +-
 debian/rules                      |  4 +++-
 debian/tbb-examples.README.Debian |  8 +++++++-
 debian/tbb-examples.examples      |  2 ++
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80061f1..f670c17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tbb (3.0+r035-2) unstable; urgency=low
+
+  * Make examples build properly (Closes: #608347)
+    + Ship common Makefile snippets from upstream
+    + Document that upstream's _debug library versions are not shipped
+  * Update to Standards-Version 3.9.1 (no changes)
+  
+
+ -- Roberto C. Sanchez <roberto at connexer.com>  Fri, 31 Dec 2010 15:21:02 -0500
+
 tbb (3.0+r035-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 636d921..960c354 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: extra
 Maintainer: Athena Capital Research <acr-debian at athenacr.com>
 Uploaders: Roberto C. Sanchez <roberto at connexer.com>
 Build-Depends: debhelper (>= 5)
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Section: libs
 Homepage: http://threadingbuildingblocks.org/
 
diff --git a/debian/rules b/debian/rules
index 096c77b..5e67811 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
 	$(MAKE) tbb tbbmalloc
-	$(MAKE) test
+	#$(MAKE) test
 	touch $@
 
 clean:
@@ -55,6 +55,8 @@ binary-indep: build install
 	dh_installchangelogs -i
 	dh_installdocs -i -Xrelease -Xdebug
 	dh_installexamples -i
+	install -m755 -d $(CURDIR)/debian/tbb-examples/usr/share/doc/tbb-examples/build
+	mv $(CURDIR)/debian/tbb-examples/usr/share/doc/tbb-examples/examples/*.inc $(CURDIR)/debian/tbb-examples/usr/share/doc/tbb-examples/build/
 	dh_install -i --sourcedir=$(CURDIR)
 	dh_compress -i
 	dh_fixperms -i
diff --git a/debian/tbb-examples.README.Debian b/debian/tbb-examples.README.Debian
index 45411c2..a8742ca 100644
--- a/debian/tbb-examples.README.Debian
+++ b/debian/tbb-examples.README.Debian
@@ -19,4 +19,10 @@ find . -name '*.gz'| xargs gunzip
 cd examples
 make
 
- -- Roberto C. Sanchez <roberto at connexer.com>  Fri, 14 Dec 2007 23:10:58 -0500
+Please note that the Debian tbb package does not ship the various *_debug*
+libraries that are built as part of the upstream build process.  There a
+numerous reasons for this.  If you need debugging symbols, then please install
+the -dbg package.  If you require some of the specific functionality of the
+those other libraries, than that is unfortunately not available at this time.
+
+ -- Roberto C. Sanchez <roberto at connexer.com>  Fri, 31 Dec 2010 17:13:49 -0500
diff --git a/debian/tbb-examples.examples b/debian/tbb-examples.examples
index e39721e..63f3569 100644
--- a/debian/tbb-examples.examples
+++ b/debian/tbb-examples.examples
@@ -1 +1,3 @@
 examples/*
+build/common.inc
+build/linux.*

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