Emmanuel Bourg pushed to branch master at Debian Java Maintainers / 
openrefine-butterfly


Commits:
36e45a2a by Emmanuel Bourg at 2026-11-18T10:11:36+01:00
Fixed the build failure with Velocity 2

- - - - -
feaf30b0 by Emmanuel Bourg at 2026-11-18T10:12:55+01:00
Standards-Version updated to 4.7.4

- - - - -
e9f2bd56 by Emmanuel Bourg at 2026-11-18T10:12:55+01:00
Removed the Priority field

- - - - -
f0f95916 by Emmanuel Bourg at 2026-11-18T10:13:16+01:00
Converted debian/watch to the version 5 format

- - - - -
7e7b3b36 by Emmanuel Bourg at 2026-11-18T10:13:16+01:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/patches/series
- + debian/patches/velocity2-compatibility.patch
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+openrefine-butterfly (1.2.6-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Velocity 2
+  * Standards-Version updated to 4.7.4
+  * Removed the Priority field
+  * Converted debian/watch to the version 5 format
+
+ -- Emmanuel Bourg <[email protected]>  Wed, 18 Nov 2026 10:13:16 +0100
+
 openrefine-butterfly (1.2.6-1) unstable; urgency=medium
 
   * New upstream version 1.2.6.


=====================================
debian/control
=====================================
@@ -1,6 +1,5 @@
 Source: openrefine-butterfly
 Section: java
-Priority: optional
 Maintainer: Debian Java Maintainers 
<[email protected]>
 Uploaders:
  Markus Koschany <[email protected]>
@@ -17,7 +16,7 @@ Build-Depends:
  libslf4j-java,
  maven-debian-helper,
  velocity
-Standards-Version: 4.7.0
+Standards-Version: 4.7.4
 Vcs-Git: https://salsa.debian.org/java-team/openrefine-butterfly.git
 Vcs-Browser: https://salsa.debian.org/java-team/openrefine-butterfly
 Homepage: https://github.com/OpenRefine/simile-butterfly


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 getAllowRendering.patch
+velocity2-compatibility.patch


=====================================
debian/patches/velocity2-compatibility.patch
=====================================
@@ -0,0 +1,34 @@
+Description: Fix the compatibility with Velocity 2 (getResourceStream() was 
replaced by getResourceReader())
+Author: Emmanuel Bourg <[email protected]>
+Forwarded: no
+--- a/main/src/edu/mit/simile/butterfly/velocity/ButterflyResourceLoader.java
++++ b/main/src/edu/mit/simile/butterfly/velocity/ButterflyResourceLoader.java
+@@ -1,6 +1,7 @@
+ package edu.mit.simile.butterfly.velocity;
+ 
+-import java.io.InputStream;
++import java.io.InputStreamReader;
++import java.io.Reader;
+ import java.net.URL;
+ import java.net.URLConnection;
+ 
+@@ -37,8 +38,8 @@
+     }
+ 
+     @Override
+-    public synchronized InputStream getResourceStream(String name) throws 
ResourceNotFoundException {
+-        InputStream result = null;
++    public synchronized Reader getResourceReader(String name, String 
encoding) throws ResourceNotFoundException {
++        Reader result = null;
+         
+         if (name == null || name.length() == 0) {
+             throw new ResourceNotFoundException ("No template name provided");
+@@ -47,7 +48,7 @@
+         URL url = getResource(name);
+         if (url != null) {
+             try {
+-                result = url.openStream();
++                result = new InputStreamReader(url.openStream(), encoding);
+             } catch (Exception e) {
+                 _logger.error("Error opening stream", e);
+                 throw new ResourceNotFoundException(e.getMessage());


=====================================
debian/watch
=====================================
@@ -1,3 +1,5 @@
-version=4
-opts="repack,compression=xz" \
-https://github.com/OpenRefine/simile-butterfly/tags 
.*/(?:.*?)([\d\.]+)\.tar\.gz
+Version: 5
+Template: GitHub
+Owner: OpenRefine
+Project: simile-butterfly
+Compression: xz



View it on GitLab: 
https://salsa.debian.org/java-team/openrefine-butterfly/-/compare/80ace43f8583274ed53474aee6744dbfdb6593b6...7e7b3b36577840cd148a622b1ec1bb34116722d2

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/openrefine-butterfly/-/compare/80ace43f8583274ed53474aee6744dbfdb6593b6...7e7b3b36577840cd148a622b1ec1bb34116722d2
You're receiving this email because of your account on salsa.debian.org. Manage 
all notifications: https://salsa.debian.org/-/profile/notifications | Help: 
https://salsa.debian.org/help


_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to