[med-svn] r12039 - trunk/packages/rdp-classifier/trunk/debian

[Timothy Booth]

Author: tbooth-guest
Date: 2012-08-13 17:53:54 +0000 (Mon, 13 Aug 2012)
New Revision: 12039

Modified:
   trunk/packages/rdp-classifier/trunk/debian/README.source
   trunk/packages/rdp-classifier/trunk/debian/changelog
   trunk/packages/rdp-classifier/trunk/debian/control
   trunk/packages/rdp-classifier/trunk/debian/install
   trunk/packages/rdp-classifier/trunk/debian/rules
Log:
This package is not (just now) fully OSS, but I'm working on it
in the hope that it will be.  Bringing build up-to-date for 2.5.

TIM



Modified: trunk/packages/rdp-classifier/trunk/debian/README.source
===================================================================
--- trunk/packages/rdp-classifier/trunk/debian/README.source	2012-08-13 16:53:57 UTC (rev 12038)
+++ trunk/packages/rdp-classifier/trunk/debian/README.source	2012-08-13 17:53:54 UTC (rev 12039)
@@ -5,3 +5,9 @@
 THe macos-resource-fork-file-in-package (files starting
 with ._ ) were removed.
 
+Note for 2.5 - The source for the contents of the ReadSeq.jar file is missing.
+In the hope that this will be rectified (tbooth contacted the author on 13/8/12) I
+have made a package that builds using the pre-compiled ReadSeq.jar.  This could go
+into non-free.
+(Note that having the package like this contravenes the SourceForge TOS so the
+authro is very naughty!)

Modified: trunk/packages/rdp-classifier/trunk/debian/changelog
===================================================================
--- trunk/packages/rdp-classifier/trunk/debian/changelog	2012-08-13 16:53:57 UTC (rev 12038)
+++ trunk/packages/rdp-classifier/trunk/debian/changelog	2012-08-13 17:53:54 UTC (rev 12039)
@@ -1,3 +1,9 @@
+rdp-classifier (2.5.0-1) precise; urgency=low
+
+  * Rebuild version 2.5 (for Ubuntu)
+
+ -- Tim Booth <tbooth at ceh.ac.uk>  Mon, 13 Aug 2012 16:11:15 +0100
+
 rdp-classifier (2.0.1-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>

Modified: trunk/packages/rdp-classifier/trunk/debian/control
===================================================================
--- trunk/packages/rdp-classifier/trunk/debian/control	2012-08-13 16:53:57 UTC (rev 12038)
+++ trunk/packages/rdp-classifier/trunk/debian/control	2012-08-13 17:53:54 UTC (rev 12039)
@@ -2,8 +2,8 @@
 Section: science
 Priority: extra
 Maintainer: Steffen Moeller <steffen_moeller at gmx.de>
-Build-Depends: debhelper (>= 7.0.50~), default-jdk, junit
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0.50~), default-jdk, junit, libcommons-cli-java
+Standards-Version: 3.9.4
 Homepage: http://rdp.cme.msu.edu/.
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/rdp-classifier/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/rdp-classifier/trunk/

Modified: trunk/packages/rdp-classifier/trunk/debian/install
===================================================================
--- trunk/packages/rdp-classifier/trunk/debian/install	2012-08-13 16:53:57 UTC (rev 12038)
+++ trunk/packages/rdp-classifier/trunk/debian/install	2012-08-13 17:53:54 UTC (rev 12039)
@@ -1 +1 @@
-rdp_classifier-2.0.1.jar	usr/share/java
+rdp_classifier*.jar	usr/share/java

Modified: trunk/packages/rdp-classifier/trunk/debian/rules
===================================================================
--- trunk/packages/rdp-classifier/trunk/debian/rules	2012-08-13 16:53:57 UTC (rev 12038)
+++ trunk/packages/rdp-classifier/trunk/debian/rules	2012-08-13 17:53:54 UTC (rev 12039)
@@ -1,22 +1,26 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+##NR## Note - See README.source before doing anything with
+##NR##        this package!
+##NR## NR lines relate to not rebuilding lib/ReadSeq.jar
 
+SRC=source/src
+CP=/usr/share/java/junit.jar:/usr/share/java/commons-cli.jar
+
 %:
 	dh $@ 
 
 override_dh_auto_build:
-	javac -cp /usr/share/java/junit.jar `find src -name "*.java" | grep -v "\._"`
-	jar cf rdp_classifier-2.0.1.jar `find src -name "*.class"`
+	##NR## - should not be using binary JAR in build
+	javac -cp ${CP}:lib/ReadSeq.jar `find ${SRC} -name "*.java" -and -not -name "._*"`
+	( cd ${SRC} ; find . -name "*.class" ) > rdp_classifier.list
+	( cd ${SRC} ;  jar -c @/dev/stdin data ) < rdp_classifier.list > rdp_classifier.jar
 
-clean::
+override_dh_auto_clean:
 	find . -name "*.class" | xargs -r rm -f
-	rm -f "*.jar"
+	##NR## rm -f "*.jar" lib/*.jar
+	rm -f *.list