[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-50-g176559c

[Radostan Riedel]

The following commit has been merged in the master branch:
commit 00e7c6498c860218765a5a3891f78b3c08aa34a2
Author: Radostan Riedel <raybuntu at googlemail.com>
Date:   Wed Jul 25 17:16:00 2012 +0200

    Fix tntbx extensions beeing overlooked by setup.py

diff --git a/debian/patches/0010-adding-setup_py.patch b/debian/patches/0010-adding-setup_py.patch
index 6f907fc..4a271a5 100644
--- a/debian/patches/0010-adding-setup_py.patch
+++ b/debian/patches/0010-adding-setup_py.patch
@@ -5,8 +5,8 @@ Subject: adding-setup_py
 ---
  cctbx_sources/stdlib.py |    4 ++
  sconsutils.py           |  155 +++++++++++++++++++++++++++++++++++++++++++++++
- setup.py                |  123 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 282 insertions(+)
+ setup.py                |  129 +++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 288 insertions(+)
  create mode 100755 cctbx_sources/stdlib.py
  create mode 100644 sconsutils.py
  create mode 100755 setup.py
@@ -184,10 +184,10 @@ index 0000000..07d393d
 +    return out, list(outext)
 diff --git a/setup.py b/setup.py
 new file mode 100755
-index 0000000..fd5cd34
+index 0000000..c298997
 --- /dev/null
 +++ b/setup.py
-@@ -0,0 +1,123 @@
+@@ -0,0 +1,129 @@
 +from distutils.core import setup, Extension
 +import sys, os, shutil
 +
@@ -284,8 +284,14 @@ index 0000000..fd5cd34
 +          }
 +
 +MODS = ['stdlib']
-+PACKS, EXT_MODULES = find_packages_and_extensions(SRCDIR)
-+PACKS.extend(['boost','clipper','optik','tntbx'])
++PACKS = []
++EXT_MODULES = []
++for key, value in PACKDIR.items():
++    p, e = find_packages_and_extensions(value)
++    PACKS.extend(p)
++    EXT_MODULES.extend(e)
++    if key != '':
++        PACKS.append(key)
 +
 +# TODO: This should also work with Mac OSX and Windows without hard coding the
 +# file ext.

-- 
Packaging for cctbx