[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-14-g080d5e5

[Radostan Riedel]

The following commit has been merged in the master branch:
commit 080d5e5c9e3a454f21e086bd88f828c2dcb0d100
Author: Radostan Riedel <raybuntu at googlemail.com>
Date:   Tue Jul 10 17:11:31 2012 +0200

    Preparing package for dh_python2

diff --git a/debian/control b/debian/control
index 63c17c8..0c467e6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,20 @@ Source: cctbx
 Section: python
 Priority: extra
 Maintainer: Radostan Riedel <raybuntu at googlemail.com>
-Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3), python-support,
-               python (>= 2.3.5-11), libfftw3-dev, libcbf-dev,
-               libann-dev, libclipper-dev, libboost-python-dev, scons,
-               libboost-thread-dev, python-setuptools (>= 0.6b3-1~), libgl1-mesa-dev,
+X-Python-Version: >= 2.6
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.6.6-3),
+               libfftw3-dev, libcbf-dev, libann-dev, libclipper-dev,
+               libboost-python-dev, scons, libboost-thread-dev, 
+               python-setuptools (>= 0.6b3-1~), libgl1-mesa-dev,
                libglu1-mesa-dev, libtool, coreutils
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
 Homepage: http://cctbx.sourceforge.net/
 
-Package: cctbx-bundle
+Package: cctbx-bin
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, python-cctbx, 
-Description: CCTBX Project Bundle Package.
- Bundle Package of the CCTBX Project.
+Description: CCTBX Project dispatcher scripts.
+ Dispatcher scripts for CCTBX
 
 Package: python-cctbx
 Architecture: any
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index 57a7586..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.3-
diff --git a/debian/rules b/debian/rules
index f9b35b5..a7dbc5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,21 +62,7 @@ build-py%:
 	touch $@
 
 ### INSTALL ###
-install: build install.cctbx-bundle
-	touch $@
-install.cctbx-bundle:
-	dh_testdir
-	dh_testroot
-	dh_install --fail-missing --package=cctbx-bundle $(builddir)$(PYDEF)-omp/bin/* \
-		     usr/bin
-	dh_install --fail-missing --package=cctbx-bundle $(builddir)$(PYDEF)-omp/exe_dev/* \
-		     usr/bin
-	dh_install --fail-missing --package=cctbx-bundle $(builddir)$(PYDEF)-omp/include/* \
-		     usr/include
-	dh_install --fail-missing --package=cctbx-bundle $(srcdir)/lapack_fem \
-		     usr/share/cctbx
-	dh_install --fail-missing --package=cctbx-bundle $(srcdir)/gui_resources \
-		     usr/share/cctbx
+install: build
 	touch $@
 
 ## CLEAN ###
@@ -85,7 +71,6 @@ clean:
 	dh_testroot
 	rm -f install*
 	rm -rf build*
-	rm -rf pybuild
 	dh_clean
 
 # Build architecture-independent files here.
@@ -106,7 +91,6 @@ binary-arch: clean build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
-	dh_pysupport
 	dh_compress
 	dh_fixperms
 	dh_installdeb

-- 
Packaging for cctbx