[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-6-g9e9e30d

[Radostan Riedel]

The following commit has been merged in the master branch:
commit 9e9e30d719d07db5655c782f7f868796b07cf9ba
Author: Radostan Riedel <raybuntu at googlemail.com>
Date:   Mon Jul 9 11:29:51 2012 +0200

    Readding line which was deleted by mistake

diff --git a/debian/patches/0006-adding-shlib-versioning.patch b/debian/patches/0006-adding-shlib-versioning.patch
index dacff5c..5eb5d88 100644
--- a/debian/patches/0006-adding-shlib-versioning.patch
+++ b/debian/patches/0006-adding-shlib-versioning.patch
@@ -112,11 +112,10 @@ Subject: adding-shlib-versioning
          scan_boost,
          write_full_flex_fwd_h=default_write_full_flex_fwd_h,
          build_boost_python_extensions=default_build_boost_python_extensions,
-@@ -1783,7 +1787,12 @@
-       "debug", "debug_optimized", "profile"])
+@@ -1784,6 +1788,12 @@
      if (self.static_exe):
        self.static_libraries = True
--    if (self.msvc_arch_flag == "None"): self.msvc_arch_flag = None
+     if (self.msvc_arch_flag == "None"): self.msvc_arch_flag = None
 +    if self.rpath != '/usr/lib':
 +      if (not op.isabs(self.rpath)):
 +        raise RuntimeError("Not an absolute path name:"
@@ -126,7 +125,7 @@ Subject: adding-shlib-versioning
  
    def get_flags_from_environment(self):
      if (self.use_environment_flags ):
-@@ -1822,6 +1831,7 @@
+@@ -1822,6 +1832,7 @@
      print >> f, "Boost threads enabled:", self.enable_boost_threads
      print >> f, "Enable OpenMP if possible:", self.enable_openmp_if_possible
      print >> f, "Enable CUDA:", self.enable_cuda
@@ -134,7 +133,7 @@ Subject: adding-shlib-versioning
      print >> f, "Use opt_resources if available:", self.opt_resources
      print >> f, "Use environment flags:", self.use_environment_flags
      if( self.use_environment_flags ):
-@@ -1940,6 +1950,16 @@
+@@ -1940,6 +1951,16 @@
          action="store_true",
          default=False,
          help="link all executables statically (implies --static_libraries)")

-- 
Packaging for cctbx