[jasperreports] 01/01: Depend on liblucene4.10-java instead of liblucene4-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 jasperreports.

commit 6a84087e4eb9cbc4fbd8a972712889e945811b41
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Feb 3 00:16:59 2016 +0100

    Depend on liblucene4.10-java instead of liblucene4-java
---
 debian/changelog           | 7 +++++++
 debian/control             | 4 ++--
 debian/maven.rules         | 6 +++---
 debian/patches/build.patch | 2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aedae96..9f5921f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jasperreports (6.1.1+dfsg-3) unstable; urgency=medium
+
+  * Team upload.
+  * Depend on liblucene4.10-java instead of liblucene4-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 03 Feb 2016 00:16:15 +0100
+
 jasperreports (6.1.1+dfsg-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index be3e283..6269c1f 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Build-Depends:
  libjcommon-java,
  libjexcelapi-java,
  libjfreechart-java,
- liblucene4-java,
+ liblucene4.10-java,
  libmondrian-java,
  libolap4j-java,
  librhino-java,
@@ -61,7 +61,7 @@ Depends:
  libcommons-logging-java,
  libecj-java,
  libjcommon-java,
- liblucene4-java,
+ liblucene4.10-java,
  libolap4j-java,
  libxalan2-java,
  ${misc:Depends}
diff --git a/debian/maven.rules b/debian/maven.rules
index ee26074..980dae4 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -19,7 +19,7 @@ org.codehaus.groovy * * s/.*/2.x/ * *
 s/org.mozilla/rhino/ s/rhino/js/ * s/.*/debian/ * *
 s/org.jfree/jfree/ * * s/.*/debian/ * *
 s/commons-javaflow/org.apache.commons/ * * s/.*/debian/ * *
-org.apache.lucene lucene-core * s/4\..*/4.x/ * *
-org.apache.lucene lucene-analyzers-common * s/4\..*/4.x/ * *
-org.apache.lucene lucene-queryparser * s/4\..*/4.x/ * *
+org.apache.lucene lucene-core * s/4\..*/4.10.x/ * *
+org.apache.lucene lucene-analyzers-common * s/4\..*/4.10.x/ * *
+org.apache.lucene lucene-queryparser * s/4\..*/4.10.x/ * *
 
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index fa079a9..885f667 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -53,7 +53,7 @@ index cfa2166..1e1f061 100644
 +					<include name="**/jfreechart.jar"/>
 +					<include name="**/js.jar"/>
 +					<include name="**/jxl.jar"/>
-+					<include name="**/lucene-*-4*.jar"/>
++					<include name="**/lucene-*-4.10*.jar"/>
 +					<include name="**/mondrian.jar"/>
 +					<include name="**/olap4j*.jar"/>
 +					<include name="**/poi*.jar"/>

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