[med-svn] r18085 - in trunk/packages/phylip/trunk/debian: . bin

[Andreas Tille]

Author: tille
Date: 2014-09-22 12:09:01 +0000 (Mon, 22 Sep 2014)
New Revision: 18085

Added:
   trunk/packages/phylip/trunk/debian/bin/drawgram
   trunk/packages/phylip/trunk/debian/bin/drawtree
   trunk/packages/phylip/trunk/debian/phylip.jlibs
Removed:
   trunk/packages/phylip/trunk/debian/jlibs
Modified:
   trunk/packages/phylip/trunk/debian/control
   trunk/packages/phylip/trunk/debian/phylip.install
   trunk/packages/phylip/trunk/debian/rules
Log:
Make sure Jave utilities will be placed properly


Added: trunk/packages/phylip/trunk/debian/bin/drawgram
===================================================================
--- trunk/packages/phylip/trunk/debian/bin/drawgram	                        (rev 0)
+++ trunk/packages/phylip/trunk/debian/bin/drawgram	2014-09-22 12:09:01 UTC (rev 18085)
@@ -0,0 +1,3 @@
+#!/bin/sh
+export PATH=/usr/lib/phylip/bin:$PATH
+java -cp drawtree.jar  drawgram.DrawgramUserInterface

Added: trunk/packages/phylip/trunk/debian/bin/drawtree
===================================================================
--- trunk/packages/phylip/trunk/debian/bin/drawtree	                        (rev 0)
+++ trunk/packages/phylip/trunk/debian/bin/drawtree	2014-09-22 12:09:01 UTC (rev 18085)
@@ -0,0 +1,3 @@
+#!/bin/sh
+export PATH=/usr/lib/phylip/bin:$PATH
+java -cp drawtree.jar drawtree.DrawtreeUserInterface

Modified: trunk/packages/phylip/trunk/debian/control
===================================================================
--- trunk/packages/phylip/trunk/debian/control	2014-09-22 10:08:38 UTC (rev 18084)
+++ trunk/packages/phylip/trunk/debian/control	2014-09-22 12:09:01 UTC (rev 18085)
@@ -10,7 +10,8 @@
                libxaw7-dev,
                ant,
                default-jdk,
-               libjna-java
+               libjna-java,
+               javahelper
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/phylip/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/phylip/trunk/

Deleted: trunk/packages/phylip/trunk/debian/jlibs
===================================================================
--- trunk/packages/phylip/trunk/debian/jlibs	2014-09-22 10:08:38 UTC (rev 18084)
+++ trunk/packages/phylip/trunk/debian/jlibs	2014-09-22 12:09:01 UTC (rev 18085)
@@ -1 +0,0 @@
-dist/*.jar

Modified: trunk/packages/phylip/trunk/debian/phylip.install
===================================================================
--- trunk/packages/phylip/trunk/debian/phylip.install	2014-09-22 10:08:38 UTC (rev 18084)
+++ trunk/packages/phylip/trunk/debian/phylip.install	2014-09-22 12:09:01 UTC (rev 18085)
@@ -1,4 +1,4 @@
-exe/[a-su-z]*		usr/lib/phylip/bin
+exe/[a-km-su-z]*	usr/lib/phylip/bin
 exe/t[a-df-z]*		usr/lib/phylip/bin
 fonts/*			usr/share/phylip
-debian/bin/phylip	usr/bin
+debian/bin/*		usr/bin

Copied: trunk/packages/phylip/trunk/debian/phylip.jlibs (from rev 18084, trunk/packages/phylip/trunk/debian/jlibs)
===================================================================
--- trunk/packages/phylip/trunk/debian/phylip.jlibs	                        (rev 0)
+++ trunk/packages/phylip/trunk/debian/phylip.jlibs	2014-09-22 12:09:01 UTC (rev 18085)
@@ -0,0 +1 @@
+dist/*.jar

Modified: trunk/packages/phylip/trunk/debian/rules
===================================================================
--- trunk/packages/phylip/trunk/debian/rules	2014-09-22 10:08:38 UTC (rev 18084)
+++ trunk/packages/phylip/trunk/debian/rules	2014-09-22 12:09:01 UTC (rev 18085)
@@ -2,10 +2,14 @@
 # debian/rules for phylip using dh
 # Andreas Tille <tille at debian.org>, GPL
 
+DEBPKGNAME		:= $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
+DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIBDIR			:= $(CURDIR)/debian/$(DEBPKGNAME)/usr/lib/$(DEB_HOST_MULTIARCH)
+
 export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
-	dh $@
+	dh $@ --with javahelper
 
 override_dh_auto_build:
 	dh_auto_build --sourcedirectory=src --buildsystem=makefile -- -f Makefile.unx all
@@ -14,6 +18,8 @@
 
 override_dh_auto_install:
 	dh_auto_install --sourcedirectory=src --buildsystem=makefile -- -f Makefile.unx install DATADIR=../fonts
+	mkdir -p $(LIBDIR)
+	cp -a exe/lib*.so $(LIBDIR)
 
 override_dh_installexamples:
 	dh_installexamples