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

[Giovanni Mascellani]

Author: gio
Date: 2011-02-05 14:51:10 +0000 (Sat, 05 Feb 2011)
New Revision: 13243

Added:
   trunk/libwoodstox-java/debian/libwoodstox-java.poms
   trunk/libwoodstox-java/debian/patches/30-build-poms.patch
Removed:
   trunk/libwoodstox-java/debian/install
Modified:
   trunk/libwoodstox-java/debian/changelog
   trunk/libwoodstox-java/debian/control
   trunk/libwoodstox-java/debian/patches/series
   trunk/libwoodstox-java/debian/rules
Log:
Patch for bug 611590.


Modified: trunk/libwoodstox-java/debian/changelog
===================================================================
--- trunk/libwoodstox-java/debian/changelog	2011-01-24 23:02:47 UTC (rev 13242)
+++ trunk/libwoodstox-java/debian/changelog	2011-02-05 14:51:10 UTC (rev 13243)
@@ -1,3 +1,10 @@
+libwoodstox-java (1:3.9.2.dfsg-3) experimental; urgency=low
+
+  * Team upload.
+  * Install POM files (closes: #611590).
+
+ -- Giovanni Mascellani <gio at debian.org>  Sat, 05 Feb 2011 14:25:30 +0100
+
 libwoodstox-java (1:3.9.2.dfsg-2) unstable; urgency=low
 
   * Team upload

Modified: trunk/libwoodstox-java/debian/control
===================================================================
--- trunk/libwoodstox-java/debian/control	2011-01-24 23:02:47 UTC (rev 13242)
+++ trunk/libwoodstox-java/debian/control	2011-02-05 14:51:10 UTC (rev 13243)
@@ -4,7 +4,7 @@
 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, default-jdk, junit
-Build-Depends: cdbs, debhelper (>= 5)
+Build-Depends: cdbs, debhelper (>= 5), maven-repo-helper (>= 1.4)
 Standards-Version: 3.8.4
 Homepage: http://woodstox.codehaus.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/packages/trunk/libwoodstox-java/

Deleted: trunk/libwoodstox-java/debian/install
===================================================================
--- trunk/libwoodstox-java/debian/install	2011-01-24 23:02:47 UTC (rev 13242)
+++ trunk/libwoodstox-java/debian/install	2011-02-05 14:51:10 UTC (rev 13243)
@@ -1 +0,0 @@
-build/wstx-lgpl-3.9.2.jar usr/share/java
\ No newline at end of file

Added: trunk/libwoodstox-java/debian/libwoodstox-java.poms
===================================================================
--- trunk/libwoodstox-java/debian/libwoodstox-java.poms	                        (rev 0)
+++ trunk/libwoodstox-java/debian/libwoodstox-java.poms	2011-02-05 14:51:10 UTC (rev 13243)
@@ -0,0 +1 @@
+dist/wstx-lgpl.pom --has-package-version --artifact=build/wstx-lgpl-*.jar --java-lib

Added: trunk/libwoodstox-java/debian/patches/30-build-poms.patch
===================================================================
--- trunk/libwoodstox-java/debian/patches/30-build-poms.patch	                        (rev 0)
+++ trunk/libwoodstox-java/debian/patches/30-build-poms.patch	2011-02-05 14:51:10 UTC (rev 13243)
@@ -0,0 +1,36 @@
+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-01-24 23:02:47 UTC (rev 13242)
+++ trunk/libwoodstox-java/debian/patches/series	2011-02-05 14:51:10 UTC (rev 13243)
@@ -1,2 +1,3 @@
 10-disable-unused.dpatch
 20-testsuite-enable.dpatch
+30-build-poms.patch

Modified: trunk/libwoodstox-java/debian/rules
===================================================================
--- trunk/libwoodstox-java/debian/rules	2011-01-24 23:02:47 UTC (rev 13242)
+++ trunk/libwoodstox-java/debian/rules	2011-02-05 14:51:10 UTC (rev 13243)
@@ -7,7 +7,7 @@
 ANT_HOME             := /usr/share/ant
 DEB_ANT_COMPILER     := modern
 DEB_JARS             := ant-nodeps junit ant-junit ant-trax
-DEB_ANT_BUILD_TARGET := jar.wstx.lgpl
+DEB_ANT_BUILD_TARGET := debian-build
 DEB_BUILDDIR         := .
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_CLEAN_TARGET := clean
@@ -15,6 +15,10 @@
 
 clean::
 	-rm -Rf build doc test dist
+	mh_clean
 
+install/libwoodstox-java::
+	mh_install
+
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename