[pkg-java] r13338 - in trunk/libgluegen2-java/debian: . patches

[Sylvestre Ledru]

Author: sylvestre
Date: 2011-02-22 17:07:08 +0000 (Tue, 22 Feb 2011)
New Revision: 13338

Added:
   trunk/libgluegen2-java/debian/patches/disablesSomeOptions.diff
Modified:
   trunk/libgluegen2-java/debian/changelog
   trunk/libgluegen2-java/debian/rules
Log:
 * gluegen2 artifact.properties + jnlp files also installed + some stuff commented

Modified: trunk/libgluegen2-java/debian/changelog
===================================================================
--- trunk/libgluegen2-java/debian/changelog	2011-02-21 09:45:12 UTC (rev 13337)
+++ trunk/libgluegen2-java/debian/changelog	2011-02-22 17:07:08 UTC (rev 13338)
@@ -1,3 +1,9 @@
+gluegen2 (2.0-rc1-2) UNRELEASED; urgency=low
+
+  * gluegen2 artifact.properties + jnlp files also installed
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 22 Feb 2011 17:27:17 +0100
+
 gluegen2 (2.0-rc1-1) experimental; urgency=low
 
   * Initial Release (Closes: #605902)

Added: trunk/libgluegen2-java/debian/patches/disablesSomeOptions.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/disablesSomeOptions.diff	                        (rev 0)
+++ trunk/libgluegen2-java/debian/patches/disablesSomeOptions.diff	2011-02-22 17:07:08 UTC (rev 13338)
@@ -0,0 +1,22 @@
+Seulement dans gluegen2-2.0-rc1/make/: build-junit.xml~
+diff -ur gluegen2-2.0-rc1.orig/make//build.xml gluegen2-2.0-rc1/make//build.xml
+--- gluegen2-2.0-rc1.orig/make//build.xml	2010-12-04 15:56:06.000000000 +0100
++++ gluegen2-2.0-rc1/make//build.xml	2011-02-22 17:53:45.000000000 +0100
+@@ -721,7 +720,7 @@
+       <classpath path="${junit.jar}:${build}/classes:${build}/test/gensrc/java:${tools.jar}:${ant.core.lib}"/>
+     </javac>
+ 
+-    <ant antfile="build-junit.xml" target="junit.compile"/>
++<!--    <ant antfile="build-junit.xml" target="junit.compile"/>-->
+   </target>
+ 
+   <target name="junit.run" depends="junit.compile">
+@@ -784,7 +783,7 @@
+         <delete includeEmptyDirs="true" quiet="true" dir="${archive}" failonerror="false" />
+         <mkdir dir="${archive}" />
+         <copy file="${build}/artifact.properties" todir="${archive}"/>
+-        <copy file="../LICENSE.txt"    todir="${archive}" />
++<!--        <copy file="../LICENSE.txt"    todir="${archive}" />-->
+         <mkdir dir="${archive}/jar" />
+         <copy todir="${archive}/jar">
+             <fileset dir="${build}" includes="gluegen*.jar"/>

Modified: trunk/libgluegen2-java/debian/rules
===================================================================
--- trunk/libgluegen2-java/debian/rules	2011-02-21 09:45:12 UTC (rev 13337)
+++ trunk/libgluegen2-java/debian/rules	2011-02-22 17:07:08 UTC (rev 13338)
@@ -17,6 +17,9 @@
 install/libgluegen2-build-java::
 	mkdir -p $(CURDIR)/debian/libgluegen2-build-java/usr/share/gluegen2/make/
 	cp -R make/* debian/libgluegen2-build-java/usr/share/gluegen2/make/
+	cp -R build/artifact.properties debian/libgluegen2-build-java/usr/share/gluegen2/
+	mkdir -p $(CURDIR)/debian/libgluegen2-build-java/usr/share/gluegen2/jnlp-files/
+	cp -R jnlp-files/* debian/libgluegen2-build-java/usr/share/gluegen2/jnlp-files/
 	mkdir -p $(CURDIR)/debian/libgluegen2-build-java/usr/share/gluegen2/src/java/
 	cp -R src/java/* debian/libgluegen2-build-java/usr/share/gluegen2/src/java/
 	mkdir -p $(CURDIR)/debian/libgluegen2-build-java/usr/share/gluegen2/src/native/