[med-svn] r11059 - trunk/packages/strap-base/trunk/debian

[Christoph Gille]

Author: christophgil-guest
Date: 2012-05-28 21:19:21 +0000 (Mon, 28 May 2012)
New Revision: 11059

Added:
   trunk/packages/strap-base/trunk/debian/strap-base.install
Removed:
   trunk/packages/strap-base/trunk/debian/strap.install
Modified:
   trunk/packages/strap-base/trunk/debian/rules
Log:


Modified: trunk/packages/strap-base/trunk/debian/rules
===================================================================
--- trunk/packages/strap-base/trunk/debian/rules	2012-05-28 21:13:54 UTC (rev 11058)
+++ trunk/packages/strap-base/trunk/debian/rules	2012-05-28 21:19:21 UTC (rev 11059)
@@ -8,8 +8,8 @@
 %:
 	dh $@
 
+#SRC_TMP  := $(shell mktemp --tmpdir --directory strap-base-build.XXXXXXXXXX)
 SRC_TMP := $(HOME)/tmp/build_strap-base
-# CP := $(shell echo /usr/share/java{javatar,activation,commons-codec,commons-httpclient,commons-logging,httpclient,httpclient,httpcore,httpmime.jar} | sed 's| |.jar:|g):.:$(SRC_TMP)/compilationDependencies.jar
 usj := /usr/share/java/
 CP=.:$(SRC_TMP)/compilationDependencies.jar:$(usj)javatar.jar:$(usj)activation.jar:$(usj)commons-codec.jar:$(usj)commons-httpclient.jar:$(usj)commons-logging.jar:$(usj)httpclient.jar:$(usj)httpclient.jar:$(usj)httpcore.jar:$(usj)httpmime.jar
 
@@ -22,22 +22,17 @@
 
 override_dh_auto_build:
 	dh_auto_build
-	# echo ooooooooooooooooooooooooooooooooooooooooooooooo $(STRAPSRC)
-	ls $(STRAPSRC)
 	echo A little native program to handle windows under X11. Supports always-on-top, iconization, to-front etc.
 	cd $(STRAPSRC)/charite/christo/files/src/ && unzip -o nativeTools_unix2.zip && cc -lm -lX11 -o nativeTools_unix2.exe nativeTools_unix2.c
 	cd $(STRAPSRC) && find . -name "*.java" | tr ' ' '\n' | grep -v '$(SKIP)' > ../javaFiles.txt
 	cd $(STRAPSRC) && javac -cp $(CP)  @../javaFiles.txt
 	cd $(STRAPSRC) && echo "Main-Class: charite.christo.strap.Strap"> Manifest
-	cd $(STRAPSRC) && jar -cmf Manifest strap-$(VERSION).jar charite
+	jar -cmf $(STRAPSRC)/Manifest strap-protein-alignment-$(VERSION).jar  -C $(STRAPSRC) charite
 
 override_dh_clean:
 	dh_clean
 
-#SRC_TMP  := $(shell mktemp --tmpdir --directory strap-base-build.XXXXXXXXXX)
-# For testing I rather use the following
 
-
 ORIG_JAR := $(SRC_TMP)/strap-base_$(VERSION).jar
 TARBALLS := $(CURDIR)/../tarballs
 

Copied: trunk/packages/strap-base/trunk/debian/strap-base.install (from rev 11036, trunk/packages/strap-base/trunk/debian/strap.install)
===================================================================
--- trunk/packages/strap-base/trunk/debian/strap-base.install	                        (rev 0)
+++ trunk/packages/strap-base/trunk/debian/strap-base.install	2012-05-28 21:19:21 UTC (rev 11059)
@@ -0,0 +1 @@
+strap-protein-alignment-1.jar		usr/lib/java

Deleted: trunk/packages/strap-base/trunk/debian/strap.install
===================================================================
--- trunk/packages/strap-base/trunk/debian/strap.install	2012-05-28 21:13:54 UTC (rev 11058)
+++ trunk/packages/strap-base/trunk/debian/strap.install	2012-05-28 21:19:21 UTC (rev 11059)
@@ -1,4 +0,0 @@
-# data			usr/lib/strap
-# debian/bin/strap	usr/bin
-# debian/strap.desktop	usr/share/applications
-../../tarballs/strap-*.jar		usr/lib/strap