[Git][java-team/javahelp2][master] 9 commits: Build the search index in a reproducible order
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Fri Oct 16 17:06:32 BST 2026
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / javahelp2
Commits:
ec868727 by Emmanuel Bourg at 2026-10-16T16:00:59+02:00
Build the search index in a reproducible order
- - - - -
6de1254e by Emmanuel Bourg at 2026-10-16T16:37:35+02:00
Standards-Version updated to 4.7.4
- - - - -
3fa5924a by Emmanuel Bourg at 2026-10-16T16:38:07+02:00
Removed the Priority field
- - - - -
48dd4681 by Emmanuel Bourg at 2026-10-16T16:41:14+02:00
Converted debian/watch to the version 5 format
- - - - -
c8f71372 by Emmanuel Bourg at 2026-10-16T17:28:44+02:00
Converted debian/copyright to the Copyright Format 1.0
- - - - -
d7d73456 by Emmanuel Bourg at 2026-10-16T17:30:10+02:00
Removed the javahelp2-doc package
- - - - -
a47d8dc6 by Emmanuel Bourg at 2026-10-16T17:40:36+02:00
Removed Marek Slama and Varun Hiremath from the uploaders (Closes: #1141930, #1145215)
- - - - -
115958c6 by Emmanuel Bourg at 2026-10-16T17:43:55+02:00
Added myself to the uploaders
- - - - -
1861447f by Emmanuel Bourg at 2026-10-16T17:44:25+02:00
Upload to unstable
- - - - -
9 changed files:
- debian/ant.properties
- debian/changelog
- debian/control
- debian/copyright
- − debian/javahelp2-doc.install
- + debian/patches/reproducible-search-index.patch
- debian/patches/series
- debian/rules
- debian/watch
Changes:
=====================================
debian/ant.properties
=====================================
@@ -1,5 +1,4 @@
jdic-jar-present=true
jdic-zip-present=true
-dist.javadoc.dir=dist/lib/api
servlet-jar-present=true
tomcat-zip-present=true
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+javahelp2 (2.0.05.ds1-11) unstable; urgency=medium
+
+ * Build the search index in a reproducible order
+ * Standards-Version updated to 4.7.4
+ * Removed the Priority field
+ * Converted debian/watch to the version 5 format
+ * Converted debian/copyright to the Copyright Format 1.0
+ * Removed the javahelp2-doc package
+ * Removed Marek Slama and Varun Hiremath from the uploaders
+ (Closes: #1141930, #1145215)
+ * Added myself to the uploaders
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 16 Oct 2026 17:44:07 +0200
+
javahelp2 (2.0.05.ds1-10) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -1,10 +1,7 @@
Source: javahelp2
Section: java
-Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders:
- Marek Slama <marek.slama at sun.com>,
- Varun Hiremath <varun at debian.org>
+Uploaders: Emmanuel Bourg <ebourg at apache.org>
Build-Depends:
ant-optional,
debhelper-compat (= 13),
@@ -14,7 +11,7 @@ Build-Depends:
libjsp-api-java,
libservlet-api-java,
maven-repo-helper
-Standards-Version: 4.6.1
+Standards-Version: 4.7.4
Vcs-Git: https://salsa.debian.org/java-team/javahelp2.git
Vcs-Browser: https://salsa.debian.org/java-team/javahelp2
Homepage: http://javahelp.java.net
@@ -22,7 +19,6 @@ Homepage: http://javahelp.java.net
Package: javahelp2
Architecture: all
Depends: ${misc:Depends}, default-jre | java2-runtime
-Suggests: javahelp2-doc
Description: Java based help system
The JavaHelp system is an online help system that developers can use to add
online help to their Java platform applications. The JavaHelp system provides
@@ -35,20 +31,3 @@ Description: Java based help system
as Swing), provides a standard interface that enables both application
developers and authors to add online help to their applications.
-Package: javahelp2-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Description: Java based help system - contains Javadoc API documentation
- The JavaHelp system is an online help system that developers can use to add
- online help to their Java platform applications. The JavaHelp system provides
- developers and authors with a standard, fully featured, easy to use system for
- presenting online information to Java application users. The JavaHelp system
- consists of a fully featured, extensible specification and API, and
- a reference implementation of that specification and API that is written
- entirely in the Java programming language. The JavaHelp system reference
- implementation, based on the Java Foundation Classes (JFC, also known
- as Swing), provides a standard interface that enables both application
- developers and authors to add online help to their applications.
- .
- This package contains Javadoc API documentation.
=====================================
debian/copyright
=====================================
@@ -1,67 +1,66 @@
-This package was debianized by Marek Slama <marek.slama at sun.com> on
-18-May-2007.
-
-Upstream downloaded from:
- https://javahelp.dev.java.net/files/documents/5985/59373/javahelp2-src-2.0.05.zip
-
-Upstream home page:
- http://javahelp.java.net
-
-Authors:
-
- Sun Microsystems, Inc.
-
-Copyright:
-
- - - - - - copyright notice and license for Debian packaging - - - - -
-
-Copyright 2007 Sun Microsystems, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- - - - - - copyright notice and license for upstream - - - - -
-
-Copyright 2007 Sun Microsystems, Inc.
-
-Use of this software is governed by the terms of the license below:
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-Javahelp package also integrates some icons from the Tango
-Project ( http://tango.freedesktop.org/Tango_Desktop_Project ).
-
-All files are stored in debian/icons/
-
-The Tango base icon theme is released to the Public Domain.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: JavaHelp
+Source: https://github.com/javaee/javahelp
+Comment: The package was originally built from
+ https://javahelp.dev.java.net/files/documents/5985/59373/javahelp2-src-2.0.05.zip
+ before the project moved to GitHub.
+
+Files: *
+Copyright: 2006-2007, Sun Microsystems, Inc.
+License: GPL-2 with Classpath exception
+ On Debian systems, the full text of the GPL-2 license
+ can be found in the file '/usr/share/common-licenses/GPL-2'
+ .
+ "CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+ .
+ Certain source files distributed by Oracle are subject to the following
+ clarification and special exception to the GPL Version 2, but only where
+ Oracle has expressly included in the particular source file's header the words
+ "Oracle designates this particular file as subject to the "Classpath"
+ exception as provided by Oracle in the License file that accompanied this
+ code."
+ .
+ Linking this library statically or dynamically with other modules is making a
+ combined work based on this library. Thus, the terms and conditions of the
+ GNU General Public License Version 2 cover the whole combination.
+ .
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent modules, and
+ to copy and distribute the resulting executable under terms of your choice,
+ provided that you also meet, for each linked independent module, the terms and
+ conditions of the license of that module. An independent module is a module
+ which is not derived from or based on this library. If you modify this
+ library, you may extend this exception to your version of the library, but you
+ are not obligated to do so. If you do not wish to do so, delete this
+ exception statement from your version.
+
+Files: debian/*
+Copyright: 2007, Marek Slama <marek.slama at sun.com>
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Files: debian/icons/*
+Copyright: Tango Desktop Project
+Comment: The icons come from the Tango base icon theme
+ (http://tango.freedesktop.org/Tango_Desktop_Project),
+ which is released to the Public Domain.
+License: public-domain
+ The Tango base icon theme is released to the Public Domain.
=====================================
debian/javahelp2-doc.install deleted
=====================================
@@ -1,2 +0,0 @@
-javahelp_nbproject/dist/lib/api /usr/share/doc/javahelp2-doc/
-
=====================================
debian/patches/reproducible-search-index.patch
=====================================
@@ -0,0 +1,18 @@
+Description: Build the search index in a reproducible order
+ The indexer walks the help files in the order returned by File.list(), which is
+ unspecified, so the DOCS, DOCS.TAB, OFFSETS, POSITIONS and TMAP files of the
+ search database differ from one build to the next.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/jhMaster/JSearch/indexer/com/sun/java/help/search/Indexer.java
++++ b/jhMaster/JSearch/indexer/com/sun/java/help/search/Indexer.java
+@@ -277,6 +277,9 @@
+ File tstfile = new File (file);
+ if (tstfile.isDirectory()) {
+ String list[] = tstfile.list();
++ // File.list() returns the entries in an unspecified order, sort them
++ // to build the search index reproducibly
++ java.util.Arrays.sort(list);
+ for (int i=0; i < list.length; i++) {
+ files = loadFiles (tstfile.getPath() +
+ File.separator +
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
jhindexer.patch
jhsearch.patch
iconsPath.patch
+reproducible-search-index.patch
=====================================
debian/rules
=====================================
@@ -20,6 +20,6 @@ override_dh_auto_build:
convert $$file +set date:create +set date:modify -define png:exclude-chunk=time $(CURDIR)/jhMaster/JavaHelp/src/new/javax/help/plaf/basic/images/$$fileTarget; \
done
- dh_auto_build -- -f javahelp_nbproject/build.xml release javadoc
+ dh_auto_build -- -f javahelp_nbproject/build.xml release
override_dh_auto_clean:
=====================================
debian/watch
=====================================
@@ -1,3 +1,7 @@
-version=4
-opts="dversionmangle=s/.ds[0-9]//g,uversionmangle=s/_/./g" \
-https://github.com/javaee/javahelp/tags .*/([\d\._]+)
+Version: 5
+Mode: git
+Source: https://github.com/javaee/javahelp.git
+Matching-Pattern: refs/tags/([\d._]+)
+Uversion-Mangle: s/_/./g
+Dversion-Mangle: s/\.ds[0-9]+$//
+Compression: xz
View it on GitLab: https://salsa.debian.org/java-team/javahelp2/-/compare/b0831910ae0a1a394792669a3bd4f9b854c87d2b...1861447fdbf7956081fdc43694c477a800039b4b
--
View it on GitLab: https://salsa.debian.org/java-team/javahelp2/-/compare/b0831910ae0a1a394792669a3bd4f9b854c87d2b...1861447fdbf7956081fdc43694c477a800039b4b
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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20261016/1f6b1373/attachment.htm>
More information about the pkg-java-commits
mailing list