[libjogl2-java] 14/58: Imported Debian patch 2.0-rc3-6

[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 5b4c0866182dbaa8c807e8bef820fb489e549d8c
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Sun Nov 20 21:43:36 2011 +0100

    Imported Debian patch 2.0-rc3-6
---
 debian/changelog                      | 15 ++++++++++++++-
 debian/patches/otherArchsoswin_2.diff | 17 ++++++++++++++++-
 debian/patches/series                 |  1 +
 debian/patches/sparc.diff             | 13 +++++++++++++
 debian/rules                          |  7 ++++---
 5 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8cffcdc..5387157 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,22 @@
+libjogl2-java (2.0-rc3-6) unstable; urgency=low
+
+  * Fix a problem under arm.
+  * Build the documentation only once.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 20 Nov 2011 21:43:36 +0100
+
 libjogl2-java (2.0-rc3-5) unstable; urgency=low
 
   * Example is now working (Closes: #634996)
   * Fix the various FTBFS (Closes: #638431) (LP: #809743)
 
- -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 20 Nov 2011 19:01:18 +0100
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 20 Nov 2011 21:43:29 +0100
+
+libjogl2-java (2.0-rc3-5~exp1) experimental; urgency=low
+
+  * Upload in experimental.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 11 Oct 2011 16:48:22 +0200
 
 libjogl2-java (2.0-rc3-4) unstable; urgency=low
 
diff --git a/debian/patches/otherArchsoswin_2.diff b/debian/patches/otherArchsoswin_2.diff
index aba58a8..f822676 100644
--- a/debian/patches/otherArchsoswin_2.diff
+++ b/debian/patches/otherArchsoswin_2.diff
@@ -1,7 +1,22 @@
 Index: libjogl2-java-2.0-rc3/make/build-nativewindow.xml
 ===================================================================
 --- libjogl2-java-2.0-rc3.orig/make/build-nativewindow.xml	2011-11-20 17:10:07.000000000 +0100
-+++ libjogl2-java-2.0-rc3/make/build-nativewindow.xml	2011-11-20 19:14:38.704878344 +0100
++++ libjogl2-java-2.0-rc3/make/build-nativewindow.xml	2011-11-20 21:34:35.923874821 +0100
+@@ -380,10 +380,10 @@
+       </linker>
+ 
+       <linker id="linker.cfg.linux.armv7.nativewindow.x11" extends="linker.cfg.linux.armv7">
+-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" />
+-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" />
+-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xinerama" />
+-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrender" />
++        <syslibset libs="X11" />
++        <syslibset libs="Xxf86vm" />
++        <syslibset libs="Xinerama" />
++        <syslibset libs="Xrender" />
+       </linker>
+ 
+       <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
 @@ -627,6 +627,7 @@
          </patternset>
  
diff --git a/debian/patches/series b/debian/patches/series
index 73312fa..dbbc348 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ disable_android_2.diff
 arch_naming.diff
 linker.cfg.id.os.diff
 otherArchsoswin_2.diff
+sparc.diff
diff --git a/debian/patches/sparc.diff b/debian/patches/sparc.diff
new file mode 100644
index 0000000..56c7bf1
--- /dev/null
+++ b/debian/patches/sparc.diff
@@ -0,0 +1,13 @@
+Index: libjogl2-java-2.0-rc3/make/build-nativewindow.xml
+===================================================================
+--- libjogl2-java-2.0-rc3.orig/make/build-nativewindow.xml	2011-11-20 21:44:56.000000000 +0100
++++ libjogl2-java-2.0-rc3/make/build-nativewindow.xml	2011-11-20 21:47:09.275858013 +0100
+@@ -670,6 +670,8 @@
+ 
+               <linker extends="@{linker.cfg.id}">
+                 <syslibset dir="${java.lib.dir.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/>
++                <syslibset dir="${java.lib.dir.platform}/sparc/" libs="jawt" if="isLinuxSparc"/>
++
+                 <syslibset dir="${java.lib.dir.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/>
+               </linker>
+             </cc>
diff --git a/debian/rules b/debian/rules
index d499963..a5b0ba7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,12 +11,13 @@ DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := all
 DEB_ANT_BUILDFILE    := make/build.xml
 
+common-build-indep:: doc-build
+doc-build:
+	$(DEB_ANT_INVOKE) javadoc.all
+
 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