[pkg-java] r6716 - trunk/libwoodstox-java/debian

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2008-07-20 13:46:04 +0000 (Sun, 20 Jul 2008)
New Revision: 6716

Modified:
   trunk/libwoodstox-java/debian/changelog
   trunk/libwoodstox-java/debian/control
   trunk/libwoodstox-java/debian/rules
   trunk/libwoodstox-java/debian/watch
Log:
[libwoodstox-java] Now builds and works with openjdk, moving to main

Modified: trunk/libwoodstox-java/debian/changelog
===================================================================
--- trunk/libwoodstox-java/debian/changelog	2008-07-19 21:54:58 UTC (rev 6715)
+++ trunk/libwoodstox-java/debian/changelog	2008-07-20 13:46:04 UTC (rev 6716)
@@ -1,3 +1,13 @@
+libwoodstox-java (1:3.9.2.dfsg-1) unstable; urgency=low
+
+  * Now using ant.mk for the build
+  * Can now build and run using openjdk
+  * Moving to main !
+  * Pseudo new upstream release for the transition to main
+    - updated debian/watch to skip the .dfsg bit in the version number
+
+ -- Vincent Fourmond <fourmond at debian.org>  Sun, 20 Jul 2008 15:38:48 +0200
+
 libwoodstox-java (1:3.9.2-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/libwoodstox-java/debian/control
===================================================================
--- trunk/libwoodstox-java/debian/control	2008-07-19 21:54:58 UTC (rev 6715)
+++ trunk/libwoodstox-java/debian/control	2008-07-20 13:46:04 UTC (rev 6716)
@@ -1,10 +1,10 @@
 Source: libwoodstox-java
-Section: contrib/libs
+Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Vincent Fourmond <fourmond at debian.org>
 Build-Depends-Indep: ant, ant-optional, 
-  icedtea-java7-jdk | sun-java6-jdk 
+  openjdk-6-jdk | icedtea-java7-jdk | sun-java6-jdk 
 Build-Depends: cdbs, debhelper (>= 5), dpatch
 Standards-Version: 3.7.3
 Homepage: http://woodstox.codehaus.org/
@@ -14,7 +14,7 @@
 
 Package: libwoodstox-java
 Architecture: all
-Depends: icedtea-java7-jre | sun-java6-jre 
+Depends: openjdk-6-jre | icedtea-java7-jre | sun-java6-jre 
 Suggests: java-virtual-machine
 Description: a high-performance XML processor
  Woodstox is a high-performance validating namespace-aware

Modified: trunk/libwoodstox-java/debian/rules
===================================================================
--- trunk/libwoodstox-java/debian/rules	2008-07-19 21:54:58 UTC (rev 6715)
+++ trunk/libwoodstox-java/debian/rules	2008-07-20 13:46:04 UTC (rev 6716)
@@ -2,19 +2,17 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/ant.mk
 
-# We do it by hand, as I can't get the ant.mk stuff to work for now...
-JAVA_HOME = $(or $(shell [ -x /usr/lib/jvm/java-6-sun/lib ] && echo "/usr/lib/jvm/java-6-sun"), /usr/lib/jvm/java-7-icedtea)
+JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-7-icedtea
+ANT_HOME             := /usr/share/ant
+DEB_ANT_COMPILER     := modern
+DEB_JARS             := ant-nodeps
+DEB_ANT_BUILD_TARGET := jar.wstx.lgpl
+DEB_BUILDDIR         := .
+DEB_ANT_BUILDFILE    := build.xml
+DEB_ANT_CLEAN_TARGET := clean
 
-JAR_LIST = /usr/share/ant/lib/ant-nodeps.jar
 clean::
 	-rm -Rf build doc test dist
 
-build:  jar
-
-jar:
-	OPT_JAR_LIST="$(JAR_LIST)" JAVA_HOME=$(JAVA_HOME) \
-	ant jar.wstx.lgpl
-
-
-# Add here any variable or target overrides you need.

Modified: trunk/libwoodstox-java/debian/watch
===================================================================
--- trunk/libwoodstox-java/debian/watch	2008-07-19 21:54:58 UTC (rev 6715)
+++ trunk/libwoodstox-java/debian/watch	2008-07-20 13:46:04 UTC (rev 6716)
@@ -1,4 +1,4 @@
 # The watchfile for libwoodstox
 version=3
-opts=dversionmangle=s/4.0~.*/3.9.0/ \
+opts=dversionmangle=s/\.dfsg// \
 http://woodstox.codehaus.org/Download (?:.*)/wstx-src-(.*).tar.gz