[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-66-gdf51a04

[Radostan Riedel]

The following commit has been merged in the master branch:
commit df51a044b560e3cfbd019c723a1d404b0fe722bb
Author: Radostan Riedel <raybuntu at googlemail.com>
Date:   Sun Aug 5 00:01:56 2012 +0200

    Fix in sconsutils.py

diff --git a/debian/patches/0010-adding-setup_py.patch b/debian/patches/0010-adding-setup_py.patch
index a77e4b7..35d610b 100644
--- a/debian/patches/0010-adding-setup_py.patch
+++ b/debian/patches/0010-adding-setup_py.patch
@@ -4,9 +4,9 @@ Subject: adding-setup_py
 
 ---
  cctbx_sources/stdlib.py |    4 +
- sconsutils.py           |  408 +++++++++++++++++++++++++++++++++++++++++++++++
- setup.py                |  133 +++++++++++++++
- 3 files changed, 545 insertions(+)
+ sconsutils.py           |  409 +++++++++++++++++++++++++++++++++++++++++++++++
+ setup.py                |  135 ++++++++++++++++
+ 3 files changed, 548 insertions(+)
  create mode 100755 cctbx_sources/stdlib.py
  create mode 100644 sconsutils.py
  create mode 100755 setup.py
@@ -23,10 +23,10 @@ index 0000000..759f689
 +random = stdlib_import("random")
 diff --git a/sconsutils.py b/sconsutils.py
 new file mode 100644
-index 0000000..0b82bdd
+index 0000000..d118004
 --- /dev/null
 +++ b/sconsutils.py
-@@ -0,0 +1,408 @@
+@@ -0,0 +1,409 @@
 +from distutils.sysconfig import get_python_lib, get_config_var
 +from distutils.command.build_ext import build_ext as _build_ext
 +from distutils.command.build_py import build_py as _build_py
@@ -302,6 +302,7 @@ index 0000000..0b82bdd
 +
 +    def install_libtbx_env(self, libtbx_env_path):
 +        """ Modify libtbx_env pickle object to set the correct paths. """
++        print libtbx_env_path
 +        builddir = opj(os.path.abspath(self.build_temp), 'cctbx-build')
 +        os.environ["LIBTBX_BUILD"] = builddir
 +        env = libtbx.env_config.unpickle()
@@ -336,14 +337,14 @@ index 0000000..0b82bdd
 +                    paths.append(None)
 +            module.dist_paths = paths
 +        _dispatcher_registry={}
-+        for key, value in libtbx.env._dispatcher_registry.items():
-+            new_key = relocatable_path(anchor=build_path, 
++        for key, value in env._dispatcher_registry.items():
++            new_key = relocatable_path(anchor=build_path,
 +                                       relocatable=key.relocatable)
 +            rel = os.path.relpath(abs(value), SRCDIR)
-+            new_val = relocatable_path(anchor=absolute_path(rel_path), 
++            new_val = relocatable_path(anchor=absolute_path(rel_path),
 +                                       relocatable=rel)
 +            _dispatcher_registry[new_key] = new_val
-+        libtbx.env._dispatcher_registry = _dispatcher_registry
++        env._dispatcher_registry = _dispatcher_registry
 +        # install the environment file in the data dir
 +        file_obj = open(libtbx_env_path, 'wb')
 +        pickle.dump(env, file_obj, 0)
@@ -437,10 +438,10 @@ index 0000000..0b82bdd
 +    return out, list(outext)
 diff --git a/setup.py b/setup.py
 new file mode 100755
-index 0000000..08f7a31
+index 0000000..78918e1
 --- /dev/null
 +++ b/setup.py
-@@ -0,0 +1,133 @@
+@@ -0,0 +1,135 @@
 +from distutils.core import setup, Extension
 +from distutils.util import convert_path
 +import sys, os, shutil
@@ -476,6 +477,8 @@ index 0000000..08f7a31
 +
 +# Debian Multiarch magic
 +multiarch = os.environ.get('DEB_HOST_MULTIARCH')
++if multiarch == None:
++    multiarch = ''
 +# Configure settings
 +# We need this directory to get env_config.cold_start to run!
 +# trailing slash is important

-- 
Packaging for cctbx