[lucene2] 85/104: * New upstream version: 2.9.4 * Change dependency on libdb4.7-java to libdb5.1-java (Closes: #621398) * Fixed debian/watch for new Apache archive repository layout

[Kai-Chung Yan]

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

seamlik-guest pushed a commit to branch master
in repository lucene2.

commit cf0d38e0d24b6773e88e81f5dada76d3c91a68aa
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date:   Fri Apr 22 17:42:50 2011 +0000

    * New upstream version: 2.9.4
    * Change dependency on libdb4.7-java to libdb5.1-java (Closes: #621398)
    * Fixed debian/watch for new Apache archive repository layout
---
 debian/ant.properties                        |  2 +-
 debian/changelog                             | 13 +++++--------
 debian/control                               |  4 ++--
 debian/patches/50_fix-contrib-db-libs.dpatch |  2 +-
 debian/watch                                 |  2 +-
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index 9aa8e88..3339ace 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -2,7 +2,7 @@
 
 # Version number for upstream source; errors in the 
 # upstream source require that it be overridden.
-version=2.9.3
+version=2.9.4
 
 # javacc settings used by Lucene build
 javacc.home=/usr/share/java
diff --git a/debian/changelog b/debian/changelog
index ac3ae07..4bf7cde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,15 @@
-lucene2 (2.9.4+ds1-0ubuntu1~ppa1) UNRELEASED; urgency=low
-
-  * New upstream version
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 10 Dec 2010 23:14:54 +0100
-
-lucene2 (2.9.3+ds1-2) UNRELEASED; urgency=low
+lucene2 (2.9.4+ds1-1) UNRELEASED; urgency=low
 
+  * New upstream version: 2.9.4
   * Added a Breaks: eclipse-platform (<= 3.5.2-6), forward-port from
     2.9.2+ds1-1squeeze1 (Closes: #595356)
   * Put lucli under update-alternatives control to allow liblucene3-java-contrib
     to take over
+  * Change dependency on libdb4.7-java to libdb5.1-java (Closes: #621398)
+  * Fixed debian/watch for new Apache archive repository layout
   * Bump standards version to 3.9.1 (no changes needed)
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 07 Sep 2010 21:29:21 +0200
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Thu, 21 Apr 2011 22:01:28 +0200
 
 lucene2 (2.9.3+ds1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index fa14f8d..f30d897 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: cdbs (>= 0.4.49), debhelper (>= 6), dpatch (>= 2.0),
 Build-Depends-Indep: libjline-java (>= 0.9.5), 
  libcommons-digester-java (>= 1.7), 
  libregexp-java (>= 1.4), 
- libdb4.7-java,
+ libdb5.1-java,
  libdb-je-java (>= 3.2.68),
  libcommons-collections3-java (>= 3.1), 
  libcommons-logging-java (>= 1.0.4), 
@@ -33,7 +33,7 @@ Recommends: libcommons-beanutils-java (>= 1.7.0),
  libcommons-compress-java (>= 1.0),
  libcommons-digester-java (>= 1.7), 
  libcommons-logging-java (>= 1.0.4), 
- libdb4.7-java,
+ libdb5.1-java,
  libdb-je-java (>= 3.2.68),
  libicu4j-java (>= 3.8.1),
  libjline-java (>= 0.9.5), 
diff --git a/debian/patches/50_fix-contrib-db-libs.dpatch b/debian/patches/50_fix-contrib-db-libs.dpatch
index 6395121..f55d9fc 100755
--- a/debian/patches/50_fix-contrib-db-libs.dpatch
+++ b/debian/patches/50_fix-contrib-db-libs.dpatch
@@ -19,7 +19,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  
    <path id="db.jar">
 -    <pathelement location="lib/db-${db.version}.jar" />
-+    <pathelement location="/usr/share/java/libdb4.7-java.jar" />
++    <pathelement location="/usr/share/java/libdb5.1-java.jar" />
    </path>
    
    <pathconvert property="project.classpath" targetos="unix" refid="db.jar" />
diff --git a/debian/watch b/debian/watch
index c69ac4b..447ffa8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/\+ds\d// \
-http://www.apache.org/dist/lucene/java/lucene-(2\.9.*)-src\.tar\.gz
+http://www.apache.org/dist/lucene/java/(2\.9\.\d)/lucene-(2\.9.\d)-src\.tar\.gz

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