[derby] 47/53: New dependency on libjson-simple-java

[Emmanuel Bourg]

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

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

commit 8d5722d66256131123ac864166b285a1d3ab1e8d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 18 16:13:45 2016 +0100

    New dependency on libjson-simple-java
---
 debian/changelog | 4 ++--
 debian/control   | 1 +
 debian/rules     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c48f19..a54e143 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-derby (10.11.1.1-1) UNRELEASED; urgency=medium
+derby (10.12.1.1-1) UNRELEASED; urgency=medium
 
   * New upstream release
-    - New dependency on liblucene4.10-java
+    - New dependency on liblucene4.10-java and libjson-simple-java
   * Build with JavaCC 4 instead of 5
   * Moved the package to Git
 
diff --git a/debian/control b/debian/control
index a00ffce..5713447 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: ant (>= 1.7),
                default-jdk,
                javacc4,
                junit,
+               libjson-simple-java,
                liblucene4.10-java,
                liboro-java,
                libservlet3.1-java,
diff --git a/debian/rules b/debian/rules
index dd359b9..b512274 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ override_dh_auto_build:
 	cat /usr/share/java/lucene-analyzers-common-4.10.4.jar > tools/java/lucene-analyzers-common.jar
 	cat /usr/share/java/lucene-queryparser-4.10.4.jar      > tools/java/lucene-queryparser.jar
 
-	ant buildsource buildjars binscripts javadoc
+	ant buildsource buildjars binscripts javadoc -Djson_simple=/usr/share/java/json-simple.jar
 
 override_dh_installdocs:
 	rm -Rf javadoc/testing

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