[pkg-java] r14362 - in trunk/libwoodstox-java/debian: . patches

[Giovanni Mascellani]

Author: gio
Date: 2011-08-21 08:56:41 +0000 (Sun, 21 Aug 2011)
New Revision: 14362

Removed:
   trunk/libwoodstox-java/debian/patches/30-build-poms.patch
Modified:
   trunk/libwoodstox-java/debian/patches/series
   trunk/libwoodstox-java/debian/rules
Log:
rules file updated; temporarily disable test target to have a compiling package.


Deleted: trunk/libwoodstox-java/debian/patches/30-build-poms.patch
===================================================================
--- trunk/libwoodstox-java/debian/patches/30-build-poms.patch	2011-08-21 08:55:42 UTC (rev 14361)
+++ trunk/libwoodstox-java/debian/patches/30-build-poms.patch	2011-08-21 08:56:41 UTC (rev 14362)
@@ -1,36 +0,0 @@
-From: Giovanni Mascellani <gio at debian.org>
-Subject: filter tags in POM files
-Forwarded: not-needed
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=611590
-
-The upstream dist target does many things that are not necessary for
-the scope of building the Debian package. Just one of these things is
-useful: substituting the @VERSION@ tags in the POM file with the actual
-version value. Thus, this operation is moved in a specific `debian-build'
-target.
-
----
- build.xml |   11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-Index: libwoodstox-java-3.9.2.dfsg/build.xml
-===================================================================
---- libwoodstox-java-3.9.2.dfsg.orig/build.xml	2011-01-31 00:56:48.000000000 +0100
-+++ libwoodstox-java-3.9.2.dfsg/build.xml	2011-02-05 14:38:09.000000000 +0100
-@@ -512,6 +512,16 @@
-        </copy>
-     </target>
- 
-+	<target name="debian-build" depends="jar.wstx.lgpl">
-+       <!-- Build POM files -->
-+       <copy todir="${DistDir}">
-+            <fileset dir="${SrcDir}/maven" includes="*.pom" />
-+            <filterset>
-+              <filter token="VERSION" value="${WSTX_VERSION}" />
-+            </filterset>
-+       </copy>
-+	</target>
-+
-     <target name="all" depends="clean,javadoc,test,dist">
-         <!-- This target simply depends on others to do its job -->
-     </target>

Modified: trunk/libwoodstox-java/debian/patches/series
===================================================================
--- trunk/libwoodstox-java/debian/patches/series	2011-08-21 08:55:42 UTC (rev 14361)
+++ trunk/libwoodstox-java/debian/patches/series	2011-08-21 08:56:41 UTC (rev 14362)
@@ -1,3 +1,2 @@
 10-fix-build.xml
-20-testsuite-enable.dpatch
-30-build-poms.patch
+#20-testsuite-enable.dpatch

Modified: trunk/libwoodstox-java/debian/rules
===================================================================
--- trunk/libwoodstox-java/debian/rules	2011-08-21 08:55:42 UTC (rev 14361)
+++ trunk/libwoodstox-java/debian/rules	2011-08-21 08:56:41 UTC (rev 14362)
@@ -6,19 +6,23 @@
 JAVA_HOME            := /usr/lib/jvm/default-java
 ANT_HOME             := /usr/share/ant
 DEB_ANT_COMPILER     := modern
-DEB_JARS             := ant-nodeps junit ant-junit ant-trax
-DEB_ANT_BUILD_TARGET := debian-build
+DEB_ANT_BUILD_TARGET := debiandist
 DEB_BUILDDIR         := .
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_CLEAN_TARGET := clean
-DEB_ANT_CHECK_TARGET := test
+#DEB_ANT_CHECK_TARGET := test
 
 clean::
-	-rm -Rf build doc test dist
+	-rm -Rf build doc test dist woodstox-core-lgpl.patched.pom
 	mh_clean
 
+configure/libwoodstox-java::
+	# Patch the POM to include the correct version number
+	cp src/maven/woodstox-core-lgpl.pom woodstox-core-lgpl.patched.pom
+	sed -i woodstox-core-lgpl.patched.pom -e 's/@VERSION@/$(DEB_UPSTREAM_VERSION)/g'
+
 install/libwoodstox-java::
-	mh_install
+	mh_install -plibwoodstox-java
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename