[med-svn] r12044 - trunk/packages/rcsb-core-wrapper/trunk/debian

[Laszlo Kajan]

Author: lkajan-guest
Date: 2012-08-14 12:32:55 +0000 (Tue, 14 Aug 2012)
New Revision: 12044

Added:
   trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper-doc.docs
   trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper0-dev.install
   trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper0.install
Removed:
   trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab-doc.docs
   trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab3-dev.install
   trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab3.install
Modified:
   trunk/packages/rcsb-core-wrapper/trunk/debian/control
   trunk/packages/rcsb-core-wrapper/trunk/debian/rules
Log:
added dh_install files

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/control
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/control	2012-08-14 11:45:13 UTC (rev 12043)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/control	2012-08-14 12:32:55 UTC (rev 12044)
@@ -4,7 +4,8 @@
 Uploaders:
  Laszlo Kajan <lkajan at rostlab.org>
 Build-Depends: debhelper (>= 7.0.50~), doxygen, graphviz, libboost-python-dev, libxerces-c-dev,
- python-all-dev
+ python-all-dev,
+ libtool, bison, flex
 Standards-Version: 3.9.3
 Section: libs
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/rcsb-core-wrapper/trunk

Added: trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper-doc.docs
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper-doc.docs	                        (rev 0)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper-doc.docs	2012-08-14 12:32:55 UTC (rev 12044)
@@ -0,0 +1 @@
+doxygen-doc/html/

Added: trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper0-dev.install
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper0-dev.install	                        (rev 0)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper0-dev.install	2012-08-14 12:32:55 UTC (rev 12044)
@@ -0,0 +1,3 @@
+include/*.h       usr/include/rcsb
+lib/.libs/lib*.a  usr/lib
+lib/.libs/lib*.so usr/lib

Added: trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper0.install
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper0.install	                        (rev 0)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper0.install	2012-08-14 12:32:55 UTC (rev 12044)
@@ -0,0 +1 @@
+lib/.libs/lib*.so.* usr/lib

Deleted: trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab-doc.docs
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab-doc.docs	2012-08-14 11:45:13 UTC (rev 12043)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab-doc.docs	2012-08-14 12:32:55 UTC (rev 12044)
@@ -1,2 +0,0 @@
-doxygen-doc/html/
-lib/librostlab.tag

Deleted: trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab3-dev.install
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab3-dev.install	2012-08-14 11:45:13 UTC (rev 12043)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab3-dev.install	2012-08-14 12:32:55 UTC (rev 12044)
@@ -1,4 +0,0 @@
-usr/include/*
-usr/lib/librcsb-core-wrapper.a
-usr/lib/librcsb-core-wrapper.la
-usr/lib/librcsb-core-wrapper.so

Deleted: trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab3.install
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab3.install	2012-08-14 11:45:13 UTC (rev 12043)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab3.install	2012-08-14 12:32:55 UTC (rev 12044)
@@ -1 +0,0 @@
-usr/lib/librcsb-core-wrapper.so.*

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/rules
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/rules	2012-08-14 11:45:13 UTC (rev 12043)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/rules	2012-08-14 12:32:55 UTC (rev 12044)
@@ -18,35 +18,36 @@
 	dh $@ --parallel --with python-support
 
 .PHONY: override_dh_auto_build
-override_dh_auto_build: override_dh_auto_build-nopy override_dh_auto_build-py
+override_dh_auto_build: override_dh_auto_build-nopy $(ALLPY:%=override_dh_auto_build-%)
 
 .PHONY: override_dh_auto_build-nopy
 override_dh_auto_build-nopy:
 	dh_auto_build --parallel
+	# TODO: docs $(MAKE) doc
 
-.PHONY: override_dh_auto_build-py
-override_dh_auto_build-py: override_dh_auto_build-nopy
-	dh_auto_build --parallel --sourcedirectory=wrapper/python
+# lkajan: the below is nice, but it does not parallelize at all, I prefer override_dh_auto_build-%.
+#.PHONY: override_dh_auto_build-py
+#override_dh_auto_build-py: override_dh_auto_build-nopy
+#	dh_auto_build --parallel --sourcedirectory=wrapper/python
 
+override_dh_auto_build-%: override_dh_auto_build-nopy
+	cd wrapper/python && python$* setup.py build --force
+
 .PHONY: override_dh_auto_install
-override_dh_auto_install: override_dh_auto_install-nopy override_dh_auto_install-py
+override_dh_auto_install: override_dh_auto_install-nopy override_dh_auto_install-%
 
 .PHONY: override_dh_auto_install-nopy
-# lkajan: TODO, use dh_install
 override_dh_auto_install-nopy:
+	# lkajan: there is no real install mechanism in the upstream sources
 
 .PHONY: override_dh_auto_install-py
 override_dh_auto_install-py:
-	dh_auto_install --sourcedirectory=wrapper/python
+	dh_auto_install --with python-support --sourcedirectory=wrapper/python 
 
 .PHONY: override_dh_strip
 override_dh_strip:
 	dh_strip --dbg-package=librcsb-core-wrapper0-dbg
 
-.PHONY: override_dh_compress
-override_dh_compress:
-	dh_compress -Xlibrcsb-core-wrapper.tag
-
 .PHONY: override_dh_makeshlibs
 override_dh_makeshlibs:
 	dh_makeshlibs -V