[libjogl2-java] 15/58: Imported Debian patch 2.0-rc3-7

[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 f3cd352485d1c0a2264cd322b1b8b7c8675a123e
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Tue Nov 22 00:42:13 2011 +0100

    Imported Debian patch 2.0-rc3-7
---
 debian/changelog          | 16 ++++++++--------
 debian/control            |  4 ++--
 debian/patches/series     |  1 -
 debian/patches/sparc.diff | 13 -------------
 debian/rules              |  7 +++----
 5 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5387157..1bb772a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
+libjogl2-java (2.0-rc3-7) unstable; urgency=low
+
+  * Drop patch sparc.diff since it is now managed into gluegen2
+  * Disable the build of the documentation for arch indep build
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 22 Nov 2011 00:42:13 +0100
+
 libjogl2-java (2.0-rc3-6) unstable; urgency=low
 
-  * Fix a problem under arm.
-  * Build the documentation only once.
+  * Fix a problem under arm
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 20 Nov 2011 21:43:36 +0100
 
@@ -12,12 +18,6 @@ libjogl2-java (2.0-rc3-5) unstable; urgency=low
 
  -- 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
 
   * Ant to build C code = a lot of uploads ... pfff
diff --git a/debian/control b/debian/control
index b416c29..4641289 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 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,
+ x11proto-xf86vidmode-dev, libxt-dev, libgluegen2-build-java (>= 2.0-rc3-6),
+ ant-contrib, ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev,
  libgluegen2-rt-java, junit4, libswt-gtk-3-java
 Standards-Version: 3.9.2
 Homepage: http://jogamp.org/
diff --git a/debian/patches/series b/debian/patches/series
index dbbc348..73312fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@ 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
deleted file mode 100644
index 56c7bf1..0000000
--- a/debian/patches/sparc.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-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 a5b0ba7..d723cba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,13 +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:
-	$(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