Bug#961275: buster-pu: package jameica/2.8.4+dfsg-1

2020-07-02 Thread Adam D. Barratt
Control: tags -1 + confirmed

On Fri, 2020-05-22 at 13:32 +0200, Jochen Sprickerhof wrote:
> I would like to update jameica in buster to allow use of SynTax, a
> jameica plugin not packaged in Debian. The attached patch adds
> mckoisqldb.jar to the classpath, as done by upstream and was only
> removed in debian/patches by accident. The dependency to
> libmckoisqldb-java is already fulfilled through jameica ->
> libjameica-datasource-java -> libmckoisqldb-java and only added to
> make it explicit.

I've been debating this, given the fact that the extra functionality
requires software outside of the archive.

On balance, please go ahead.

Regards,

Adam



Bug#961275: buster-pu: package jameica/2.8.4+dfsg-1

2020-05-22 Thread Jochen Sprickerhof
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian@packages.debian.org
Usertags: pu

Hi SRMs,

I would like to update jameica in buster to allow use of SynTax, a
jameica plugin not packaged in Debian. The attached patch adds
mckoisqldb.jar to the classpath, as done by upstream and was only
removed in debian/patches by accident. The dependency to
libmckoisqldb-java is already fulfilled through jameica ->
libjameica-datasource-java -> libmckoisqldb-java and only added to make
it explicit.
Due to the dependency already present and just adding an extra jar, I
don't expect side effects. This has also been tested in unstable and
testing.

The original problem was reported by a PureOS user via mail, so there is
no corresponding bug in the BTS, but I can create one if you want me to.

Cheers Jochen

-- System Information:
Debian Release: bullseye/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.6.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), 
LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
>From 36a0e90c15bef9fa07e7b6e35c73a3c7d32b5352 Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof 
Date: Thu, 14 May 2020 14:09:40 +0200
Subject: [PATCH] Add mckoisqldb to classpath

This is needed for SynTAX and was accidentally removed in
debian/patches/0001-*.patch.
---
 debian/changelog  |  8 
 debian/control|  1 +
 ...0005-Add-mckoisqldb.jar-to-classpath.patch | 20 +++
 debian/patches/series |  1 +
 4 files changed, 30 insertions(+)
 create mode 100644 debian/patches/0005-Add-mckoisqldb.jar-to-classpath.patch

diff --git a/debian/changelog b/debian/changelog
index 6835661..95cb534 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jameica (2.8.4+dfsg-1+deb10u1) buster; urgency=medium
+
+  * Add mckoisqldb to classpath.
+This is needed for SynTAX and was accidentally removed in
+debian/patches/0001-*.patch.
+
+ -- Jochen Sprickerhof   Thu, 14 May 2020 14:18:17 +0200
+
 jameica (2.8.4+dfsg-1) unstable; urgency=medium
 
   * New upstream version 2.8.4+dfsg
diff --git a/debian/control b/debian/control
index 6a719de..9919475 100644
--- a/debian/control
+++ b/debian/control
@@ -48,6 +48,7 @@ Depends:
  libjameica-util-java,
  libjaxb-api-java,
  libjaxb-java,
+ libmckoisqldb-java,
  libmariadb-java,
  libnanoxml2-java,
  libpaperclips-java,
diff --git a/debian/patches/0005-Add-mckoisqldb.jar-to-classpath.patch 
b/debian/patches/0005-Add-mckoisqldb.jar-to-classpath.patch
new file mode 100644
index 000..5628849
--- /dev/null
+++ b/debian/patches/0005-Add-mckoisqldb.jar-to-classpath.patch
@@ -0,0 +1,20 @@
+From: Jochen Sprickerhof 
+Date: Thu, 14 May 2020 14:04:46 +0200
+Subject: Add mckoisqldb.jar to classpath
+
+---
+ build/build.properties | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/build/build.properties b/build/build.properties
+index 27ed9b5..4383191 100644
+--- a/build/build.properties
 b/build/build.properties
+@@ -43,6 +43,7 @@ define.commonlibs   = /usr/share/java/bcpkix.jar 
\
+   /usr/share/java/velocity.jar \
+   /usr/share/java/oro.jar \
+   /usr/share/java/h2.jar \
++  /usr/share/java/mckoisqldb.jar \
+   /usr/share/java/mariadb-java-client.jar \
+   img \
+   lang \
diff --git a/debian/patches/series b/debian/patches/series
index 6fc9ea3..d628900 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Adopt-build.xml.patch
 0003-Adopt-jameica-executable.patch
 0004-mariadb.patch
+0005-Add-mckoisqldb.jar-to-classpath.patch
-- 
2.27.0.rc0