[pkg-java] r15171 - in trunk/libjogl2-java/debian: . patches
Sylvestre Ledru
sylvestre at alioth.debian.org
Sun Oct 9 17:19:35 UTC 2011
Author: sylvestre
Date: 2011-10-09 17:19:34 +0000 (Sun, 09 Oct 2011)
New Revision: 15171
Added:
trunk/libjogl2-java/debian/patches/disable_android_2.diff
trunk/libjogl2-java/debian/patches/disable_git_call.diff
Modified:
trunk/libjogl2-java/debian/changelog
trunk/libjogl2-java/debian/control
trunk/libjogl2-java/debian/patches/series
trunk/libjogl2-java/debian/rules
Log:
libjogl2-java (2.0-rc3-2) unstable; urgency=low
* Fix various FTBFS:
- disable the android include
- build the documentation as indep package (to avoid the timeout)
- disable the git call
Modified: trunk/libjogl2-java/debian/changelog
===================================================================
--- trunk/libjogl2-java/debian/changelog 2011-10-08 13:12:34 UTC (rev 15170)
+++ trunk/libjogl2-java/debian/changelog 2011-10-09 17:19:34 UTC (rev 15171)
@@ -1,3 +1,12 @@
+libjogl2-java (2.0-rc3-2) unstable; urgency=low
+
+ * Fix various FTBFS:
+ - disable the android include
+ - build the documentation as indep package (to avoid the timeout)
+ - disable the git call
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 08 Oct 2011 11:39:42 +0200
+
libjogl2-java (2.0-rc3-1) unstable; urgency=low
* New upstream release
Modified: trunk/libjogl2-java/debian/control
===================================================================
--- trunk/libjogl2-java/debian/control 2011-10-08 13:12:34 UTC (rev 15170)
+++ trunk/libjogl2-java/debian/control 2011-10-09 17:19:34 UTC (rev 15171)
@@ -6,8 +6,8 @@
Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk,
ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev,
x11proto-xf86vidmode-dev, libxt-dev, libgluegen2-build-java, ant-contrib,
- ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev, libgluegen2-rt-java,
- junit4, libswt-gtk-3-java
+ ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev,
+ libgluegen2-rt-java, junit4, libswt-gtk-3-java
Standards-Version: 3.9.2
Homepage: http://jogamp.org/
Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjogl2-java
Added: trunk/libjogl2-java/debian/patches/disable_android_2.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/disable_android_2.diff (rev 0)
+++ trunk/libjogl2-java/debian/patches/disable_android_2.diff 2011-10-09 17:19:34 UTC (rev 15171)
@@ -0,0 +1,13 @@
+Index: libjogl2-java-2.0-rc3/make/build-common.xml
+===================================================================
+--- libjogl2-java-2.0-rc3.orig/make/build-common.xml 2011-10-08 11:32:04.000000000 +0200
++++ libjogl2-java-2.0-rc3/make/build-common.xml 2011-10-08 11:32:28.000000000 +0200
+@@ -16,7 +16,7 @@
+ <property name="gluegen.root" value="/usr/share/gluegen2/" />
+ <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
+ <import file="${gluegen.root}/make/jogamp-archivetasks.xml" />
+- <import file="${gluegen.root}/make/jogamp-androidtasks.xml" />
++<!-- <import file="${gluegen.root}/make/jogamp-androidtasks.xml" />-->
+ <import file="${gluegen.root}/make/jogamp-env.xml" />
+
+ <property name="ant-contrib.jar" value="/usr/share/java/ant-contrib.jar" />
Added: trunk/libjogl2-java/debian/patches/disable_git_call.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/disable_git_call.diff (rev 0)
+++ trunk/libjogl2-java/debian/patches/disable_git_call.diff 2011-10-09 17:19:34 UTC (rev 15171)
@@ -0,0 +1,24 @@
+Index: libjogl2-java-2.0-rc3/make/build-common.xml
+===================================================================
+--- libjogl2-java-2.0-rc3.orig/make/build-common.xml 2011-10-08 11:34:17.000000000 +0200
++++ libjogl2-java-2.0-rc3/make/build-common.xml 2011-10-08 11:47:45.000000000 +0200
+@@ -70,19 +70,7 @@
+ <property name="jogl.build.number" value="manual"/>
+ <property name="jogl.build.id" value="${version.timestamp}"/>
+ <mkdir dir="${tempdir}" />
+- <exec dir="." executable="git" logError="true" failonerror="false" failifexecutionfails="false"
+- output="${tempdir}/localbranch.raw">
+- <arg line="branch --no-color"/>
+- </exec>
+- <exec dir="." executable="sed" logError="true" failonerror="false" failifexecutionfails="false"
+- outputproperty="jogl.build.branch">
+- <arg line="-e '/^[^*]/d' -e 's/* \(.*\)/\1/' ${tempdir}/localbranch.raw"/>
+- </exec>
+ <property name="jogl.build.branch" value="manual"/> <!-- fallback -->
+- <exec dir="${project.root}" executable="git" logError="true" failonerror="false" failifexecutionfails="false"
+- outputproperty="jogl.build.commit">
+- <arg line="rev-parse HEAD"/>
+- </exec>
+ <property name="jogl.build.commit" value="manual"/> <!-- fallback -->
+
+ <property name="nativewindow.version" value="${nativewindow_base_version}-b${jogl.build.number}-${version.timestamp}" />
Modified: trunk/libjogl2-java/debian/patches/series
===================================================================
--- trunk/libjogl2-java/debian/patches/series 2011-10-08 13:12:34 UTC (rev 15170)
+++ trunk/libjogl2-java/debian/patches/series 2011-10-09 17:19:34 UTC (rev 15171)
@@ -4,3 +4,5 @@
otherArchsoswin.diff
disable_android.diff
+disable_git_call.diff
+disable_android_2.diff
Modified: trunk/libjogl2-java/debian/rules
===================================================================
--- trunk/libjogl2-java/debian/rules 2011-10-08 13:12:34 UTC (rev 15170)
+++ trunk/libjogl2-java/debian/rules 2011-10-09 17:19:34 UTC (rev 15171)
@@ -8,12 +8,15 @@
DEB_JARS := ant-contrib ant-contrib-cpptasks ant-nodeps antlr ant-antlr swt
DEB_ANT_ARGS := -Dsetup.noCDC=true
DEB_ANT_CLEAN_TARGET := clean
-DEB_ANT_BUILD_TARGET := all javadoc.all
+DEB_ANT_BUILD_TARGET := all
DEB_ANT_BUILDFILE := make/build.xml
common-install-prehook-indep::
mv build/jar/jogl.all.jar build/jar/jogl2.jar
+build/libjogl2-java-doc::
+ $(DEB_ANT_INVOKE) javadoc.all
+
clean::
$(RM) -r gluegen/build
More information about the pkg-java-commits
mailing list