[derby] 45/53: New dependency on liblucene4.10-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 035a8adadc9e84a56b3dc9c6820993baa06c2289
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 18 15:54:18 2016 +0100

    New dependency on liblucene4.10-java
---
 debian/changelog                             |  4 +++-
 debian/control                               |  1 +
 debian/patches/01-lucene-compatibility.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 debian/rules                                 |  5 ++++-
 5 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e258308..5c48f19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-derby (10.10.2.0-3) UNRELEASED; urgency=medium
+derby (10.11.1.1-1) UNRELEASED; urgency=medium
 
+  * New upstream release
+    - New dependency on liblucene4.10-java
   * Build with JavaCC 4 instead of 5
   * Moved the package to Git
 
diff --git a/debian/control b/debian/control
index 18b4bfe..a00ffce 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: ant (>= 1.7),
                default-jdk,
                javacc4,
                junit,
+               liblucene4.10-java,
                liboro-java,
                libservlet3.1-java,
                maven-repo-helper
diff --git a/debian/patches/01-lucene-compatibility.patch b/debian/patches/01-lucene-compatibility.patch
new file mode 100644
index 0000000..566ff3e
--- /dev/null
+++ b/debian/patches/01-lucene-compatibility.patch
@@ -0,0 +1,28 @@
+Description: Fixes the compatibility with the version of Lucene in Debian
+Author: Emmanuel Bourg
+Forwarded: no
+--- a/java/optional/org/apache/derby/optional/api/LuceneUtils.java
++++ b/java/optional/org/apache/derby/optional/api/LuceneUtils.java
+@@ -108,21 +108,7 @@
+     @SuppressWarnings("deprecation")
+     public  static  Version currentVersion()
+     {
+-        Version retval = null;
+-
+-        // the current version is the highest one
+-        for ( Version current : Version.values() )
+-        {
+-            if ( current == Version.LUCENE_CURRENT ) { continue; }
+-            
+-            if ( retval == null ) { retval = current; }
+-            else
+-            {
+-                if ( current.onOrAfter( retval ) ) { retval = current; }
+-            }
+-        }
+-        
+-        return retval;
++        return Version.LUCENE_CURRENT;
+     }
+ 
+     /**
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bd0b19f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-lucene-compatibility.patch
diff --git a/debian/rules b/debian/rules
index 4d8f6a2..dd359b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,10 @@ override_dh_auto_build:
 	cat /usr/share/java/oro.jar > tools/java/jakarta-oro-2.0.8.jar
 	cat /usr/share/java/javacc4.jar > tools/java/javacc.jar
 	cat /usr/share/java/junit.jar > tools/java/junit.jar
-	
+	cat /usr/share/java/lucene-core-4.10.4.jar             > tools/java/lucene-core.jar
+	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
 
 override_dh_installdocs:

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