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

Sylvestre Ledru sylvestre at alioth.debian.org
Fri Mar 4 15:46:57 UTC 2011


Author: sylvestre
Date: 2011-03-04 15:46:56 +0000 (Fri, 04 Mar 2011)
New Revision: 13377

Added:
   trunk/libgluegen2-java/debian/README.source
   trunk/libgluegen2-java/debian/patches/disableArchive7z.diff
Removed:
   trunk/libgluegen2-java/debian/files
Modified:
   trunk/libgluegen2-java/debian/changelog
   trunk/libgluegen2-java/debian/patches/disablesSomeOptions.diff
   trunk/libgluegen2-java/debian/patches/series
   trunk/libgluegen2-java/debian/rules
Log:
  * New upstream release
  * README.source added


Added: trunk/libgluegen2-java/debian/README.source
===================================================================
--- trunk/libgluegen2-java/debian/README.source	                        (rev 0)
+++ trunk/libgluegen2-java/debian/README.source	2011-03-04 15:46:56 UTC (rev 13377)
@@ -0,0 +1,7 @@
+Here is how to repack gluegen2
+
+git clone git://jogamp.org/srv/scm/gluegen.git  gluegen-xxx
+cd gluegen
+git checkout <tag>
+rm -rf .git make/lib/
+tar zcvf gluegen2_xxx.orig.tar.gz gluegen-xxx/ 

Modified: trunk/libgluegen2-java/debian/changelog
===================================================================
--- trunk/libgluegen2-java/debian/changelog	2011-03-04 13:28:48 UTC (rev 13376)
+++ trunk/libgluegen2-java/debian/changelog	2011-03-04 15:46:56 UTC (rev 13377)
@@ -1,8 +1,9 @@
 gluegen2 (2.0-rc2-1) experimental; urgency=low
 
   * New upstream release
+  * README.source added
 
- -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 04 Mar 2011 14:28:02 +0100
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 04 Mar 2011 16:21:45 +0100
 
 gluegen2 (2.0-rc1-3) experimental; urgency=low
 

Deleted: trunk/libgluegen2-java/debian/files
===================================================================
--- trunk/libgluegen2-java/debian/files	2011-03-04 13:28:48 UTC (rev 13376)
+++ trunk/libgluegen2-java/debian/files	2011-03-04 15:46:56 UTC (rev 13377)
@@ -1,12 +0,0 @@
-libgluegen2-rt-java_2.0-rc1-1_all.deb java optional
-libgluegen2-build-java_2.0-rc1-1_all.deb java optional
-libgluegen2-doc_2.0-rc1-1_all.deb doc optional
-libgluegen2-jni_2.0-rc1-1_amd64.deb java optional
-libgluegen2-rt-java_2.0-rc1-1_all.deb java optional
-libgluegen2-build-java_2.0-rc1-1_all.deb java optional
-libgluegen2-doc_2.0-rc1-1_all.deb doc optional
-libgluegen2-jni_2.0-rc1-1_amd64.deb java optional
-libgluegen2-rt-java_2.0-rc1-1_all.deb java optional
-libgluegen2-build-java_2.0-rc1-1_all.deb java optional
-libgluegen2-doc_2.0-rc1-1_all.deb doc optional
-libgluegen2-jni_2.0-rc1-1_amd64.deb java optional

Added: trunk/libgluegen2-java/debian/patches/disableArchive7z.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/disableArchive7z.diff	                        (rev 0)
+++ trunk/libgluegen2-java/debian/patches/disableArchive7z.diff	2011-03-04 15:46:56 UTC (rev 13377)
@@ -0,0 +1,16 @@
+Index: gluegen-v2.0-rc2/make/build.xml
+===================================================================
+--- gluegen-v2.0-rc2.orig/make/build.xml	2011-03-04 16:13:59.000000000 +0100
++++ gluegen-v2.0-rc2/make/build.xml	2011-03-04 16:14:06.000000000 +0100
+@@ -683,9 +683,9 @@
+         <classpath path="${classes}"/>
+         <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
+     </javadoc>
+-    <archive.7z destfile="${build}/javadoc.7z"
++<!--    <archive.7z destfile="${build}/javadoc.7z"
+                 basedir="${javadoc.root.path}"
+-                includes="gluegen/**" />
++                includes="gluegen/**" />-->
+   </target>
+ 
+     <!-- ================================================================== -->

Modified: trunk/libgluegen2-java/debian/patches/disablesSomeOptions.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/disablesSomeOptions.diff	2011-03-04 13:28:48 UTC (rev 13376)
+++ trunk/libgluegen2-java/debian/patches/disablesSomeOptions.diff	2011-03-04 15:46:56 UTC (rev 13377)
@@ -1,17 +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>
+Index: gluegen-v2.0-rc2/make/build.xml
+===================================================================
+--- gluegen-v2.0-rc2.orig/make/build.xml	2011-03-04 14:59:22.000000000 +0100
++++ gluegen-v2.0-rc2/make/build.xml	2011-03-04 14:59:39.000000000 +0100
+@@ -663,11 +663,11 @@
+   </target>
  
--    <ant antfile="build-junit.xml" target="junit.compile"/>
-+<!--    <ant antfile="build-junit.xml" target="junit.compile"/>-->
+   <target name="junit.compile" depends="init">
+-    <ant antfile="build-test.xml" target="junit.compile"/>
++<!--    <ant antfile="build-test.xml" target="junit.compile"/>-->
    </target>
  
    <target name="junit.run" depends="junit.compile">
-@@ -784,7 +783,7 @@
+-    <ant antfile="build-test.xml" target="junit.run"/>
++<!--    <ant antfile="build-test.xml" target="junit.run"/>-->
+   </target>
+ 
+   <target name="javadoc" depends="init">
+@@ -698,7 +698,7 @@
          <delete includeEmptyDirs="true" quiet="true" dir="${archive}" failonerror="false" />
          <mkdir dir="${archive}" />
          <copy file="${build}/artifact.properties" todir="${archive}"/>

Modified: trunk/libgluegen2-java/debian/patches/series
===================================================================
--- trunk/libgluegen2-java/debian/patches/series	2011-03-04 13:28:48 UTC (rev 13376)
+++ trunk/libgluegen2-java/debian/patches/series	2011-03-04 15:46:56 UTC (rev 13377)
@@ -1,3 +1,4 @@
 jarPath.diff
 renamedLibrary.diff
 disablesSomeOptions.diff
+disableArchive7z.diff

Modified: trunk/libgluegen2-java/debian/rules
===================================================================
--- trunk/libgluegen2-java/debian/rules	2011-03-04 13:28:48 UTC (rev 13376)
+++ trunk/libgluegen2-java/debian/rules	2011-03-04 15:46:56 UTC (rev 13377)
@@ -30,8 +30,6 @@
 	cp -Rf test/junit/* debian/libgluegen2-build-java/usr/share/gluegen2/test/junit
 	install -m 644 -D build/gluegen.jar debian/libgluegen2-build-java/usr/share/java/gluegen2-$(DEB_UPSTREAM_VERSION).jar
 	ln -s gluegen2-$(DEB_UPSTREAM_VERSION).jar debian/libgluegen2-build-java/usr/share/java/gluegen2.jar
-	install -m 644 -D build/gluegen-rt.cdc.jar debian/libgluegen2-build-java/usr/share/java/gluegen2-rt-$(DEB_UPSTREAM_VERSION).cdc.jar
-	ln -s gluegen2-rt-$(DEB_UPSTREAM_VERSION).cdc.jar debian/libgluegen2-build-java/usr/share/java/gluegen2-rt.cdc.jar
 	find debian/libgluegen2-build-java/usr/share/gluegen2/ -type f -exec chmod a-x {} \;
 #extra license
 	rm debian/libgluegen2-build-java/usr/share/gluegen2/src/java/com/jogamp/gluegen/cgram/license.txt




More information about the pkg-java-commits mailing list