Emmanuel Bourg pushed to branch master at Debian Java Maintainers / h2database
Commits: 3a72ba80 by Emmanuel Bourg at 2018-08-20T22:57:51Z Reordered the patches - - - - - 98d6a656 by Emmanuel Bourg at 2018-08-20T23:00:44Z Removed the unused dependency on libequinox-osgi-java - - - - - b07abb2c by Emmanuel Bourg at 2018-08-20T23:00:59Z Upload to unstable - - - - - 6 changed files: - debian/changelog - debian/control - debian/patches/01-use-jar-files-from-debian.patch - debian/patches/03-osgi-compatibility.patch - debian/patches/04-reproducible-javadoc.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +h2database (1.4.197-2) unstable; urgency=medium + + * Team upload. + * Removed the unused dependency on libequinox-osgi-java + + -- Emmanuel Bourg <[email protected]> Tue, 21 Aug 2018 01:00:51 +0200 + h2database (1.4.197-1) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Uploaders: Emmanuel Bourg <[email protected]> Build-Depends: debhelper (>= 11), default-jdk, javahelper, - libequinox-osgi-java, libjts-java, liblucene3-java, libosgi-compendium-java, ===================================== debian/patches/01-use-jar-files-from-debian.patch ===================================== --- a/debian/patches/01-use-jar-files-from-debian.patch +++ b/debian/patches/01-use-jar-files-from-debian.patch @@ -10,11 +10,9 @@ Forwarded: not-needed src/tools/org/h2/build/Build.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -diff --git a/src/tools/org/h2/build/Build.java b/src/tools/org/h2/build/Build.java -index b1512d3..62b080e 100644 --- a/src/tools/org/h2/build/Build.java +++ b/src/tools/org/h2/build/Build.java -@@ -285,14 +285,13 @@ private void compile(boolean debugInfo, boolean clientOnly, +@@ -285,14 +285,12 @@ switchSource(debugInfo); clean(); mkdir("temp"); @@ -29,7 +27,6 @@ index b1512d3..62b080e 100644 + File.pathSeparator + "/usr/share/java/servlet-api-3.1.jar" + + File.pathSeparator + "/usr/share/java/lucene3-core.jar" + + File.pathSeparator + "/usr/share/java/slf4j-api.jar" + -+ File.pathSeparator + "/usr/share/java/org.eclipse.osgi.jar" + + File.pathSeparator + "/usr/share/java/osgi.compendium.jar" + + File.pathSeparator + "/usr/share/java/jts-core.jar" + File.pathSeparator + javaToolsJar; ===================================== debian/patches/03-osgi-compatibility.patch ===================================== --- a/debian/patches/03-osgi-compatibility.patch +++ b/debian/patches/03-osgi-compatibility.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/src/main/org/h2/util/OsgiDataSourceFactory.java +++ b/src/main/org/h2/util/OsgiDataSourceFactory.java -@@ -290,7 +290,7 @@ +@@ -288,7 +288,7 @@ */ static void registerService(BundleContext bundleContext, org.h2.Driver driver) { ===================================== debian/patches/04-reproducible-javadoc.patch ===================================== --- a/debian/patches/04-reproducible-javadoc.patch +++ b/debian/patches/04-reproducible-javadoc.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: no --- a/src/tools/org/h2/build/BuildBase.java +++ b/src/tools/org/h2/build/BuildBase.java -@@ -523,6 +523,10 @@ +@@ -524,6 +524,10 @@ * @param args the command line arguments to pass */ protected void javadoc(String...args) { ===================================== debian/patches/series ===================================== --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ +01-use-jar-files-from-debian.patch 03-osgi-compatibility.patch 04-reproducible-javadoc.patch -01-use-jar-files-from-debian.patch View it on GitLab: https://salsa.debian.org/java-team/h2database/compare/377aa429db1773d87e05783ba99ecff4d5bca41c...b07abb2c48166d88ca2429c18bd18609c1cf4d0f -- View it on GitLab: https://salsa.debian.org/java-team/h2database/compare/377aa429db1773d87e05783ba99ecff4d5bca41c...b07abb2c48166d88ca2429c18bd18609c1cf4d0f You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
