On Thu, 20 Mar 2025 15:33:49 +0100 Bastian Germann wrote:
Please remove jython support so that it can be autoremoved (it is RC
buggy for quite a while).I am uploading a NMU to DELAYED/1 to implement this
for trixie.
Please find the debdiff attached.
diff -Nru libfreemarker-java-2.3.32/debian/changelog
libfreemarker-java-2.3.32/debian/changelog
--- libfreemarker-java-2.3.32/debian/changelog 2024-02-28 06:20:10.000000000
+0000
+++ libfreemarker-java-2.3.32/debian/changelog 2025-04-03 20:52:34.000000000
+0000
@@ -1,3 +1,10 @@
+libfreemarker-java (2.3.32-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Drop jython support (Closes: #877387)
+
+ -- Bastian Germann <b...@debian.org> Thu, 03 Apr 2025 20:52:34 +0000
+
libfreemarker-java (2.3.32-2) unstable; urgency=medium
* Team upload.
diff -Nru libfreemarker-java-2.3.32/debian/control
libfreemarker-java-2.3.32/debian/control
--- libfreemarker-java-2.3.32/debian/control 2024-02-28 06:20:10.000000000
+0000
+++ libfreemarker-java-2.3.32/debian/control 2025-04-03 20:52:34.000000000
+0000
@@ -17,7 +17,6 @@
ivy-debian-helper,
javacc5,
junit,
- jython (>= 2.5.3-10~),
libcommons-io-java,
libcommons-jxpath-java,
libcommons-logging-java,
@@ -45,7 +44,6 @@
Architecture: all
Depends: ${misc:Depends}
Suggests:
- jython,
libdom4j-java,
libjaxen-java,
libjdom1-java,
diff -Nru libfreemarker-java-2.3.32/debian/patches/disable-rmic.patch
libfreemarker-java-2.3.32/debian/patches/disable-rmic.patch
--- libfreemarker-java-2.3.32/debian/patches/disable-rmic.patch 2024-02-28
06:20:10.000000000 +0000
+++ libfreemarker-java-2.3.32/debian/patches/disable-rmic.patch 2025-04-03
20:52:34.000000000 +0000
@@ -17,7 +17,7 @@
<javac srcdir="build/src-main-java-filtered" destdir="build/classes"
deprecation="off"
debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
@@ -323,11 +317,6 @@
- freemarker/ext/jython/_Jython22VersionAdapter.java"
+ freemarker/ext/jython/_Jython25VersionAdapter.java"
/>
- <rmic base="build/classes" classpathref="ivy.dep"
diff -Nru libfreemarker-java-2.3.32/debian/patches/drop-jython.patch
libfreemarker-java-2.3.32/debian/patches/drop-jython.patch
--- libfreemarker-java-2.3.32/debian/patches/drop-jython.patch 1970-01-01
00:00:00.000000000 +0000
+++ libfreemarker-java-2.3.32/debian/patches/drop-jython.patch 2025-04-03
20:52:34.000000000 +0000
@@ -0,0 +1,60 @@
+Description: Drop jython support
+Author: Bastian Germann <b...@debian.org>
+Bug-Debian: https://bugs.debian.org/877387
+---
+--- libfreemarker-java-2.3.32.orig/build.xml
++++ libfreemarker-java-2.3.32/build.xml
+@@ -302,40 +302,6 @@
+ freemarker/ext/jsp/FreeMarkerJspApplicationContext.java"
+ />
+
+- <ivy:cachepath conf="build.jython2.0" pathid="ivy.dep.jython2.0" />
+- <javac srcdir="build/src-main-java-filtered" destdir="build/classes"
deprecation="off"
+- debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
+- includeantruntime="false"
+- classpathref="ivy.dep.jython2.0"
+- bootclasspath="${boot.classpath.j2se1.7}"
+- includes="
+- freemarker/ext/ant/**,
+- freemarker/template/utility/JythonRuntime.java,
+- freemarker/ext/jython/**"
+- excludes="
+- freemarker/ext/jython/_Jython22VersionAdapter.java,
+- freemarker/ext/jython/_Jython25VersionAdapter.java"
+- />
+-
+- <ivy:cachepath conf="build.jython2.2" pathid="ivy.dep.jython2.2" />
+- <javac srcdir="build/src-main-java-filtered" destdir="build/classes"
deprecation="off"
+- debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
+- includeantruntime="false"
+- classpathref="ivy.dep.jython2.2"
+- bootclasspath="${boot.classpath.j2se1.7}"
+- includes="
+- freemarker/ext/jython/_Jython22VersionAdapter.java"
+- />
+-
+- <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" />
+- <javac srcdir="build/src-main-java-filtered" destdir="build/classes"
deprecation="off"
+- debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
+- includeantruntime="false"
+- classpathref="ivy.dep.jython2.5"
+- bootclasspath="${boot.classpath.j2se1.7}"
+- includes="
+- freemarker/ext/jython/_Jython25VersionAdapter.java"
+- />
+
+ <copy toDir="build/classes">
+ <fileset dir="src/main/resources"
+--- libfreemarker-java-2.3.32.orig/ivy.xml
++++ libfreemarker-java-2.3.32/ivy.xml
+@@ -113,10 +113,6 @@
+
+ <dependency org="rhino" name="js" rev="1.6R1" conf="build.base->default"
/>
+
+- <!-- We use Jython 2.1 because there was no 2.0 in central; the relevant
methods are the same. -->
+- <dependency org="jython" name="jython" rev="2.1"
conf="build.jython2.0->default" />
+- <dependency org="org.python" name="jython" rev="2.2.1"
conf="build.jython2.2->default" />
+- <dependency org="org.python" name="jython" rev="2.5.0"
conf="build.jython2.5->default" />
+
+ <dependency org="avalon-logkit" name="avalon-logkit" rev="2.0"
conf="build.base->default" />
+ <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}"
conf="build.base->default" />
diff -Nru libfreemarker-java-2.3.32/debian/patches/series
libfreemarker-java-2.3.32/debian/patches/series
--- libfreemarker-java-2.3.32/debian/patches/series 2024-02-28
06:20:10.000000000 +0000
+++ libfreemarker-java-2.3.32/debian/patches/series 2025-04-03
20:52:34.000000000 +0000
@@ -3,7 +3,7 @@
jsp_api.diff
fix-unmappable-character.patch
exclude-avalon-logger.patch
-jython-compatibility.patch
fix-tests-classpath.patch
disable-rmic.patch
workaround-doctype-decl.patch
+drop-jython.patch
