[pkg-java] r15415 - trunk/libxmlrpc3-java/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-11-19 21:26:33 +0000 (Sat, 19 Nov 2011)
New Revision: 15415

Modified:
   trunk/libxmlrpc3-java/debian/build.xml
   trunk/libxmlrpc3-java/debian/changelog
   trunk/libxmlrpc3-java/debian/rules
Log:
Fix "java.lang.IllegalStateException: Failed to locate resource:
XmlRpcClient.properties": filter property file in d/build.xml (Closes:
#581487)

Modified: trunk/libxmlrpc3-java/debian/build.xml
===================================================================
--- trunk/libxmlrpc3-java/debian/build.xml	2011-11-19 16:13:11 UTC (rev 15414)
+++ trunk/libxmlrpc3-java/debian/build.xml	2011-11-19 21:26:33 UTC (rev 15415)
@@ -44,12 +44,21 @@
    </target>
 
    <target name="jar-client">
-     <antcall target="jar-with-manifest">
+     <antcall target="compile">
        <param name="bin" value="${client.bin.dir}"/>
        <param name="src" value="${client.src.dir}"/>
-       <param name="jar" value="${client.jar.file}"/>
-       <param name="manifest" value="${client.manifest.file}"/>
      </antcall>
+    
+    <copy todir="${client.bin.dir}" filtering="true">
+        <fileset dir="client/src/main/filtered-resources/"/>
+        <filterset begintoken="${" endtoken="}">
+            <filter token="project.version" value="${version}.debian"/>
+        </filterset>
+    </copy>
+
+     <jar destfile="${client.jar.file}" manifest="${client.manifest.file}">
+       <fileset dir="${client.bin.dir}"/>
+     </jar>
    </target>
 
    <target name="jar-server">

Modified: trunk/libxmlrpc3-java/debian/changelog
===================================================================
--- trunk/libxmlrpc3-java/debian/changelog	2011-11-19 16:13:11 UTC (rev 15414)
+++ trunk/libxmlrpc3-java/debian/changelog	2011-11-19 21:26:33 UTC (rev 15415)
@@ -1,9 +1,15 @@
-libxmlrpc3-java (3.1.3-4) UNRELEASED; urgency=low
+libxmlrpc3-java (3.1.3-4) unstable; urgency=low
 
+  [ Jakub Adam ]
   * Add OSGi metadata to JAR manifests
 
- -- Jakub Adam <jakub.adam at ktknet.cz>  Sun, 09 Oct 2011 14:45:30 +0200
+  [ Damien Raude-Morvan ]
+  * Fix "java.lang.IllegalStateException: Failed to locate resource:
+    XmlRpcClient.properties": filter property file in d/build.xml (Closes:
+    #581487)
 
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 19 Nov 2011 17:45:17 +0100
+
 libxmlrpc3-java (3.1.3-3) unstable; urgency=low
 
   [ Damien Raude-Morvan ]

Modified: trunk/libxmlrpc3-java/debian/rules
===================================================================
--- trunk/libxmlrpc3-java/debian/rules	2011-11-19 16:13:11 UTC (rev 15414)
+++ trunk/libxmlrpc3-java/debian/rules	2011-11-19 21:26:33 UTC (rev 15415)
@@ -8,6 +8,7 @@
 
 JAVA_HOME := /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE := $(CURDIR)/debian/build.xml
+DEB_ANT_ARGS := -Dversion=$(VERSION)
 
 -include /usr/share/gcj/debian_defaults