[pkg-java] r10214 - trunk/libjogl-java/debian

[Sylvestre Ledru]

Author: sylvestre-guest
Date: 2009-08-31 20:43:23 +0000 (Mon, 31 Aug 2009)
New Revision: 10214

Modified:
   trunk/libjogl-java/debian/changelog
   trunk/libjogl-java/debian/control
   trunk/libjogl-java/debian/rules
Log:
+  * Standards-Version updated to version 3.8.3
+  * DM-Upload-Allowed removed
+  * Change of my email address since I am now DD
+  * Really disable the doc build where was ending by a timeout


Modified: trunk/libjogl-java/debian/changelog
===================================================================
--- trunk/libjogl-java/debian/changelog	2009-08-31 20:27:47 UTC (rev 10213)
+++ trunk/libjogl-java/debian/changelog	2009-08-31 20:43:23 UTC (rev 10214)
@@ -1,9 +1,16 @@
-libjogl-java (1.1.1+dak1-7) UNRELEASED; urgency=low
+libjogl-java (1.1.1+dak1-7) unstable; urgency=low
 
+  [ Torsten Werner ]
   * Fix Vcs headers.
+ 
+  [ Sylvestre Ledru ]
+  * Standards-Version updated to version 3.8.3
+  * DM-Upload-Allowed removed
+  * Change of my email address since I am now DD
+  * Really disable the doc build where was ending by a timeout
+	
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 31 Aug 2009 16:33:32 +0200
 
- -- Torsten Werner <twerner at debian.org>  Mon, 29 Jun 2009 20:57:21 +0200
-
 libjogl-java (1.1.1+dak1-6) unstable; urgency=low
 
   * Change Maintainer: Debian Java Maintainers.

Modified: trunk/libjogl-java/debian/control
===================================================================
--- trunk/libjogl-java/debian/control	2009-08-31 20:27:47 UTC (rev 10213)
+++ trunk/libjogl-java/debian/control	2009-08-31 20:43:23 UTC (rev 10214)
@@ -2,7 +2,7 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Sylvestre Ledru <sylvestre.ledru at inria.fr>,
+Uploaders: Sylvestre Ledru <sylvestre at debian.org>,
  Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, quilt, openjdk-6-jdk, 
  ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev, 
@@ -10,11 +10,10 @@
 # antlr java packages started to exist at version 2.7.7-8. Before, it 
 # was included in the antlr package
  libantlr-java | antlr ( <= 2.7.7-7 )
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://jogl.dev.java.net
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjogl-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjogl-java/
-DM-Upload-Allowed: yes
 
 Package: libjogl-java
 Architecture: all

Modified: trunk/libjogl-java/debian/rules
===================================================================
--- trunk/libjogl-java/debian/rules	2009-08-31 20:27:47 UTC (rev 10213)
+++ trunk/libjogl-java/debian/rules	2009-08-31 20:43:23 UTC (rev 10214)
@@ -7,13 +7,15 @@
 JAVA_HOME            := /usr/lib/jvm/java-6-openjdk/
 DEB_JARS             := ant-launcher antlrall ant-antlr
 DEB_ANT_CLEAN_TARGET := clean
-DEB_ANT_BUILD_TARGET := all
 DEB_BUILDDIR         := jogl/make
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-ifneq ( ,$(filter-out $(DEB_HOST_ARCH), arm mipsel mips armel))
+DISABLE_BUILD_HELP_ARCHS := arm mipsel mips armel
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(DISABLE_BUILD_HELP_ARCHS)))
 # Disable the javadoc on this arch. it timeouts for the archs
-DEB_ANT_BUILD_TARGET += javadoc
+DEB_ANT_BUILD_TARGET := all 
+else
+DEB_ANT_BUILD_TARGET := all javadoc
 endif
 
 install/libjogl-java::
@@ -29,6 +31,9 @@
 #	install -m 644 -D jogl/build/obj/libjogl_cg.so debian/libjogl-jni/usr/lib/jni/libjogl_cg.so
 	install -m 644 -D gluegen/build/obj/libgluegen-rt.so debian/libjogl-jni/usr/lib/jni/libgluegen-rt.so
 
+install/libjogl-java-doc::
+	if test ! -d jogl/javadoc_public; then mkdir jogl/javadoc_public; fi
+
 clean::
 	$(RM) -r gluegen/build