[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-47-gce70db6

[Radostan Riedel]

The following commit has been merged in the master branch:
commit 68317cd71e158e6d23a444ecb2423daef9744d51
Author: Radostan Riedel <raybuntu at googlemail.com>
Date:   Wed Jul 25 01:46:48 2012 +0200

    Add patch to append CPPFLAGS to CXXFLAGS

diff --git a/debian/patches/0014-Fix-to-append-CPPFLAGS-to-CXXFLAGS.patch b/debian/patches/0014-Fix-to-append-CPPFLAGS-to-CXXFLAGS.patch
new file mode 100644
index 0000000..05dd02b
--- /dev/null
+++ b/debian/patches/0014-Fix-to-append-CPPFLAGS-to-CXXFLAGS.patch
@@ -0,0 +1,22 @@
+From: Radostan Riedel <raybuntu at googlemail.com>
+Date: Wed, 25 Jul 2012 01:44:36 +0200
+Subject: Fix to append CPPFLAGS to CXXFLAGS.
+
+---
+ cctbx_sources/libtbx/SConscript |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/cctbx_sources/libtbx/SConscript b/cctbx_sources/libtbx/SConscript
+index 7c7471d..dcd888a 100644
+--- a/cctbx_sources/libtbx/SConscript
++++ b/cctbx_sources/libtbx/SConscript
+@@ -798,6 +798,8 @@ else:
+       env_etc.ccflags_base = flg
+     flg = opts.env_cppflags.split(" ")
+     env_etc.ccflags_base.extend(flg)
++    # Need to append CPPFLAGS to cxxflags_base too!
++    env_etc.cxxflags_base.extend(flg)
+ 
+ """ ************************ Custom Builders and Emitters ********************************* """
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 30dc218..397d2be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 0011-fix-missing-python-lib-during-linking.patch
 0012-fix-to-remove-cctbx.python-interpreter.patch
 0013-fix-to-support-LDFLAGS-in-use_enviroment_flags.patch
+0014-Fix-to-append-CPPFLAGS-to-CXXFLAGS.patch

-- 
Packaging for cctbx