[pkg-java] r17731 - trunk/jdas/debian

[Timothy Booth]

Author: tbooth-guest
Date: 2014-02-02 16:48:45 +0000 (Sun, 02 Feb 2014)
New Revision: 17731

Modified:
   trunk/jdas/debian/README.source
   trunk/jdas/debian/changelog
   trunk/jdas/debian/pom.xml
   trunk/jdas/debian/rules
Log:
This version tested to build on Debian Sid


Modified: trunk/jdas/debian/README.source
===================================================================
--- trunk/jdas/debian/README.source	2014-02-02 16:41:16 UTC (rev 17730)
+++ trunk/jdas/debian/README.source	2014-02-02 16:48:45 UTC (rev 17731)
@@ -7,11 +7,3 @@
 The build system uses Maven but prevents it from downloading
 anything from the Internet, making the build compliant with
 the Debian policy.
-
-One might think the build should remake auto-generated files like
-src/main/java/org/biodas/jdas/schema/entryPoints/ENTRYPOINTS.java
-but I'm told this is not a good idea and the autogenerated files
-should be considered the source.  Maybe some Java guru will think
-otherwise.
-
--- Tim Booth

Modified: trunk/jdas/debian/changelog
===================================================================
--- trunk/jdas/debian/changelog	2014-02-02 16:41:16 UTC (rev 17730)
+++ trunk/jdas/debian/changelog	2014-02-02 16:48:45 UTC (rev 17731)
@@ -1,3 +1,10 @@
+jdas (1.0.4+svn20130704-1) unstable; urgency=low
+
+  * Build on Debian
+  * Simplify build due to new and better mavenhelper
+
+ -- Tim Booth <tbooth at ceh.ac.uk>  Sun, 02 Feb 2014 16:46:49 +0000
+
 jdas (1.0.4+svn20130704-0biolinux3) precise; urgency=low
 
   * Initial release for Bio-Linux

Modified: trunk/jdas/debian/pom.xml
===================================================================
--- trunk/jdas/debian/pom.xml	2014-02-02 16:41:16 UTC (rev 17730)
+++ trunk/jdas/debian/pom.xml	2014-02-02 16:48:45 UTC (rev 17731)
@@ -15,18 +15,6 @@
 	<name>JDAS - JAXB DAS Client Library</name>
 	<build>
 		<plugins>
-			<!-- To compile with JDK5.0 -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-				<version>2.0.2</version>
-			</plugin>
-			<!-- This plugin creates a javadoc jar -->
-			<!-- Plugin used during the test phase of the build lifecycle -->
 		</plugins>
 	</build>
 	<dependencies>

Modified: trunk/jdas/debian/rules
===================================================================
--- trunk/jdas/debian/rules	2014-02-02 16:41:16 UTC (rev 17730)
+++ trunk/jdas/debian/rules	2014-02-02 16:48:45 UTC (rev 17731)
@@ -19,5 +19,3 @@
 common-binary-fixup-indep::
 	#Bung the jar into /usr/share/java where normal people want to see it.
 	mkdir -p debian/libjdas-java/usr/share/java
-	( cd debian/libjdas-java/usr/share/java ; ln -s ../maven-repo/uk/ac/ebi/das/jdas/1.[0-9]*/jdas-*.jar )
-	( cd debian/libjdas-java/usr/share/java ; ln -s *.jar jdas.jar )