[pkg-java] r15594 - in trunk/libjogl2-java/debian: . patches

[Sylvestre Ledru]

Author: sylvestre
Date: 2011-12-26 00:51:58 +0000 (Mon, 26 Dec 2011)
New Revision: 15594

Removed:
   trunk/libjogl2-java/debian/patches/sparc.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-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


Modified: trunk/libjogl2-java/debian/changelog
===================================================================
--- trunk/libjogl2-java/debian/changelog	2011-12-26 00:49:35 UTC (rev 15593)
+++ trunk/libjogl2-java/debian/changelog	2011-12-26 00:51:58 UTC (rev 15594)
@@ -1,3 +1,10 @@
+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

Modified: trunk/libjogl2-java/debian/control
===================================================================
--- trunk/libjogl2-java/debian/control	2011-12-26 00:49:35 UTC (rev 15593)
+++ trunk/libjogl2-java/debian/control	2011-12-26 00:51:58 UTC (rev 15594)
@@ -5,8 +5,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,
+ 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/

Modified: trunk/libjogl2-java/debian/patches/series
===================================================================
--- trunk/libjogl2-java/debian/patches/series	2011-12-26 00:49:35 UTC (rev 15593)
+++ trunk/libjogl2-java/debian/patches/series	2011-12-26 00:51:58 UTC (rev 15594)
@@ -8,4 +8,3 @@
 arch_naming.diff
 linker.cfg.id.os.diff
 otherArchsoswin_2.diff
-sparc.diff

Deleted: trunk/libjogl2-java/debian/patches/sparc.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/sparc.diff	2011-12-26 00:49:35 UTC (rev 15593)
+++ trunk/libjogl2-java/debian/patches/sparc.diff	2011-12-26 00:51:58 UTC (rev 15594)
@@ -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>

Modified: trunk/libjogl2-java/debian/rules
===================================================================
--- trunk/libjogl2-java/debian/rules	2011-12-26 00:49:35 UTC (rev 15593)
+++ trunk/libjogl2-java/debian/rules	2011-12-26 00:51:58 UTC (rev 15594)
@@ -18,6 +18,9 @@
 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