[Git][java-team/h2database][master] 5 commits: Wrap and sort

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / h2database


Commits:
cefe0863 by Emmanuel Bourg at 2018-12-03T22:45:30Z
Wrap and sort

- - - - -
189aca39 by Emmanuel Bourg at 2018-12-03T22:45:45Z
Removed the get-orig-source target in debian/rules

- - - - -
af82795e by Emmanuel Bourg at 2018-12-03T22:46:02Z
Use salsa.debian.org Vcs-* URLs

- - - - -
252bd396 by Emmanuel Bourg at 2018-12-03T23:34:46Z
Depend on liblucene4.10-java instead of liblucene3-java

- - - - -
67a9a595 by Emmanuel Bourg at 2018-12-03T23:35:45Z
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/libh2-java.classpath
- debian/patches/01-use-jar-files-from-debian.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+h2database (1.4.197-4) unstable; urgency=medium
+
+  * Depend on liblucene4.10-java instead of liblucene3-java
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 04 Dec 2018 00:35:36 +0100
+
 h2database (1.4.197-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -3,24 +3,28 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 11),
-               default-jdk,
-               javahelper,
-               libjts-java,
-               liblucene3-java,
-               libosgi-compendium-java,
-               libservlet3.1-java,
-               libslf4j-java,
-               maven-repo-helper
+Build-Depends:
+ debhelper (>= 11),
+ default-jdk,
+ javahelper,
+ libjts-java,
+ liblucene4.10-java,
+ libosgi-compendium-java,
+ libservlet3.1-java,
+ libslf4j-java,
+ maven-repo-helper
 Standards-Version: 4.2.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/h2database.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/h2database.git
+Vcs-Git: https://salsa.debian.org/java-team/h2database.git
+Vcs-Browser: https://salsa.debian.org/java-team/h2database
 Homepage: http://www.h2database.com
 
 Package: libh2-java
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libjts-java, liblucene3-java, libslf4j-java
+Suggests:
+ libjts-java,
+ liblucene4.10-java,
+ libslf4j-java
 Description: H2 Database Engine
  H2 is a relational database management system supporting a subset
  of the SQL standard. The main programming APIs are SQL and JDBC,


=====================================
debian/libh2-java.classpath
=====================================
@@ -1 +1 @@
-usr/share/java/h2.jar /usr/share/java/lucene3-core.jar /usr/share/java/slf4j-api.jar
+usr/share/java/h2.jar /usr/share/java/lucene-core-4.10.4.jar /usr/share/java/slf4j-api.jar


=====================================
debian/patches/01-use-jar-files-from-debian.patch
=====================================
@@ -12,7 +12,7 @@ Forwarded: not-needed
 
 --- a/src/tools/org/h2/build/Build.java
 +++ b/src/tools/org/h2/build/Build.java
-@@ -285,14 +285,12 @@
+@@ -285,14 +285,14 @@
          switchSource(debugInfo);
          clean();
          mkdir("temp");
@@ -25,7 +25,9 @@ Forwarded: not-needed
 -                File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
 -                File.pathSeparator + "ext/jts-core-1.15.0.jar" +
 +                File.pathSeparator + "/usr/share/java/servlet-api-3.1.jar" +
-+                File.pathSeparator + "/usr/share/java/lucene3-core.jar" +
++                File.pathSeparator + "/usr/share/java/lucene-analyzers-common-4.10.4.jar" +
++                File.pathSeparator + "/usr/share/java/lucene-core-4.10.4.jar" +
++                File.pathSeparator + "/usr/share/java/lucene-queryparser-4.10.4.jar" +
 +                File.pathSeparator + "/usr/share/java/slf4j-api.jar" +
 +                File.pathSeparator + "/usr/share/java/osgi.compendium.jar" +
 +                File.pathSeparator + "/usr/share/java/jts-core.jar" +


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
 03-osgi-compatibility.patch
 04-reproducible-javadoc.patch
 TestCrashAPI.patch
+06-lucene-compatibility.patch


=====================================
debian/rules
=====================================
@@ -25,6 +25,3 @@ override_dh_auto_clean:
 	find src -type f -exec sed -i 's/\/\/## Java/\/*## Java/g' {} \;
 	mh_clean
 	dh_auto_clean
-
-get-orig-source:
-	uscan --download-current-version --force-download --no-symlink



View it on GitLab: https://salsa.debian.org/java-team/h2database/compare/1bc0dbb4850fc29c1bdb654e160d76e6f06c6d5f...67a9a59513d94eae3782e520c0d9653d9e8f419f

-- 
View it on GitLab: https://salsa.debian.org/java-team/h2database/compare/1bc0dbb4850fc29c1bdb654e160d76e6f06c6d5f...67a9a59513d94eae3782e520c0d9653d9e8f419f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181204/bcb3a03e/attachment.html>