[libdb-je-java] 19/22: Build with the upstream Ant script

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libdb-je-java.

commit 45b862e21b00e25df5ce34ebc9e3df724d5970ac
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 22 12:47:44 2017 +0100

    Build with the upstream Ant script
---
 debian/ant.properties |  4 ----
 debian/build.xml      | 23 -----------------------
 debian/changelog      |  1 +
 debian/control        |  3 ++-
 debian/rules          |  7 ++-----
 5 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index f86a738..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-project.name=database-je
-class.dir=class
-source.dir=src
-jar.name=db-je.jar
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 0fe2858..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="jar" name="${project.name}" basedir="..">
-
-  <target name="clean">
-    <delete dir="${class.dir}" quiet="true"/>
-    <delete file="${jar.name}" quiet="true"/>
-  </target>
-
-  <target name="compile">
-    <mkdir dir="${class.dir}"/>
-    <javac srcdir="${source.dir}" destdir="${class.dir}"
-	   debug="true" source="1.5"/>
-  </target>
-
-  <target name="jar" description="o Create the jar" depends="compile">
-    <jar jarfile="${jar.name}">
-      <fileset dir="${class.dir}">
-          <include name="**"/>
-      </fileset>
-    </jar>
-  </target>
-</project>
diff --git a/debian/changelog b/debian/changelog
index 0cdd060..0ad6d97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdb-je-java (3.3.98-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Removed the examples from the binary package
+  * Build with the upstream Ant script
   * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.1
diff --git a/debian/control b/debian/control
index 95c91e5..4b19cdc 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends:
  debhelper (>= 10),
  ant,
  default-jdk,
- glassfish-javaee
+ glassfish-javaee,
+ junit
 Standards-Version: 4.1.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libdb-je-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libdb-je-java.git
diff --git a/debian/rules b/debian/rules
index 2155333..04597fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,12 @@
 #!/usr/bin/make -f
 
-export CLASSPATH=/usr/share/java/glassfish-javaee.jar
+export CLASSPATH=/usr/share/java/glassfish-javaee.jar:/usr/share/java/junit.jar
 
 %:
 	dh $@
 
-override_dh_auto_build:
-	dh_auto_build -- -f debian/build.xml jar
-
 override_dh_auto_install:
-	dh_install db-je.jar $(DEB_DESTDIR)/usr/share/java/db-je-$(DEB_VERSION_UPSTREAM).jar
+	dh_install build/lib/je.jar $(DEB_DESTDIR)/usr/share/java/db-je-$(DEB_VERSION_UPSTREAM).jar
 	dh_link /usr/share/java/db-je-$(DEB_VERSION_UPSTREAM).jar /usr/share/java/db-je.jar
 
 get-orig-source:

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