[med-svn] r11036 - trunk/packages/strap-base/trunk/debian
Christoph Gille
christophgil-guest at alioth.debian.org
Mon May 28 15:07:54 UTC 2012
Author: christophgil-guest
Date: 2012-05-28 15:07:54 +0000 (Mon, 28 May 2012)
New Revision: 11036
Added:
trunk/packages/strap-base/trunk/debian/changelog
Removed:
trunk/packages/strap-base/trunk/debian/changelog
Modified:
trunk/packages/strap-base/trunk/debian/compileStrap.sh
trunk/packages/strap-base/trunk/debian/control
trunk/packages/strap-base/trunk/debian/rules
trunk/packages/strap-base/trunk/debian/strap.install
Log:
Deleted: trunk/packages/strap-base/trunk/debian/changelog
===================================================================
--- trunk/packages/strap-base/trunk/debian/changelog 2012-05-28 14:51:26 UTC (rev 11035)
+++ trunk/packages/strap-base/trunk/debian/changelog 2012-05-28 15:07:54 UTC (rev 11036)
@@ -1,6 +0,0 @@
-strap-base (1-1) UNRELEASED; urgency=low
-
- * Initial release (Closes: #xxxxxxxxx)
-
- -- Christoph Gille <christophgil at googlemail.com> Thu, 17 Nov 2011 18:30:16 +0100
-
Added: trunk/packages/strap-base/trunk/debian/changelog
===================================================================
--- trunk/packages/strap-base/trunk/debian/changelog (rev 0)
+++ trunk/packages/strap-base/trunk/debian/changelog 2012-05-28 15:07:54 UTC (rev 11036)
@@ -0,0 +1,6 @@
+strap-base (1-1) UNRELEASED; urgency=low
+
+ * Initial release (Closes: #xxxxxxxxx)
+
+ -- Christoph Gille <christophgil at googlemail.com> Thu, 17 Nov 2011 18:30:16 +0100
+
Modified: trunk/packages/strap-base/trunk/debian/compileStrap.sh
===================================================================
--- trunk/packages/strap-base/trunk/debian/compileStrap.sh 2012-05-28 14:51:26 UTC (rev 11035)
+++ trunk/packages/strap-base/trunk/debian/compileStrap.sh 2012-05-28 15:07:54 UTC (rev 11036)
@@ -1,7 +1,6 @@
#!/bin/bash
-
mkdir -p $SRC_TMP
CP=.:$TARBALLS/compilationDependencies.jar:
Modified: trunk/packages/strap-base/trunk/debian/control
===================================================================
--- trunk/packages/strap-base/trunk/debian/control 2012-05-28 14:51:26 UTC (rev 11035)
+++ trunk/packages/strap-base/trunk/debian/control 2012-05-28 15:07:54 UTC (rev 11036)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Christoph Gille <christophgil at googlemail.com>
-Build-Depends: debhelper (>= 8), openjdk-6-jdk | sun-java6-jdk, libcommons-httpclient-java, libcommons-compress-java, libhttpmime-java, libjavatar-java,libhttpclient-java, libgeronimo-activation-1.1-spec-java
+Build-Depends: debhelper (>= 8), openjdk-6-jdk | sun-java6-jdk, libcommons-httpclient-java, libcommons-compress-java, libhttpmime-java, libjavatar-java,libhttpclient-java, libgeronimo-activation-1.1-spec-java, libx11-dev
Standards-Version: 3.9.2
Homepage: http://www.bioinformatics.org/strap/
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/strap-base/trunk/
@@ -11,10 +11,13 @@
Package: strap-base
Architecture: all
-Depends: openjdk-6-jre | sun-java6-jre, java-wrappers, ${misc:Depends}, libcommons-httpclient-java, libcommons-compress-java, libhttpmime-java, libjavatar-java,libhttpclient-java, libgeronimo-activation-1.1-spec-java
+Depends: openjdk-6-jre | sun-java6-jre, java-wrappers, ${misc:Depends}, libcommons-httpclient-java, libcommons-compress-java, libhttpmime-java, libjavatar-java,libhttpclient-java, libgeronimo-activation-1.1-spec-java
Recommends:
Suggests:
Enhances:
Description: Base for the bioinformatics tool Strap and related utilities
This package is required for Strap.
- Strap is a work-bench for protein sequences and structures.
\ No newline at end of file
+ Strap is a work-bench for protein sequences and structures.
+
+
+# texlive-latex-extra
\ No newline at end of file
Modified: trunk/packages/strap-base/trunk/debian/rules
===================================================================
--- trunk/packages/strap-base/trunk/debian/rules 2012-05-28 14:51:26 UTC (rev 11035)
+++ trunk/packages/strap-base/trunk/debian/rules 2012-05-28 15:07:54 UTC (rev 11036)
@@ -8,36 +8,49 @@
%:
dh $@
-CP := .:compilationDependencies.jar:/usr/share/java/javatar.jar:/usr/share/java/activation.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-logging.jar:/usr/share/java/httpclient.jar:/usr/share/java/httpclient.jar:/usr/share/java/httpcore.jar:/usr/share/java/httpmime.jar
+CP := $(shell echo /usr/share/java{javatar,activation,commons-codec,commons-httpclient,commons-logging,httpclient,httpclient,httpcore,httpmime.jar} | sed 's| |.jar:|g)
+CP := $(CP):.:../compilationDependencies.jar
+
SKIP :=Superimpose_LajollaProtein.java\|ChJv.java\|Flavine.java\|ChAquaScrollBarUI\|StrapMacApplicationListener
+SRC_TMP := ~/tmp/build_strap-base
+REPACKED := strap-base-$(VERSION)
+STRAPSRC := ~/tmp/build_strap-base/strap-base-$(VERSION)
override_dh_auto_build:
dh_auto_build
- # Here I could remove all icons for which I do not know the copyright
- cd charite/christo/myIcons/ && rm ncbi32x32.jpg MOL_TOOLKIT.png
- find . -name "*.java" | tr ' ' '\n' | grep -v '$(SKIP)' > ../javaFiles.txt
- javac -cp $(CP) $(shell cat ../javaFiles.txt )
- echo "Main-Class: charite.christo.strap.Strap"> Manifest
- jar -cmf Manifest strap-$(VERSION).jar charite org*
+ # echo ooooooooooooooooooooooooooooooooooooooooooooooo $(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
override_dh_clean:
dh_clean
#SRC_TMP := $(shell mktemp --tmpdir --directory strap-base-build.XXXXXXXXXX)
# For testing I rather use the following
-SRC_TMP := ~/tmp/build_strap-base
+
ORIG_JAR := $(SRC_TMP)/strap-base_$(VERSION).jar
-REPACKED := strap-base-$(VERSION)
TARBALLS := $(CURDIR)/../tarballs
get-orig-source:
- mkdir -p $(SRC_TMP)/$(REPACKED)
+ mkdir -p doc # otherwise Error in rules binary: dh_installdocs cp: cannot stat `doc/': No such file or directory
+ mkdir -p $(STRAPSRC)
mkdir -p $(TARBALLS)
[ -f $(ORIG_JAR) ] || wget -O $(ORIG_JAR) http://www.bioinformatics.org/strap/debian/strap.jar
- cd $(SRC_TMP)/$(REPACKED) && unzip -q $(ORIG_JAR) && find . -name "*.class" -delete
- cd $(SRC_TMP)/$(REPACKED) && wget -N http://www.bioinformatics.org/strap/debian/compilationDependencies.jar
+ # We need only the source code files in strap.jar and will delete all .class files
+ cd $(STRAPSRC) && unzip -o -q $(ORIG_JAR) && find . -name "*.class" -delete
+ # Rremove icons which are not needed under linux
+ cd $(STRAPSRC)/charite/christo/myIcons/ && rm ncbi32x32.jpg AquaLookAndFeel.gif cygwin.gif umbrella.gif safari.gif scale.gif
+ # Remove MS-Windows binaries
+ cd $(STRAPSRC)/charite/christo/files; rm -r src/*windows* bin/
+ # compilationDependencies.jar is needed only during compilation but not at runtime
+ # E.g. it contains classes of the jnlp API which are not part in openjdk. They are not needed at runtime when started from command line.
+ cd $(SRC_TMP) && wget -N http://www.bioinformatics.org/strap/debian/compilationDependencies.jar
cd $(SRC_TMP) && tar -czf $(TARBALLS)/strap-base_$(VERSION).orig.tar.gz $(REPACKED)
cd $(SRC_TMP) && ls
#rm -rf $(SRC_TMP)
Modified: trunk/packages/strap-base/trunk/debian/strap.install
===================================================================
--- trunk/packages/strap-base/trunk/debian/strap.install 2012-05-28 14:51:26 UTC (rev 11035)
+++ trunk/packages/strap-base/trunk/debian/strap.install 2012-05-28 15:07:54 UTC (rev 11036)
@@ -1,4 +1,4 @@
# data usr/lib/strap
-debian/bin/strap usr/bin
+# debian/bin/strap usr/bin
+# debian/strap.desktop usr/share/applications
../../tarballs/strap-*.jar usr/lib/strap
-debian/strap.desktop usr/share/applications
More information about the debian-med-commit
mailing list