[med-svn] r1954 - trunk/packages/pdb2pqr/trunk/debian

[hauro-guest at alioth.debian.org]

Author: hauro-guest
Date: 2008-06-01 20:44:16 +0000 (Sun, 01 Jun 2008)
New Revision: 1954

Added:
   trunk/packages/pdb2pqr/trunk/debian/pdb2pqr.install
   trunk/packages/pdb2pqr/trunk/debian/pdb2pqr.links
Modified:
   trunk/packages/pdb2pqr/trunk/debian/pdb2pqr.dirs
   trunk/packages/pdb2pqr/trunk/debian/rules
Log:
pdb2pqr: Reworked debian/rules, re-enabled build of pdb2pka

I added a .install and a .links file to install the files. This makes
debian/rules more readable.


Modified: trunk/packages/pdb2pqr/trunk/debian/pdb2pqr.dirs
===================================================================
--- trunk/packages/pdb2pqr/trunk/debian/pdb2pqr.dirs	2008-06-01 20:41:39 UTC (rev 1953)
+++ trunk/packages/pdb2pqr/trunk/debian/pdb2pqr.dirs	2008-06-01 20:44:16 UTC (rev 1954)
@@ -1,5 +1,9 @@
 /usr/bin
+/usr/lib/pdb2pqr/pdb2pka/substruct
 /usr/lib/pdb2pqr/propka
 /usr/share/doc/pdb2pqr
-/usr/share/pdb2pqr
-/usr/share/pdb2pqr/propka
+/usr/share/pdb2pqr/dat
+/usr/share/pdb2pqr/extensions
+/usr/share/pdb2pqr/pdb2pka/ligandclean
+/usr/share/pdb2pqr/pdb2pka/substruct
+/usr/share/pdb2pqr/src

Added: trunk/packages/pdb2pqr/trunk/debian/pdb2pqr.install
===================================================================
--- trunk/packages/pdb2pqr/trunk/debian/pdb2pqr.install	                        (rev 0)
+++ trunk/packages/pdb2pqr/trunk/debian/pdb2pqr.install	2008-06-01 20:44:16 UTC (rev 1954)
@@ -0,0 +1,12 @@
+pdb2pqr.py			usr/share/pdb2pqr/
+dat/*				usr/share/pdb2pqr/dat/
+extensions/*			usr/share/pdb2pqr/extensions/
+src/*				usr/share/pdb2pqr/src/
+pdb2pka/*.py			usr/share/pdb2pqr/pdb2pka
+pdb2pka/ligandclean/*.py	usr/share/pdb2pqr/pdb2pka/ligandclean
+pdb2pka/substruct/*.py		usr/share/pdb2pqr/pdb2pka/substruct
+propka/*.py			usr/share/pdb2pqr/propka
+propka/propka			usr/bin
+pdb2pka/_pMC_mult.so		usr/lib/pdb2pqr/pdb2pka
+pdb2pka/substruct/Algorithms.so	usr/lib/pdb2pqr/pdb2pka/substruct
+propka/_propkalib.so		usr/lib/pdb2pqr/propka

Added: trunk/packages/pdb2pqr/trunk/debian/pdb2pqr.links
===================================================================
--- trunk/packages/pdb2pqr/trunk/debian/pdb2pqr.links	                        (rev 0)
+++ trunk/packages/pdb2pqr/trunk/debian/pdb2pqr.links	2008-06-01 20:44:16 UTC (rev 1954)
@@ -0,0 +1,3 @@
+usr/lib/pdb2pqr/pdb2pka/_pMC_mult.so		usr/share/pdb2pqr/pdb2pka/_pMC_mult.so
+usr/lib/pdb2pqr/pdb2pka/substruct/Algorithms.so	usr/share/pdb2pqr/pdb2pka/substruct/Algorithms.so
+usr/lib/pdb2pqr/propka/_propkalib.so		usr/share/pdb2pqr/propka/_propkalib.so

Modified: trunk/packages/pdb2pqr/trunk/debian/rules
===================================================================
--- trunk/packages/pdb2pqr/trunk/debian/rules	2008-06-01 20:41:39 UTC (rev 1953)
+++ trunk/packages/pdb2pqr/trunk/debian/rules	2008-06-01 20:44:16 UTC (rev 1954)
@@ -4,38 +4,26 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
+# Enable checks
+DEB_MAKE_CHECK_TARGET = test adv-test
+
 # Do not execute "install" target. We'll take care of that since
 # upstream's build system installs *everything* to $prefix (if set)
 DEB_MAKE_INSTALL_TARGET = 
 
-# pdb2pka made a little trouble, disabling for now
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-pdb2pka
-
-# Enable checks for pdb2pqr
-DEB_MAKE_CHECK_TARGET = test
-# Enable checks for propka and pdb2pka
-#DEB_MAKE_CHECK_TARGET += adv-test
-
 # Updating all config.{guess,sub} files because upstream ships old versions.
 # If that is resolved, we can drop the Depends: on autotools-dev again.
 DEB_AC_AUX_DIR += $(DEB_SRCDIR)/propka
 
 binary-install/pdb2pqr::
-# Install PDB2PQR files
-	cp -r pdb2pqr.py src dat extensions $(CURDIR)/debian/pdb2pqr/usr/share/pdb2pqr/
 # Add a shebang to psize.py
 	sed -i -e '1i\#!/usr/bin/python' $(CURDIR)/debian/pdb2pqr/usr/share/pdb2pqr/src/psize.py
-# Install "binaries"
+# Install script wrappers
 	for app in /usr/share/pdb2pqr/pdb2pqr.py /usr/share/pdb2pqr/src/psize.py; do \
 		sed -e "s, at SCRIPT@,$${app}," debian/wrapper.sh \
 			>$(CURDIR)/debian/pdb2pqr/usr/bin/$$(basename $${app} .py) && \
 		chmod 0755 $(CURDIR)/debian/pdb2pqr/usr/bin/$$(basename $${app} .py); \
 	done
-# Install propka
-	for file in __init__.py propkalib.py _propkalib.so; do \
-		cp propka/$${file} $(CURDIR)/debian/pdb2pqr/usr/share/pdb2pqr/propka/ ; \
-	done
-	cp propka/propka $(CURDIR)/debian/pdb2pqr/usr/bin/
 
 binary-strip/pdb2pqr::
 	DH_PYCENTRAL=nomove dh_pycentral -ppdb2pqr