[med-svn] r14382 - in trunk/packages/trimmomatic/trunk/debian: . patches

[Olivier Sallou]

Author: osallou
Date: 2013-08-08 07:00:34 +0000 (Thu, 08 Aug 2013)
New Revision: 14382

Added:
   trunk/packages/trimmomatic/trunk/debian/MANIFEST.MF
   trunk/packages/trimmomatic/trunk/debian/patches/remove_jar_version.path
Modified:
   trunk/packages/trimmomatic/trunk/debian/changelog
   trunk/packages/trimmomatic/trunk/debian/install
   trunk/packages/trimmomatic/trunk/debian/patches/series
   trunk/packages/trimmomatic/trunk/debian/rules
Log:
add MANIFEST.MR and manage with javahelper

Added: trunk/packages/trimmomatic/trunk/debian/MANIFEST.MF
===================================================================
--- trunk/packages/trimmomatic/trunk/debian/MANIFEST.MF	                        (rev 0)
+++ trunk/packages/trimmomatic/trunk/debian/MANIFEST.MF	2013-08-08 07:00:34 UTC (rev 14382)
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Created-By: Olivier Sallou <osallou at debian.org>
+Main-Class: org.usadellab.trimmomatic.Trimmomatic
+Class-Path: /usr/share/java/jbzip2.jar

Modified: trunk/packages/trimmomatic/trunk/debian/changelog
===================================================================
--- trunk/packages/trimmomatic/trunk/debian/changelog	2013-08-07 20:27:57 UTC (rev 14381)
+++ trunk/packages/trimmomatic/trunk/debian/changelog	2013-08-08 07:00:34 UTC (rev 14382)
@@ -1,4 +1,4 @@
-trimmomatic (0.30+dfsg-1) UNRELEASED; urgency=low
+trimmomatic (0.30+dfsg-1) unstable; urgency=low
 
   * New upstream version
   * debian/copyright:
@@ -12,6 +12,9 @@
      - use anonscm in Vcs fields
      - Build-Depends: default-jdk | ...
        Closes: #718850
+  [ Olivier Sallou]
+      * Manage java libs with javahelper
+      * Provide upstream missing MANIFEST.MF
 
  -- Andreas Tille <tille at debian.org>  Wed, 07 Aug 2013 12:14:33 +0200
 

Modified: trunk/packages/trimmomatic/trunk/debian/install
===================================================================
--- trunk/packages/trimmomatic/trunk/debian/install	2013-08-07 20:27:57 UTC (rev 14381)
+++ trunk/packages/trimmomatic/trunk/debian/install	2013-08-08 07:00:34 UTC (rev 14382)
@@ -1,2 +1 @@
-dist/jar/*.jar	usr/share/java
 debian/bin/*	usr/bin

Added: trunk/packages/trimmomatic/trunk/debian/patches/remove_jar_version.path
===================================================================
--- trunk/packages/trimmomatic/trunk/debian/patches/remove_jar_version.path	                        (rev 0)
+++ trunk/packages/trimmomatic/trunk/debian/patches/remove_jar_version.path	2013-08-08 07:00:34 UTC (rev 14382)
@@ -0,0 +1,16 @@
+Author: Olivier Sallou <osallou at debian.org>
+Subject: remove version in generated jar
+Description: remove version to manage jar file with javahelper
+Forwarded: no
+Last-Updated: 2013-08-08
+--- a/build.xml
++++ b/build.xml
+@@ -63,7 +63,7 @@
+     		</fileset>
+ 		</copy>
+ 	
+-		<jar jarfile="${dist_jar}/trimmomatic-${version}.jar" basedir="${dist_unpack}" manifest="MANIFEST.MF"/>
++		<jar jarfile="${dist_jar}/trimmomatic.jar" basedir="${dist_unpack}" manifest="MANIFEST.MF"/>
+ 		
+ 		<zip destfile="${dist}/Trimmomatic-${version}.zip">
+ 			<zipfileset prefix="Trimmomatic-${version}" dir="${distsrc}"/>

Modified: trunk/packages/trimmomatic/trunk/debian/patches/series
===================================================================
--- trunk/packages/trimmomatic/trunk/debian/patches/series	2013-08-07 20:27:57 UTC (rev 14381)
+++ trunk/packages/trimmomatic/trunk/debian/patches/series	2013-08-08 07:00:34 UTC (rev 14382)
@@ -1 +1,2 @@
 buildxmlJbzip2.patch
+remove_jar_version.path

Modified: trunk/packages/trimmomatic/trunk/debian/rules
===================================================================
--- trunk/packages/trimmomatic/trunk/debian/rules	2013-08-07 20:27:57 UTC (rev 14381)
+++ trunk/packages/trimmomatic/trunk/debian/rules	2013-08-08 07:00:34 UTC (rev 14382)
@@ -11,16 +11,21 @@
 	dh $@ --with javahelper
 
 override_dh_auto_build:
+	cp debian/MANIFEST.MF .
 	if [ ! -d dist/unpack ]; then mkdir -p dist/unpack; fi
 	touch dist/unpack/LICENCE
 	touch dist/unpack/AUTHORS
 	ant
 
-override_dh_link:
-	dh_link
-	# enable symlinking without any need to edit for new versions
-	dh_link usr/share/java/$(pkg)-$(ver).jar usr/share/java/$(pkg).jar
+override_dh_clean:
+	rm -f MANIFEST.MF
+	dh_clean
 
+#override_dh_link:
+#	dh_link
+#	# enable symlinking without any need to edit for new versions
+#	dh_link usr/share/java/$(pkg)-$(ver).jar usr/share/java/$(pkg).jar
+
 get-orig-source:
 	# uscan --verbose --force-download --repack --rename
 	. debian/get-orig-source