[Git][java-team/jhighlight][master] 9 commits: Rewriting d/copyright
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Mon Feb 3 22:20:17 GMT 2025
Pierre Gruet pushed to branch master at Debian Java Maintainers / jhighlight
Commits:
a37e054c by Pierre Gruet at 2025-02-03T22:36:06+01:00
Rewriting d/copyright
- - - - -
cc5374ff by Pierre Gruet at 2025-02-03T22:36:44+01:00
Refreshing patches
- - - - -
34c2c8d8 by Pierre Gruet at 2025-02-03T22:37:24+01:00
Refreshing Build-Dependencies
- - - - -
f8a4e1b9 by Pierre Gruet at 2025-02-03T22:38:02+01:00
Using javahelper to manage Dependencies and the classpath of the jar
- - - - -
698abe86 by Pierre Gruet at 2025-02-03T22:38:14+01:00
Updating Maven rules
- - - - -
47a8054a by Pierre Gruet at 2025-02-03T22:38:33+01:00
Adding javahelper in d/rules
- - - - -
121d8c55 by Pierre Gruet at 2025-02-03T22:38:53+01:00
Marking the binary package as Multi-Arch: foreign
- - - - -
78597298 by Pierre Gruet at 2025-02-03T22:40:24+01:00
Updating changelog
- - - - -
bb559864 by Pierre Gruet at 2025-02-03T22:59:28+01:00
Upload to unstable
- - - - -
11 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/libjhighlight-java.classpath
- + debian/maven.ignoreRules
- debian/maven.rules
- − debian/patches/01-generate-highlighter.patch
- debian/patches/02-servlet-3.1-compatibility.patch
- − debian/patches/jflex-1.6.1.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,9 +1,18 @@
-jhighlight (1.1.0-1) UNRELEASED; urgency=medium
-
+jhighlight (1.1.0-1) unstable; urgency=medium
+
+ * Team upload
+ * Rewriting d/copyright
+ * Refreshing patches
+ * Refreshing Build-Dependencies (Closes: #1094847)
+ * Using javahelper to manage Dependencies and the classpath of the jar
+ * Updating Maven rules
+ * Adding javahelper in d/rules
+ * Marking the binary package as Multi-Arch: foreign
+
+ [ Andreas Tille ]
* New upstream version
- TODO: Finalise adapting to new upstream version
- -- Andreas Tille <tille at debian.org> Fri, 31 Jan 2025 18:27:06 +0100
+ -- Pierre Gruet <pgt at debian.org> Mon, 03 Feb 2025 22:59:10 +0100
jhighlight (1.0-4) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -5,11 +5,11 @@ Section: java
Priority: optional
Build-Depends: debhelper-compat (= 13),
default-jdk-headless,
- jflex,
- libservlet3.1-java,
- maven-debian-helper,
- libmaven-source-plugin-java,
- libmaven-compiler-plugin-java
+ javahelper,
+ junit4 <!nocheck>,
+ libcommons-io-java,
+ libservlet-api-java,
+ maven-debian-helper
Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/java-team/jhighlight
Vcs-Git: https://salsa.debian.org/java-team/jhighlight.git
@@ -17,7 +17,8 @@ Homepage: https://github.com/codelibs/jhighlight
Package: libjhighlight-java
Architecture: all
-Depends: ${maven:Depends},
+Multi-Arch: foreign
+Depends: ${java:Depends},
${misc:Depends}
Suggests: ${maven:OptionalDepends}
Description: Small embeddable Java library for syntax highlighting
=====================================
debian/copyright
=====================================
@@ -3,41 +3,60 @@ Upstream-Name: JHighlight
Source: https://github.com/codelibs/jhighlight
Files: *
-Copyright: 2000-2006, Omnicore Software, Hans Kratz & Dennis Strein GbR,
- 2000-2006, Geert Bevin <gbevin at uwyn.com>
- 2006, Arnout Engelen <arnouten at bzzt.net>
-License: LGPL-2.1+ or CDDL-1.0
+Copyright: 2000-2006 Omnicore Software, Hans Kratz & Dennis Strein GbR
+ 2000-2006 Geert Bevin <gbevin[remove] at uwyn dot com>
+ 2000-2006 Arnout Engelen <arnouten[remove] at bzzt dot net>
+License: CDDL-1.0 or LGPL-2.1+
-Files: src/com/uwyn/jhighlight/pcj/*
-Copyright: 2002-2003, Soen Bak
-Comment:
- Classes from the 'Primitive Collections for Java' project
- http://pcj.sourceforge.net
-License: LGPL-2.1+
+Files: src/*
+Copyright: 2002-2014 Sebastiano Vigna
+License: Apache-2.0
+
+Files: src/main/java/org/codelibs/jhighlight/JHighlight.java
+ src/main/java/org/codelibs/jhighlight/JHighlightVersion.java
+ src/main/java/org/codelibs/jhighlight/JHighlightVersionSingleton.java
+Copyright: 2001-2006 Geert Bevin <gbevin[remove] at uwyn dot com>
+License: CDDL-1.0 or LGPL-2.1+
+
+Files: src/main/java/org/codelibs/jhighlight/highlighter/*
+Copyright: 2000-2006, Omnicore Software, Hans Kratz & Dennis Strein GbR
+ 2001-2006 Geert Bevin <gbevin[remove] at uwyn dot com>
+License: CDDL-1.0 or LGPL-2.1+
+
+Files: src/main/java/org/codelibs/jhighlight/highlighter/CppHighlighter.flex
+ src/main/java/org/codelibs/jhighlight/highlighter/CppHighlighter.java
+Copyright: 2006 Arnout Engelen <arnouten[remove] at bzzt dot net>.
+ 2000-2006 Omnicore Software, Hans Kratz & Dennis Strein GbR
+ 2001-2006 Geert Bevin <gbevin[remove] at uwyn dot com>
+License: CDDL-1.0 or LGPL-2.1+
+
+Files: src/main/java/org/codelibs/jhighlight/renderer/*
+Copyright: 2001-2006, Geert Bevin <gbevin[remove] at uwyn dot com>
+License: CDDL-1.0 or LGPL-2.1+
+
+Files: src/main/java/org/codelibs/jhighlight/renderer/CppXhtmlRenderer.java
+Copyright: 2006 Arnout Engelen <arnouten[remove] at bzzt dot net>
+ 2004-2006 Geert Bevin <gbevin[remove] at uwyn dot com>
+License: CDDL-1.0 or LGPL-2.1+
+
+Files: src/main/java/org/codelibs/jhighlight/renderer/JavaScriptXhtmlRenderer.java
+Copyright: 2004-2006 Geert Bevin <gbevin[remove] at uwyn dot com>.
+ Ulf Dittmer (ulf[remove] at ulfdittmer dot com)
+License: CDDL-1.0 or LGPL-2.1+
+
+Files: src/main/java/org/codelibs/jhighlight/servlet/*
+Copyright: 2004-2006 Geert Bevin <gbevin[remove] at uwyn dot com>; and
+ Frederic Daoud <xf2697[remove] at fastmail dot fm>
+License: CDDL-1.0 or LGPL-2.1+
+
+Files: src/main/java/org/codelibs/jhighlight/tools/*
+Copyright: 2001-2006 Geert Bevin <gbevin[remove] at uwyn dot com>
+License: CDDL-1.0 or LGPL-2.1+
Files: debian/*
-Copyright: 2014, Emmanuel Bourg <ebourg at apache.org>
+Copyright: 2014 Emmanuel Bourg <ebourg at apache.org>
+ 2025 Pierre Gruet <pgt at debian.org>
License: Apache-2.0
- On Debian systems, the full text of the Apache-2.0 license
- can be found in the file '/usr/share/common-licenses/Apache-2.0'
-
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- On Debian systems, the full text of the LGPL-2.1 license
- can be found in the file '/usr/share/common-licenses/LGPL-2.1'
License: CDDL-1.0
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
@@ -423,3 +442,25 @@ License: CDDL-1.0
distribute such responsibility on an equitable basis. Nothing
herein is intended or shall be deemed to constitute any admission
of liability.
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the full text of the LGPL-2.1 license
+ can be found in the file '/usr/share/common-licenses/LGPL-2.1'
+
+License: Apache-2.0
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/Apache-2.0'
=====================================
debian/libjhighlight-java.classpath
=====================================
@@ -0,0 +1 @@
+usr/share/java/jhighlight.jar /usr/share/java/commons-io.jar /usr/share/java/servlet-api.jar
=====================================
debian/maven.ignoreRules
=====================================
@@ -0,0 +1,4 @@
+
+org.apache.maven.plugins maven-jar-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
=====================================
debian/maven.rules
=====================================
@@ -1,3 +1,2 @@
-com.uwyn jhighlight jar s/.*/debian/ * *
junit junit jar s/4\..*/4.x/ * *
=====================================
debian/patches/01-generate-highlighter.patch deleted
=====================================
@@ -1,20 +0,0 @@
-Description: Generate the C++ and Groovy highlighters from the flex files
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/build.xml
-+++ b/build.xml
-@@ -104,6 +104,14 @@
- destdir="${src.dir}"
- verbose="on"
- nobak="on"/>
-+ <jflex file="${src.dir}/com/uwyn/jhighlight/highlighter/CppHighlighter.flex"
-+ destdir="${src.dir}"
-+ verbose="on"
-+ nobak="on"/>
-+ <jflex file="${src.dir}/com/uwyn/jhighlight/highlighter/GroovyHighlighter.flex"
-+ destdir="${src.dir}"
-+ verbose="on"
-+ nobak="on"/>
- </target>
-
- <!-- =================================================================== -->
=====================================
debian/patches/02-servlet-3.1-compatibility.patch
=====================================
@@ -3,7 +3,15 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/src/main/java/org/codelibs/jhighlight/servlet/HighlightFilter.java
+++ b/src/main/java/org/codelibs/jhighlight/servlet/HighlightFilter.java
-@@ -244,5 +244,13 @@ public final class HighlightFilter imple
+@@ -20,6 +20,7 @@
+ import javax.servlet.ServletOutputStream;
+ import javax.servlet.ServletRequest;
+ import javax.servlet.ServletResponse;
++import javax.servlet.WriteListener;
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletRequestWrapper;
+ import javax.servlet.http.HttpServletResponse;
+@@ -244,5 +245,13 @@
{
return mOutput.toByteArray();
}
=====================================
debian/patches/jflex-1.6.1.patch deleted
=====================================
@@ -1,22 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Wed, 27 Jul 2016 16:36:26 +0200
-Subject: jflex 1.6.1
-
-Fix FTBFS by adjusting the jflex classname
----
- build.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build.xml b/build.xml
-index 37ce83e..94ee170 100644
---- a/build.xml
-+++ b/build.xml
-@@ -36,7 +36,7 @@
- </fileset>
- </path>
-
-- <taskdef classname="JFlex.anttask.JFlexTask" name="jflex" classpathref="lib.classpath"/>
-+ <taskdef classname="jflex.anttask.JFlexTask" name="jflex" classpathref="lib.classpath"/>
-
- <!-- =================================================================== -->
- <!-- Initialization target -->
=====================================
debian/patches/series
=====================================
@@ -1,3 +1 @@
-# 01-generate-highlighter.patch
02-servlet-3.1-compatibility.patch
-# jflex-1.6.1.patch
=====================================
debian/rules
=====================================
@@ -1,4 +1,4 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --with javahelper
View it on GitLab: https://salsa.debian.org/java-team/jhighlight/-/compare/05a68aa74fa37b7517e9e9300476774927f0a5cb...bb5598643114c4e63e222a6cf20277168a98f3a2
--
View it on GitLab: https://salsa.debian.org/java-team/jhighlight/-/compare/05a68aa74fa37b7517e9e9300476774927f0a5cb...bb5598643114c4e63e222a6cf20277168a98f3a2
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20250203/de99c08c/attachment.htm>
More information about the pkg-java-commits
mailing list