[libjogl2-java] 10/58: Imported Debian patch 2.0-rc3-2

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository libjogl2-java.

commit 01c98796ca12f78d2135c4cf981685a485d5f44a
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Sat Oct 8 11:39:42 2011 +0200

    Imported Debian patch 2.0-rc3-2
---
 debian/changelog                      |  9 +++++++++
 debian/control                        |  4 ++--
 debian/patches/disable_android_2.diff | 13 +++++++++++++
 debian/patches/disable_git_call.diff  | 19 +++++++++++++++++++
 debian/patches/series                 |  2 ++
 debian/rules                          |  5 ++++-
 6 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 76678e5..aee9bda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index fb0a0fa..b416c29 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Sylvestre Ledru <sylvestre at debian.org>
 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
diff --git a/debian/patches/disable_android_2.diff b/debian/patches/disable_android_2.diff
new file mode 100644
index 0000000..3ab5d1c
--- /dev/null
+++ b/debian/patches/disable_android_2.diff
@@ -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" />
diff --git a/debian/patches/disable_git_call.diff b/debian/patches/disable_git_call.diff
new file mode 100644
index 0000000..c81ee81
--- /dev/null
+++ b/debian/patches/disable_git_call.diff
@@ -0,0 +1,19 @@
+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,14 +70,6 @@
+         <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">
diff --git a/debian/patches/series b/debian/patches/series
index a0dcb9a..fcd6408 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@ swt.diff
 otherArchsoswin.diff
 disable_android.diff
 
+disable_git_call.diff
+disable_android_2.diff
diff --git a/debian/rules b/debian/rules
index ea6f805..d499963 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,12 +8,15 @@ JAVA_HOME            := /usr/lib/jvm/default-java/
 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
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjogl2-java.git