[dumbster] 15/18: Simplified buildxml.diff

[Emmanuel Bourg]

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

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

commit 838af58de867dedcc34214c429f7923efa39e3cf
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 23 17:45:36 2017 +0200

    Simplified buildxml.diff
---
 debian/changelog                  |  1 +
 debian/control                    |  1 +
 debian/libdumbster-java.classpath |  1 +
 debian/patches/buildxml.diff      | 56 ++-------------------------------------
 debian/rules                      |  5 +++-
 5 files changed, 9 insertions(+), 55 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d24d0dd..3cead0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ dumbster (1.6+debian-3) UNRELEASED; urgency=medium
   * Enabled the debugging symbols
   * No longer install the javadoc and the test results in the binary package
   * Build with the DH sequencer instead of CDBS
+  * Simplified buildxml.diff
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
   * Fixed the watch file
diff --git a/debian/control b/debian/control
index 333780b..733e9e4 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends:
  ant-optional,
  debhelper (>= 10),
  default-jdk,
+ javahelper,
  junit,
  libmail-java,
  maven-repo-helper
diff --git a/debian/libdumbster-java.classpath b/debian/libdumbster-java.classpath
new file mode 100644
index 0000000..2a7c2b5
--- /dev/null
+++ b/debian/libdumbster-java.classpath
@@ -0,0 +1 @@
+usr/share/java/dumbster.jar /usr/share/java/javax.mail.jar
diff --git a/debian/patches/buildxml.diff b/debian/patches/buildxml.diff
index c0b4aea..25ea312 100644
--- a/debian/patches/buildxml.diff
+++ b/debian/patches/buildxml.diff
@@ -1,58 +1,6 @@
 --- a/build.xml
 +++ b/build.xml
-@@ -27,7 +27,7 @@
-   <property name="docdir" value="doc" />
-   <property name="stagedir" value="${builddir}/stage" />
-   <property name="compiledir" value="${builddir}/classes" />
--  <property name="libdir" value="lib" />
-+  <property name="libdir" value="/usr/share/java/" />
-   <property name="testsrcdir" value="test-src" />
-   <property name="testcompiledir" value="${builddir}/test" />
-   <property name="debug" value="" />
-@@ -35,12 +35,20 @@
-   <property name="build.compiler" value="modern" />
- 
-   <path id="compile.path">
--    <fileset dir="${libdir}">
--      <include name="**/*.jar" />
-+    <fileset dir="/usr/share/java/">
-+      <include name="javax.mail.jar" />
-+	<include name="junit.jar" />
-+	<include name="ant-junit.jar" />
-     </fileset>
-     <pathelement location="${compiledir}" />
-   </path>
- 
-+  <path id="jar.classpath" >
-+    <fileset dir="/usr/share/java/">
-+      <include name="javax.mail.jar" />
-+    </fileset>
-+  </path>
-+
-   <!-- === world ========================================================== -->
- 
-   <target name="world" depends="jar, test" />
-@@ -58,7 +66,11 @@
- 
-   <target name="jar" depends="compile">
-     <delete file="${builddir}/dumbster.jar"/>
--    <jar jarfile="${builddir}/dumbster.jar" basedir="${compiledir}/" />
-+    <jar jarfile="${builddir}/dumbster.jar" basedir="${compiledir}/" >
-+	<manifest>
-+		<attribute name="Class-Path" value="${jar.classpath}"/>
-+	</manifest>
-+    </jar>
-   </target>
- 
-   <!-- === clean ========================================================== -->
-@@ -90,12 +102,16 @@
-       <classpath>
-         <pathelement path="${testcompiledir}" />
- 	      <pathelement path="${compiledir}" />
--        <fileset dir="${libdir}">
-+        <fileset dir="/usr/share/java/">
-           <include name="**/*.jar" />
-+	  <include name="junit.jar" />
+@@ -95,7 +95,10 @@
          </fileset>
        </classpath>
        <formatter type="plain"/>
@@ -64,7 +12,7 @@
      </junit>
    </target>
  
-@@ -114,4 +130,4 @@
+@@ -114,4 +117,4 @@
        <zipfileset dir="." includes="build/dumbster.jar" fullpath="dumbster${release}.jar"/>
      </zip>
    </target>
diff --git a/debian/rules b/debian/rules
index db28421..22295fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,12 @@
 #!/usr/bin/make -f
 
+export CLASSPATH=/usr/share/java/javax.mail.jar:/usr/share/java/junit.jar:/usr/share/java/ant-junit.jar
+
 %:
-	dh $@ --with maven-repo-helper
+	dh $@ --with maven-repo-helper --with javahelper
 
 override_dh_auto_build:
+	mkdir -p lib
 	dh_auto_build -- compile jar
 
 override_dh_auto_test:

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