[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-13-g0a5fb8d

[Radostan Riedel]

The following commit has been merged in the master branch:
commit 9a617b5ddd8c698ea13a1d903eec5f66eff16488
Author: Radostan Riedel <raybuntu at googlemail.com>
Date:   Mon Jul 9 23:18:39 2012 +0200

    Change build target and remove install target for python modules

diff --git a/debian/rules b/debian/rules
index 9c574c0..f9b35b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,31 +24,35 @@ builddir        = build
 BUILDDIR        = $(CURDIR)/$(builddir)
 
 ### BUILD ###
-build: build-py
-build-py: $(PYVERS:%=build-pyext-%-omp) $(PYVERS:%=build-pyext-%-bt)
+build: $(PYVERS:%=build-py%)
 	mkdir -p $(CURDIR)/debian/tmp
 	touch $@
-build-pyext-%-omp:
+build-py%:
 	mkdir -p $(BUILDDIR)$*
 	cd $(BUILDDIR)$*; python$* $(SRCDIR)/libtbx/configure.py \
-		crys3d omptbx scitbx spotfinder tntbx annlib_adaptbx boost_adaptbx \
-		ccp4io_adaptbx fable libtbx cctbx clipper_adaptbx fftw3tbx iotbx mmtbx rstbx \
-		smtbx tbxx gltbx --enable-openmp-if-possible=True --static-libraries
-	. $(BUILDDIR)$*/setpaths_debug.sh; cd $(BUILDDIR)$*; $(MAKE)
-	sed -e "s:$(BUILDDIR)$*/lib:/usr/lib/pyshared/python$*:g" \
-		-e "s:$(BUILDDIR)$*/exe:/usr/bin:g" \
-		-e "s:$(BUILDDIR)$*/include:/usr/include:g" \
-		-e "s:$(BUILDDIR)$*:/usr/share/cctbx:g" \
-		-e "s:$(SRCDIR):/usr/share/pyshared:g" \
-		-i $(BUILDDIR)$*/libtbx_env
-	touch $@
-build-pyext-%-bt:
-	mkdir -p $(BUILDDIR)$*
-	cd $(BUILDDIR)$*; python$* $(SRCDIR)/libtbx/configure.py \
-		crys3d omptbx scitbx spotfinder tntbx annlib_adaptbx boost_adaptbx \
-		ccp4io_adaptbx fable libtbx cctbx clipper_adaptbx fftw3tbx iotbx mmtbx rstbx \
-		smtbx tbxx gltbx --enable-boost-threads --static-libraries
-	. $(BUILDDIR)$*/setpaths_debug.sh; cd $(BUILDDIR)$*; $(MAKE)
+		--libtoolize \
+		--rpath "/usr/lib" \
+			annlib_adaptbx \
+			boost_adaptbx \
+			cbflib_adaptbx \
+			ccp4io_adaptbx \
+			cctbx chiltbx \
+			clipper_adaptbx \
+			crys3d fable \
+			fftw3tbx \
+			gltbx iotbx \
+			libtbx \
+			mmtbx \
+			omptbx \
+			rstbx \
+			scitbx \
+			smtbx \
+			spotfinder \
+			tbxx \
+			tntbx \
+			ucif \
+			wxtbx
+	cd $(BUILDDIR)$*;. $(BUILDDIR)$*/setpaths_debug.sh; $(MAKE)
 	sed -e "s:$(BUILDDIR)$*/lib:/usr/lib/pyshared/python$*:g" \
 		-e "s:$(BUILDDIR)$*/exe:/usr/bin:g" \
 		-e "s:$(BUILDDIR)$*/include:/usr/include:g" \
@@ -58,7 +62,7 @@ build-pyext-%-bt:
 	touch $@
 
 ### INSTALL ###
-install: build install.cctbx-bundle $(PYPACKVERS:%=install.python-%)
+install: build install.cctbx-bundle
 	touch $@
 install.cctbx-bundle:
 	dh_testdir
@@ -75,30 +79,6 @@ install.cctbx-bundle:
 		     usr/share/cctbx
 	touch $@
 
-install.python-%:
-	$(eval $@_DIR := $(shell echo $* | sed "s/\._.*//"))
-	$(eval $@_GLOB := $(shell echo $* | sed \
-		                                     -e "s/_adaptbx.*//" \
-		                                     -e "s/\._.*//" \
-		                                     -e "s/libtbx/std/"))
-	$(eval $@_VERS := $(shell echo $* | sed "s/.*\._//"| tr A-Z_ a-z-))
-	$(eval $@_PACK := python-$(shell echo $* | sed "s/\._.*//"| tr A-Z_ a-z-))
-	dh_testdir
-	dh_testroot
-	dh_install --fail-missing --package=$($@_PACK) $(pybuilddir)/$($@_DIR) \
-		     usr/lib/python$($@_VERS)/dist-packages/
-	case $($@_PACK) in python-crys3d|python-antlr3);;\
-		python-libtbx)\
-	    dh_install --fail-missing --package=$($@_PACK) $(builddir)$($@_VERS)/libtbx_env \
-	    	     usr/share/cctbx/python$($@_VERS)/ ;\
-	    dh_install --fail-missing --package=$($@_PACK) $(builddir)$($@_VERS)/lib/$($@_GLOB)*.so \
-	    	     usr/lib/python$($@_VERS)/dist-packages/ ;;\
-		*)\
-	    dh_install --fail-missing --package=$($@_PACK) $(builddir)$($@_VERS)/lib/$($@_GLOB)*.so \
-	    	     usr/lib/python$($@_VERS)/dist-packages/ ;;\
-	esac
-	touch $@
-
 ## CLEAN ###
 clean:
 	dh_testdir

-- 
Packaging for cctbx