[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-42-gf1ef826

[Radostan Riedel]

The following commit has been merged in the master branch:
commit 0b3709f0080cf6a6febc54c6f3352ecaadaf95ab
Author: Radostan Riedel <raybuntu at googlemail.com>
Date:   Mon Jul 23 23:49:27 2012 +0200

    Fix to use systems libgl2ps

diff --git a/debian/control b/debian/control
index 7b6d613..03806c4 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 7),
                python-all-dev,
                libfftw3-dev,
                libcbf-dev,
+               libgl2ps-dev,
                libann-dev,
                libclipper-dev,
                libboost-python-dev(>= 1.49),
diff --git a/debian/patches/0006-options-for-system-libs-installtarget-and-prefix.patch b/debian/patches/0006-options-for-system-libs-installtarget-and-prefix.patch
index ec2152d..363c987 100644
--- a/debian/patches/0006-options-for-system-libs-installtarget-and-prefix.patch
+++ b/debian/patches/0006-options-for-system-libs-installtarget-and-prefix.patch
@@ -7,7 +7,7 @@ Subject: options for system libs installtarget and prefix
  cctbx_sources/cctbx/SConscript                     |    2 +-
  cctbx_sources/clipper_adaptbx/SConscript           |   86 +++++++++++---------
  cctbx_sources/clipper_adaptbx/clipper/SConscript   |    2 +-
- cctbx_sources/gltbx/SConscript                     |    2 +-
+ cctbx_sources/gltbx/SConscript                     |   20 +++--
  cctbx_sources/iotbx/mtz/SConscript                 |    3 +-
  cctbx_sources/iotbx/pdb/SConscript                 |    2 +-
  cctbx_sources/libtbx/SConscript                    |   79 +++++++++++++++++-
@@ -21,7 +21,7 @@ Subject: options for system libs installtarget and prefix
  .../smtbx/refinement/boost_python/SConscript       |    4 +-
  .../refinement/constraints/boost_python/SConscript |    4 +-
  cctbx_sources/spotfinder/SConscript                |    2 +-
- 18 files changed, 181 insertions(+), 66 deletions(-)
+ 18 files changed, 193 insertions(+), 72 deletions(-)
 
 diff --git a/cctbx_sources/boost_adaptbx/SConscript b/cctbx_sources/boost_adaptbx/SConscript
 index 866b1c1..ed21fb4 100644
@@ -220,10 +220,20 @@ index 9f79f83..37280af 100644
    target="#lib/clipper_ext",
    source=[
 diff --git a/cctbx_sources/gltbx/SConscript b/cctbx_sources/gltbx/SConscript
-index 4b2213d..6d0e272 100644
+index 4b2213d..04e0654 100644
 --- a/cctbx_sources/gltbx/SConscript
 +++ b/cctbx_sources/gltbx/SConscript
-@@ -19,7 +19,7 @@ if (not env_etc.no_boost_python):
+@@ -12,14 +12,15 @@ env_etc.gltbx_common_includes = [
+   env_etc.scitbx_include,
+   env_etc.boost_include,
+ ]
+-if (gl2ps_path is not None):
+-  env_etc.gltbx_common_includes.append(gl2ps_path)
++if not env_etc.check_syslib('gl2ps', extra_libs='GL'):
++  if (gl2ps_path is not None):
++    env_etc.gltbx_common_includes.append(gl2ps_path)
+ 
+ if (not env_etc.no_boost_python):
    Import("env_base", "env_no_includes_boost_python_ext")
    trial_env = env_base.Clone()
    env = env_no_includes_boost_python_ext.Clone()
@@ -232,6 +242,26 @@ index 4b2213d..6d0e272 100644
    if (env_etc.compiler == "win32_cl"):
      for e in [trial_env, env]:
        e.Append(LIBS=["glu32", "opengl32"])
+@@ -79,10 +80,15 @@ if (not env_etc.no_boost_python):
+         source=source)
+     env_util = env
+     source = ["util_ext.cpp"]
+-    if (gl2ps_path is not None):
+-      source.append("#gui_resources/gl2ps/gl2ps.c")
+-      env_util = env.Clone()
+-      env_util.Append(SHCXXFLAGS=["-DGLTBX_HAVE_GL2PS"])
++    if not env_etc.check_syslib('gl2ps', extra_libs='GL'):
++      if (gl2ps_path is not None):
++        source.append("#gui_resources/gl2ps/gl2ps.c")
++        env_util = env.Clone()
++        env_util.Append(SHCXXFLAGS=["-DGLTBX_HAVE_GL2PS"])
++    else:
++        env_util = env.Clone()
++        env_util.Append(SHCXXFLAGS=["-DGLTBX_HAVE_GL2PS"])
++        env_util.Append(LIBS=["gl2ps"])
+     env_util.SharedLibrary(
+       target="#lib/gltbx_util_ext",
+       source=source)
 diff --git a/cctbx_sources/iotbx/mtz/SConscript b/cctbx_sources/iotbx/mtz/SConscript
 index c0a4bb0..cd539e6 100644
 --- a/cctbx_sources/iotbx/mtz/SConscript

-- 
Packaging for cctbx