[wsdl4j] 18/33: Don't run useless 'dist' target during build

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository wsdl4j.

commit 6745bb304be2bb15b66bb1bcd6888a11cf148bd4
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed Jan 23 21:20:33 2013 +0000

    Don't run useless 'dist' target during build
---
 debian/changelog          |  4 ++++
 debian/patches/build.diff | 28 ----------------------------
 debian/patches/series     |  1 -
 debian/rules              |  2 +-
 4 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ae3b4a..f85d7ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ wsdl4j (1.6.2-5) UNRELEASED; urgency=low
   [ Jakub Adam ]
   * Use jh_installjavadoc to install API documentation.
   * Removed useless debhelper.mk include from d/rules.
+  * Don't run useless 'dist' target during build.
+    - Running 'compile' and 'dist' in sequence caused that JARs were
+      built two times. Invoking 'compile' and 'javadocs' targets creates
+      all the artefacts we need for out packaging.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 21 Jan 2013 19:21:12 +0100
 
diff --git a/debian/patches/build.diff b/debian/patches/build.diff
deleted file mode 100644
index 8e61541..0000000
--- a/debian/patches/build.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: wsdl4j-1.6.2/build.xml
-===================================================================
---- wsdl4j-1.6.2.orig/build.xml	2007-11-08 22:44:48.000000000 +0530
-+++ wsdl4j-1.6.2/build.xml	2007-11-08 22:46:23.000000000 +0530
-@@ -216,23 +216,7 @@
-       <fileset dir="${build.lib}"/>
-     </copy>
- 
--    <copy todir="${dist.dir}/docs">
--      <fileset dir="${docs.dir}">
--        <include name="*.html"/>
--      </fileset>
--      <filterset>
--        <filter token="version" value="${wsdl4j.version.underscore}"/>
--      </filterset>
--    </copy>
--
--    <copy tofile="${dist.dir}/docs/spec/jsr110-1.2.pdf">
--      <fileset dir="${docs.dir}">
--        <include name="spec/maint_rel_1.2/jsr110-1.2.pdf"/>
--      </fileset>
--    </copy>
--
-     <copy file="license.html" tofile="${dist.dir}/license.html"/>
--    <copy file="readme.txt" tofile="${dist.dir}/readme.txt"/>
- 
-     <!-- ================================================================= -->
-     <!-- Produces the zip file                                             -->
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c614a3c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-build.diff
diff --git a/debian/rules b/debian/rules
index 6471794..5edbe7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/javahelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME 		:= /usr/lib/jvm/default-java
-DEB_ANT_INSTALL_TARGET	:= dist
+DEB_ANT_BUILD_TARGET	:= compile javadocs
 
 install/libwsdl4j-java::
 	install -m 644 -D build/lib/wsdl4j.jar debian/libwsdl4j-java/usr/share/java/wsdl4j-$(DEB_UPSTREAM_VERSION).jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wsdl4j.git