[libjogl2-java] 18/58: Imported Debian patch 2.0-rc5-1~exp2

[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 f2f7b0587d1b5c28e4e6090331570331d0388def
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Tue Dec 27 23:22:05 2011 +0100

    Imported Debian patch 2.0-rc5-1~exp2
---
 debian/changelog                           |  7 +++++++
 debian/patches/TARGET_PLATFORM_LIBS_2.diff | 26 ++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 debian/rules                               |  6 +-----
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e5da4a..4a94a35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libjogl2-java (2.0-rc5-1~exp2) experimental; urgency=low
+
+  * Only build the doc once
+  * Disable some TARGET_PLATFORM_LIBS variables
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 27 Dec 2011 23:22:05 +0100
+
 libjogl2-java (2.0-rc5-1~exp1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/patches/TARGET_PLATFORM_LIBS_2.diff b/debian/patches/TARGET_PLATFORM_LIBS_2.diff
new file mode 100644
index 0000000..bebe80d
--- /dev/null
+++ b/debian/patches/TARGET_PLATFORM_LIBS_2.diff
@@ -0,0 +1,26 @@
+Index: libjogl2-java-2.0-rc5/make/build-jogl.xml
+===================================================================
+--- libjogl2-java-2.0-rc5.orig/make/build-jogl.xml	2011-12-26 09:54:09.000000000 +0100
++++ libjogl2-java-2.0-rc5/make/build-jogl.xml	2011-12-27 23:14:19.109596268 +0100
+@@ -1092,7 +1092,7 @@
+       </linker>
+ 
+       <linker id="linker.cfg.linux.armv7.jogl.x11" extends="linker.cfg.linux.armv7">
+-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11"/>
++        <syslibset libs="X11"/>
+       </linker>
+ 
+       <linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
+Index: libjogl2-java-2.0-rc5/make/build-newt.xml
+===================================================================
+--- libjogl2-java-2.0-rc5.orig/make/build-newt.xml	2011-12-26 09:54:09.000000000 +0100
++++ libjogl2-java-2.0-rc5/make/build-newt.xml	2011-12-27 23:14:25.001596434 +0100
+@@ -276,7 +276,7 @@
+       </linker>
+ 
+       <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
+-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="android" />
++        <syslibset libs="android" />
+       </linker>
+ 
+       <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
diff --git a/debian/patches/series b/debian/patches/series
index e2f565c..91d4788 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ arch_naming.diff
 linker.cfg.id.os.diff
 otherArchsoswin_2.diff
 disable_android_3.diff
+TARGET_PLATFORM_LIBS_2.diff
diff --git a/debian/rules b/debian/rules
index 7605657..2e0509a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,16 +11,12 @@ DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := all
 DEB_ANT_BUILDFILE    := make/build.xml
 
-common-build-indep:: doc-build
-doc-build:
+build-indep:
 	$(DEB_ANT_INVOKE) javadoc.all
 
 common-install-prehook-indep::
 	mv build/jar/jogl.all.jar build/jar/jogl2.jar
 
-install/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