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

[Christoph Gille]

Author: christophgil-guest
Date: 2012-06-17 21:15:55 +0000 (Sun, 17 Jun 2012)
New Revision: 11371

Modified:
   trunk/packages/strap-base/trunk/debian/control
   trunk/packages/strap-base/trunk/debian/rules
Log:
Fixed dirty tar.gz and fixed lintian missing-dependency-on-libc

Modified: trunk/packages/strap-base/trunk/debian/control
===================================================================
--- trunk/packages/strap-base/trunk/debian/control	2012-06-17 20:02:55 UTC (rev 11370)
+++ trunk/packages/strap-base/trunk/debian/control	2012-06-17 21:15:55 UTC (rev 11371)
@@ -11,7 +11,7 @@
 
 Package: strap-base
 Architecture: any
-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, ${shlibs:Depends}
 Recommends:
 Suggests: strap
 Enhances: 

Modified: trunk/packages/strap-base/trunk/debian/rules
===================================================================
--- trunk/packages/strap-base/trunk/debian/rules	2012-06-17 20:02:55 UTC (rev 11370)
+++ trunk/packages/strap-base/trunk/debian/rules	2012-06-17 21:15:55 UTC (rev 11371)
@@ -22,10 +22,11 @@
 	cd $(SRC_TMP) && tar -xzf $(ORIG_TAR)
 	# Native program to manage GUI frames by frame title. 
 	#It provides always-on-top, iconization, to-front etc.
-	cd $(SRC_TMP)/src && cc -lm -lX11 -o $(CURDIR)/nativeTools_unix2 nativeTools_unix2.c
-	cd $(SRC_TMP)/src && find . -name "*.java" > ../javaFiles.txt
-	cd $(SRC_TMP)/src && javac -O -cp @$(SRC_TMP)/classpath.txt   @../javaFiles.txt
-	cd $(SRC_TMP)/src && jar -cmf $(SRC_TMP)/Manifest $(CURDIR)/strap-protein-alignment-$(VERSION).jar *
+	cd $(SRC_TMP)/strap/src && cc -lm -lX11 -o $(CURDIR)/nativeTools_unix2 nativeTools_unix2.c
+	cd $(SRC_TMP)/strap/src && find . -name "*.java" > ../javaFiles.txt
+	#fgrep k_v_Arry $(SRC_TMP)/strap/src/charite/christo/ChUtils.java
+	cd $(SRC_TMP)/strap/src && javac -O -cp @$(SRC_TMP)/strap/classpath.txt   @../javaFiles.txt
+	cd $(SRC_TMP)/strap/src && jar -cmf $(SRC_TMP)/strap/Manifest $(CURDIR)/strap-protein-alignment-$(VERSION).jar *
 
 override_dh_clean:
 	dh_clean