Jochen Sprickerhof pushed to branch master at Debian Java Maintainers / jameica
Commits: 51141f9d by Jochen Sprickerhof at 2023-02-28T11:33:08+01:00 Add more jars to the classpath Closes: #1032093 Thanks: Thomas Uhle - - - - - f035e4bd by Jochen Sprickerhof at 2023-02-28T11:33:47+01:00 Update changelog for 2.10.3+dfsg-2 release - - - - - 5 changed files: - debian/changelog - debian/control - debian/patches/0001-Update-locations-of-Java-libraries.patch - debian/patches/0002-Adopt-build.xml.patch - debian/patches/0004-Use-jameica-h2database.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +jameica (2.10.3+dfsg-2) unstable; urgency=medium + + * Add more jars to the classpath. + Thanks to Thomas Uhle (Closes: #1032093) + + -- Jochen Sprickerhof <[email protected]> Tue, 28 Feb 2023 11:33:43 +0100 + jameica (2.10.3+dfsg-1) unstable; urgency=medium * New upstream version 2.10.3+dfsg ===================================== debian/control ===================================== @@ -30,6 +30,7 @@ Depends: libactivation-java, libbcpkix-java, libbcprov-java, + libbcutil-java, libcommons-cli-java, libcommons-collections3-java, libcommons-lang-java, @@ -49,6 +50,7 @@ Depends: libjaxb-api-java, libjaxb-java, libmckoisqldb-java, + librhino-java, libmariadb-java, libnanoxml2-java, libpaperclips-java, ===================================== debian/patches/0001-Update-locations-of-Java-libraries.patch ===================================== @@ -3,14 +3,14 @@ Date: Thu, 24 May 2018 23:24:12 +0200 Subject: Update locations of Java libraries --- - build/build.properties | 58 +++++++++++++++++++++++++------------------------- - 1 file changed, 29 insertions(+), 29 deletions(-) + build/build.properties | 60 ++++++++++++++++++++++++++------------------------ + 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/build/build.properties b/build/build.properties -index fdf1a58..9e13673 100644 +index fdf1a58..9129414 100644 --- a/build/build.properties +++ b/build/build.properties -@@ -17,35 +17,35 @@ define.jarfilename.linuxarm64 = ${define.projectname}-linuxarm64.jar +@@ -17,35 +17,37 @@ define.jarfilename.linuxarm64 = ${define.projectname}-linuxarm64.jar define.jarfilename.openbsd = ${define.projectname}-openbsd.jar define.srcfilename = ${define.projectname}-${system.version}.src.zip define.javadocfilename = ${define.projectname}.javadoc.zip @@ -45,6 +45,7 @@ index fdf1a58..9e13673 100644 - lib/mckoi/mckoisqldb-1.0.5.jar \ +define.commonlibs = /usr/share/java/bcpkix.jar \ + /usr/share/java/bcprov.jar \ ++ /usr/share/java/bcutil.jar \ + /usr/share/java/javax.activation.jar \ + /usr/share/java/jaxb-api.jar \ + /usr/share/java/jaxb-runtime.jar \ @@ -71,6 +72,7 @@ index fdf1a58..9e13673 100644 + /usr/share/java/oro.jar \ + /usr/share/java/h2.jar \ + /usr/share/java/mckoisqldb.jar \ ++ /usr/share/java/js.jar \ + /usr/share/java/mariadb-java-client.jar \ img \ lang \ ===================================== debian/patches/0002-Adopt-build.xml.patch ===================================== @@ -8,10 +8,10 @@ Subject: Adopt build.xml 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build/build.properties b/build/build.properties -index 9e13673..758645d 100644 +index 9129414..cbd2de1 100644 --- a/build/build.properties +++ b/build/build.properties -@@ -53,7 +53,7 @@ define.commonlibs = /usr/share/java/bcpkix.jar \ +@@ -55,7 +55,7 @@ define.commonlibs = /usr/share/java/bcpkix.jar \ define.package = de.willuhn.jameica project.nightly = releases/nightly @@ -20,7 +20,7 @@ index 9e13673..758645d 100644 project.src = ${project.release}/src/classes project.tmp = ${project.release}/tmp project.javadoc = ${project.release}/javadoc -@@ -70,6 +70,7 @@ project.zipfilename.macos64 = ${define.projectname}-macos64-${system.versio +@@ -72,6 +72,7 @@ project.zipfilename.macos64 = ${define.projectname}-macos64-${system.versio project.zipfilename.macosaarch64 = ${define.projectname}-macos-aarch64-${system.version}.zip project.zipfilename.openbsd = ${define.projectname}-openbsd-${system.version}.zip ===================================== debian/patches/0004-Use-jameica-h2database.patch ===================================== @@ -7,15 +7,15 @@ Subject: Use jameica-h2database 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.properties b/build/build.properties -index 758645d..0c1af38 100644 +index cbd2de1..29d5cc6 100644 --- a/build/build.properties +++ b/build/build.properties -@@ -43,7 +43,7 @@ define.commonlibs = /usr/share/java/bcpkix.jar \ +@@ -44,7 +44,7 @@ define.commonlibs = /usr/share/java/bcpkix.jar \ /usr/share/java/swtcalendar.jar \ /usr/share/java/velocity.jar \ /usr/share/java/oro.jar \ - /usr/share/java/h2.jar \ + /usr/share/jameica/h2-1.4.197.jar \ /usr/share/java/mckoisqldb.jar \ + /usr/share/java/js.jar \ /usr/share/java/mariadb-java-client.jar \ - img \ View it on GitLab: https://salsa.debian.org/java-team/jameica/-/compare/fa6fa4a83ce6e8423000f16a5d4b87dbceac2e00...f035e4bd288e2ee615047e00477094eb89261c69 -- View it on GitLab: https://salsa.debian.org/java-team/jameica/-/compare/fa6fa4a83ce6e8423000f16a5d4b87dbceac2e00...f035e4bd288e2ee615047e00477094eb89261c69 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
