Hi there,
meanwhile, version 1.28.0 has been released upstream. Please find the
updated patch series below.
Also, I have realised that I am probably not asking for a NMU because I
am not a Debian developer myself. Can anyone review the patches and help
to get a new version uploaded?
Thank you in advance,
Elias
>From ea1161185c01a2510ba6c7d07b0d98009b78d5b4 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Wed, 19 Apr 2023 10:00:55 +0200
Subject: [PATCH 01/18] Tighten version pattern in watch file and fix orig
package name
Make sure that the minor version number is even since this is what
upstream considers a production release.
---
debian/watch | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/watch b/debian/watch
index d69f157..d9757eb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
-version=3
-https://github.com/openpreserve/jhove/tags .*/(?:.*?)([\d\.]+)\.tar\.gz
+version=4
+opts="filenamemangle=s%.*/v(@ANY_VERSION@@ARCHIVE_EXT@)$%@PACKAGE@-$1%" \
+ https://github.com/openpreserve/jhove/tags \
+ .*/v(\d+\.\d*[02468](?:\.\d+)*)@ARCHIVE_EXT@
--
2.25.1
>From 90760ff3afac0c1ea82f51c0d79bb42ac8fe5439 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Thu, 20 Apr 2023 19:01:30 +0200
Subject: [PATCH 02/18] Remove ICC profiles and jar files from source for DFSG
compliance
Remove DFSG violating files from the source tarball and move this
application back to the main archive area of the distribution.
Note that the deleted ICC profiles are shipped with Debian in the
icc-profiles package (non-free). They are used by the test suite only,
hence neither required at build nor at run time. The removed JAR files
provide dependencies for code in the jhove-ext-modules directory that
are sadly missing from the Debian archive. Since previous versions of
this Debian package did not build the jhove-ext-modules either,
removing those JAR files should not introduce any regression in
Debian.
Bug-Debian: https://bugs.debian.org/1008969
---
debian/README.source | 9 +++++++++
debian/control | 2 +-
debian/copyright | 4 ++++
debian/watch | 2 +-
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index a2eef8e..c12bdd6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -7,3 +7,12 @@ from the maven-debian-helper package.
The build system uses Maven but prevents it from downloading
anything from the Internet, making the build compliant with
the Debian policy.
+
+Due to DFSG issues, upstream source has been repackaged without
+various JAR files as well as two ICC profiles. This does not impose
+any restrictions on building and using the application including its
+internal modules. The test suite and code from the jhove-ext-modules
+directory cannot be built, however, because some dependencies have not
+been packaged for Debian yet. Note that the deleted ICC profiles (used
+as resources in the test suite) are shipped with Debian in the
+non-free icc-profiles package.
diff --git a/debian/control b/debian/control
index 29a1bb3..9b4f96e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: jhove
-Section: non-free/utils
+Section: utils
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org>
Uploaders: Jeff Breidenbach <j...@debian.org>
diff --git a/debian/copyright b/debian/copyright
index eef25a8..5196e63 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,10 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: JHOVE - JSTOR/Harvard Object Validation Environment
Upstream-Contact: http://jenkins.opf-labs.org
Source: https://github.com/openpreserve/jhove/
+Files-Excluded:
+ */*.jar
+ lib
+ jhove-core/src/test/resources/edu/harvard/hul/ois/jhove/*.icc
Files: *
Copyright: 2008-2018, The Open Preservation Foundation
diff --git a/debian/watch b/debian/watch
index d9757eb..b579ba8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=4
-opts="filenamemangle=s%.*/v(@ANY_VERSION@@ARCHIVE_EXT@)$%@PACKAGE@-$1%" \
+opts="filenamemangle=s%.*/v(@ANY_VERSION@@ARCHIVE_EXT@)$%@PACKAGE@-$1%,dversionmangle=auto,repacksuffix=+dfsg1" \
https://github.com/openpreserve/jhove/tags \
.*/v(\d+\.\d*[02468](?:\.\d+)*)@ARCHIVE_EXT@
--
2.25.1
>From 77c40ead666f659852f634424a73c8e5471f2ad9 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Fri, 21 Apr 2023 16:46:25 +0200
Subject: [PATCH 03/18] Fetch source via mode=git and verify signed tag
---
debian/upstream/signing-key.asc | 41 +++++++++++++++++++++++++++++++++
debian/watch | 6 ++---
2 files changed, 44 insertions(+), 3 deletions(-)
create mode 100644 debian/upstream/signing-key.asc
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..82024b0
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,41 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+ir1uC/ljOeBSv+be5IC911oFIcVywHHC1mk=
+=vdEm
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index b579ba8..0b97eec 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=4
-opts="filenamemangle=s%.*/v(@ANY_VERSION@@ARCHIVE_EXT@)$%@PACKAGE@-$1%,dversionmangle=auto,repacksuffix=+dfsg1" \
- https://github.com/openpreserve/jhove/tags \
- .*/v(\d+\.\d*[02468](?:\.\d+)*)@ARCHIVE_EXT@
+opts="mode=git,pgpmode=gittag,filenamemangle=s%.*/v(@ANY_VERSION@)$%@PACKAGE@-$1%,dversionmangle=auto,repacksuffix=+dfsg1" \
+ https://github.com/openpreserve/jhove.git \
+ ^refs/tags/v(\d+\.\d*[02468](?:\.\d+)*)$
--
2.25.1
>From f14ebfd4b75bf1d1bf0ee482504c9f660e506cbc Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Thu, 27 Apr 2023 14:50:18 +0200
Subject: [PATCH 04/18] Bump Standards-Version to 4.6.2 (no changes)
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 9b4f96e..2b89021 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 11),
default-jdk,
libjaxb-api-java,
maven-debian-helper (>= 2.1)
-Standards-Version: 4.3.0
+Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/java-team/jhove.git
Vcs-Browser: https://salsa.debian.org/java-team/jhove
Homepage: https://github.com/openpreserve/jhove/
--
2.25.1
>From 5c643b982a72e80dfe0338b9da38a12cccbbb923 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Mon, 24 Apr 2023 10:33:08 +0200
Subject: [PATCH 05/18] Update debian/copyright
---
debian/copyright | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/copyright b/debian/copyright
index 5196e63..8532c8f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ Files-Excluded:
jhove-core/src/test/resources/edu/harvard/hul/ois/jhove/*.icc
Files: *
-Copyright: 2008-2018, The Open Preservation Foundation
+Copyright: 2008-2023, The Open Preservation Foundation
License: LGPL-2.1
Files: debian/*
--
2.25.1
>From d178d851791a1212a7e87d49cb5136b56cb39539 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Thu, 27 Apr 2023 15:41:06 +0200
Subject: [PATCH 06/18] Add dependencies on libjaxb-java and libjsonp-java
---
debian/control | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 2b89021..c1d516a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,11 @@ Maintainer: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.or
Uploaders: Jeff Breidenbach <j...@debian.org>
Build-Depends: debhelper (>= 11),
default-jdk,
- libjaxb-api-java,
maven-debian-helper (>= 2.1)
+Build-Depends-Indep:
+ libjaxb-api-java (>= 2.3.1),
+ libjaxb-java,
+ libjsonp-java
Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/java-team/jhove.git
Vcs-Browser: https://salsa.debian.org/java-team/jhove
--
2.25.1
>From 2d031282b9e0f6d117e0febeaf2d78491a0ebff5 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Thu, 27 Apr 2023 15:52:28 +0200
Subject: [PATCH 07/18] Bump debhelper compatibility level to 12 (no changes)
---
debian/compat | 1 -
debian/control | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
delete mode 100644 debian/compat
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index c1d516a..0456c90 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: utils
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org>
Uploaders: Jeff Breidenbach <j...@debian.org>
-Build-Depends: debhelper (>= 11),
+Build-Depends:
+ debhelper-compat (= 12),
default-jdk,
maven-debian-helper (>= 2.1)
Build-Depends-Indep:
--
2.25.1
>From 97d0bb9c713f270682474d3603b44b658048d666 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Wed, 26 Apr 2023 18:24:29 +0200
Subject: [PATCH 08/18] Adjust maven-debian-helper files to changes in upstream
jhove-modules
---
debian/jhove.poms | 19 +++++++++++++++----
debian/maven.ignoreRules | 3 +--
debian/maven.rules | 14 +++++++++++++-
3 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/debian/jhove.poms b/debian/jhove.poms
index 05c08c2..0ff0de7 100644
--- a/debian/jhove.poms
+++ b/debian/jhove.poms
@@ -25,9 +25,20 @@
# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
# Empty by default. [mh_install]
#
-pom.xml --no-parent
-jhove-core/pom.xml
-jhove-modules/pom.xml
+pom.xml --no-parent --has-package-version
+jhove-core/pom.xml --has-package-version
+jhove-modules/pom.xml --has-package-version
+jhove-modules/ascii-hul/pom.xml
+jhove-modules/aiff-hul/pom.xml
+jhove-modules/gif-hul/pom.xml
+jhove-modules/html-hul/pom.xml
+jhove-modules/jpeg-hul/pom.xml
+jhove-modules/jpeg2000-hul/pom.xml
+jhove-modules/pdf-hul/pom.xml
+jhove-modules/tiff-hul/pom.xml
+jhove-modules/utf8-hul/pom.xml
+jhove-modules/wave-hul/pom.xml
+jhove-modules/xml-hul/pom.xml
jhove-ext-modules/pom.xml --ignore
-jhove-apps/pom.xml
+jhove-apps/pom.xml --has-package-version
jhove-installer/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index b064a2c..d40c231 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,3 +1,4 @@
+
org.openpreservation.jhove jhove-ext-modules jar * * *
org.openpreservation.jhove jhove-installer jar * * *
junit junit * * * *
@@ -5,9 +6,7 @@ nl.jqno.equalsverifier equalsverifier * * * *
org.apache.maven.plugins maven-assembly-plugin * * * *
org.apache.maven.plugins maven-deploy-plugin * * * *
org.apache.maven.plugins maven-gpg-plugin * * * *
-org.apache.maven.plugins maven-javadoc-plugin * * * *
org.apache.maven.plugins maven-release-plugin * * * *
-org.apache.maven.plugins maven-site-plugin * * * *
org.apache.maven.plugins maven-source-plugin * * * *
org.apache.maven.plugins maven-surefire-plugin * * * *
org.jacoco jacoco-maven-plugin * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 62b7156..c4680b3 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,4 +1,16 @@
+
org.openpreservation.jhove jhove-apps jar s/.*/debian/ * *
-org.openpreservation.jhove jhove-modules jar s/.*/debian/ * *
org.openpreservation.jhove jhove-core jar s/.*/debian/ * *
org.openpreservation.jhove jhove pom s/.*/debian/ * *
+org.openpreservation.jhove.modules aiff-hul jar s/.*/debian/ * *
+org.openpreservation.jhove.modules ascii-hul jar s/.*/debian/ * *
+org.openpreservation.jhove.modules gif-hul jar s/.*/debian/ * *
+org.openpreservation.jhove.modules html-hul jar s/.*/debian/ * *
+org.openpreservation.jhove.modules jhove-modules pom s/.*/debian/ * *
+org.openpreservation.jhove.modules jpeg-hul jar s/.*/debian/ * *
+org.openpreservation.jhove.modules jpeg2000-hul jar s/.*/debian/ * *
+org.openpreservation.jhove.modules pdf-hul jar s/.*/debian/ * *
+org.openpreservation.jhove.modules tiff-hul jar s/.*/debian/ * *
+org.openpreservation.jhove.modules utf8-hul jar s/.*/debian/ * *
+org.openpreservation.jhove.modules wave-hul jar s/.*/debian/ * *
+org.openpreservation.jhove.modules xml-hul jar s/.*/debian/ * *
--
2.25.1
>From 0608bd90bd5865a6b16de8d3f9c3c51d230e5850 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Tue, 2 May 2023 13:55:07 +0200
Subject: [PATCH 09/18] Switch to glassfish implementation of java xml bindings
---
debian/maven.rules | 2 ++
1 file changed, 2 insertions(+)
diff --git a/debian/maven.rules b/debian/maven.rules
index c4680b3..2b0957b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,4 +1,6 @@
+s/com\.sun\.xml\.bind/org.glassfish.jaxb/ jaxb-core jar s/.*/debian/ * *
+s/com\.sun\.xml\.bind/org.glassfish.jaxb/ s/jaxb-impl/jaxb-runtime/ jar s/.*/debian/ * *
org.openpreservation.jhove jhove-apps jar s/.*/debian/ * *
org.openpreservation.jhove jhove-core jar s/.*/debian/ * *
org.openpreservation.jhove jhove pom s/.*/debian/ * *
--
2.25.1
>From 8d4be4a781bb203e161c47fa3434b481cdc2ef31 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Thu, 27 Apr 2023 16:38:48 +0200
Subject: [PATCH 10/18] Drop obsolete jhove_javax.patch
---
debian/patches/jhove_javax.patch | 22 ----------------------
debian/patches/series | 1 -
2 files changed, 23 deletions(-)
delete mode 100644 debian/patches/jhove_javax.patch
diff --git a/debian/patches/jhove_javax.patch b/debian/patches/jhove_javax.patch
deleted file mode 100644
index d3f3c51..0000000
--- a/debian/patches/jhove_javax.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Add javax.xml.bind as a dependency
- java.xml.bind is removed since Java 10 and is now available as an
- external library.
-Author: Abdelhakim Qbaich <abdelha...@qbaich.com>
-Bug-Debian: https://bugs.debian.org/917482
-Bug: https://github.com/openpreserve/jhove/pull/381
-Last-Update: 2019-01-19
-
---- jhove-1.20.1.orig/jhove-modules/pom.xml
-+++ jhove-1.20.1/jhove-modules/pom.xml
-@@ -23,6 +23,11 @@
- <version>${project.version}</version>
- </dependency>
- <dependency>
-+ <groupId>javax.xml.bind</groupId>
-+ <artifactId>jaxb-api</artifactId>
-+ <version>2.3.1</version>
-+ </dependency>
-+ <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
diff --git a/debian/patches/series b/debian/patches/series
index ff535be..1b56877 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
ftbfs
binaries
gui
-jhove_javax.patch
--
2.25.1
>From 4317cbd666b692b98e07f5042854c9f74fe0a2b9 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Tue, 25 Apr 2023 18:27:31 +0200
Subject: [PATCH 11/18] Drop obsolete ftbfs patch
---
debian/patches/ftbfs | 248 ------------------------------------------
debian/patches/series | 1 -
2 files changed, 249 deletions(-)
delete mode 100644 debian/patches/ftbfs
diff --git a/debian/patches/ftbfs b/debian/patches/ftbfs
deleted file mode 100644
index 42ba9e3..0000000
--- a/debian/patches/ftbfs
+++ /dev/null
@@ -1,248 +0,0 @@
---- jhove-1.20.1.orig/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/ModuleInfoWindow.java
-+++ jhove-1.20.1/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/ModuleInfoWindow.java
-@@ -24,7 +24,7 @@ public class ModuleInfoWindow extends In
-
- private JTextArea texta;
- private int _level;
-- private Module _module;
-+ private edu.harvard.hul.ois.jhove.Module _module;
-
- /**
- * Constructor.
-@@ -33,7 +33,7 @@ public class ModuleInfoWindow extends In
- * @param base The associated JhoveBase object.
- * @param module The Module whose information is to be presented.
- */
-- public ModuleInfoWindow (App app, JhoveBase base, Module module)
-+ public ModuleInfoWindow (App app, JhoveBase base, edu.harvard.hul.ois.jhove.Module module)
- {
- super ("Module Info", app, base);
- _module = module;
-@@ -73,7 +73,7 @@ public class ModuleInfoWindow extends In
-
- /** Formats and presents the module information in
- * the window. */
-- public void showModule (Module module)
-+ public void showModule (edu.harvard.hul.ois.jhove.Module module)
- {
- _module = module;
- if (module == null) {
---- jhove-1.20.1.orig/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/ViewHandler.java
-+++ jhove-1.20.1/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/ViewHandler.java
-@@ -98,7 +98,7 @@ public class ViewHandler extends Handler
- {
- }
-
-- public void show (Module module)
-+ public void show (edu.harvard.hul.ois.jhove.Module module)
- {
- }
-
---- jhove-1.20.1.orig/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/AppInfoWindow.java
-+++ jhove-1.20.1/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/AppInfoWindow.java
-@@ -90,7 +90,7 @@ public class AppInfoWindow extends InfoW
- while (iter.hasNext ()) {
- //Module module = jbase.getModuleMap ((String) iter.next ());
- Map moduleMap = jbase.getModuleMap ();
-- Module module = (Module) moduleMap.get ((String) iter.next ());
-+ edu.harvard.hul.ois.jhove.Module module = (edu.harvard.hul.ois.jhove.Module) moduleMap.get ((String) iter.next ());
- texta.append (" Module: " + module.getName () + " " +
- module.getRelease () + eol);
- }
---- jhove-1.20.1.orig/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/RepTreeRoot.java
-+++ jhove-1.20.1/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/RepTreeRoot.java
-@@ -217,7 +217,7 @@ public class RepTreeRoot extends Default
- {
- // This node has two children, for the module and the RepInfo
-
-- Module module = _info.getModule ();
-+ edu.harvard.hul.ois.jhove.Module module = _info.getModule ();
- if (module != null) {
- // Create a subnode for the module, which has three
- // leaf children.
---- jhove-1.20.1.orig/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/JhoveWindow.java
-+++ jhove-1.20.1/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/JhoveWindow.java
-@@ -107,10 +107,10 @@ public class JhoveWindow extends JFrame
- setDefaultCloseOperation (JFrame.EXIT_ON_CLOSE);
-
- // Define a Comparator function for Modules
-- Comparator<Module> modListComparator = new Comparator<Module> () {
-- public int compare (Module o1, Module o2) {
-- Module m1 = (Module) o1;
-- Module m2 = (Module) o2;
-+ Comparator<edu.harvard.hul.ois.jhove.Module> modListComparator = new Comparator<edu.harvard.hul.ois.jhove.Module> () {
-+ public int compare (edu.harvard.hul.ois.jhove.Module o1, edu.harvard.hul.ois.jhove.Module o2) {
-+ edu.harvard.hul.ois.jhove.Module m1 = (edu.harvard.hul.ois.jhove.Module) o1;
-+ edu.harvard.hul.ois.jhove.Module m2 = (edu.harvard.hul.ois.jhove.Module) o2;
- String name1 = m1.getName ();
- String name2 = m2.getName ();
- return String.CASE_INSENSITIVE_ORDER.compare (name1, name2);
-@@ -119,19 +119,19 @@ public class JhoveWindow extends JFrame
-
- // Build combo box of available modules
- Vector<String> moduleItems = new Vector<String> (10);
-- java.util.List<Module> moduleList = base.getModuleList ();
-+ java.util.List<edu.harvard.hul.ois.jhove.Module> moduleList = base.getModuleList ();
- // Clone the list so we can display it in sorted order
- // without munging the app's preferred order
-- java.util.List<Module> menuModuleList = new ArrayList<Module> (moduleList.size ());
-+ java.util.List<edu.harvard.hul.ois.jhove.Module> menuModuleList = new ArrayList<edu.harvard.hul.ois.jhove.Module> (moduleList.size ());
- menuModuleList.addAll(moduleList);
- Collections.sort (menuModuleList, modListComparator);
-- Iterator<Module> iter = menuModuleList.iterator ();
-+ Iterator<edu.harvard.hul.ois.jhove.Module> iter = menuModuleList.iterator ();
- moduleItems.add ("(None selected)");
- JRadioButtonMenuItem modItem = null;
- String itemName = null;
-
- while (iter.hasNext ()) {
-- Module mod = iter.next ();
-+ edu.harvard.hul.ois.jhove.Module mod = iter.next ();
- itemName = mod.getName ();
- modItem = new JRadioButtonMenuItem (itemName);
- modItem.setActionCommand (itemName);
-@@ -365,7 +365,7 @@ public class JhoveWindow extends JFrame
- * This method does the actual work of pickAndAnalyzeFile,
- * called from a thread so it can run asynchronously.
- */
-- public void pickAndAnalyzeFile1 (File file, Module module)
-+ public void pickAndAnalyzeFile1 (File file, edu.harvard.hul.ois.jhove.Module module)
- {
- String name = file.getName ();
- _base.resetAbort ();
-@@ -390,7 +390,7 @@ public class JhoveWindow extends JFrame
- }
-
- /** This is called to analyze a List of files. */
-- public void pickAndAnalyzeFileList1 (List<File> files, Module module)
-+ public void pickAndAnalyzeFileList1 (List<File> files, edu.harvard.hul.ois.jhove.Module module)
- {
- if (files.isEmpty ()) {
- return;
-@@ -421,7 +421,7 @@ public class JhoveWindow extends JFrame
- * levels if possible, and feeding individual files to
- * pickAndAnalyzeFile1.
- */
-- public void analyzeDirectory (File file, Module module)
-+ public void analyzeDirectory (File file, edu.harvard.hul.ois.jhove.Module module)
- {
- // Construct list, excluding files that start with "."
- String[] subfiles = file.list (invisibleFilter);
-@@ -483,7 +483,7 @@ public class JhoveWindow extends JFrame
- * This method does the actual work of pickAndAnalyzeURL,
- * called from a thread so it can run asynchronously.
- */
-- public void pickAndAnalyzeURL1 (String uri, Module module)
-+ public void pickAndAnalyzeURL1 (String uri, edu.harvard.hul.ois.jhove.Module module)
- {
- _progWind.setDocName (uri.toString (), false);
- _progWind.setProgressState (ProgressWindow.DOWNLOADING, false);
-@@ -562,7 +562,7 @@ public class JhoveWindow extends JFrame
- _doChecksum = checksum;
- }
-
-- private void openAndParse (List<File> files, /* RepInfo info,*/ Module module)
-+ private void openAndParse (List<File> files, /* RepInfo info,*/ edu.harvard.hul.ois.jhove.Module module)
- {
- //InputStream stream = null;
- //long lastModified = 0;
-@@ -671,7 +671,7 @@ public class JhoveWindow extends JFrame
-
- private void showModuleInfo ()
- {
-- Module module = getSelectedModule ();
-+ edu.harvard.hul.ois.jhove.Module module = getSelectedModule ();
- if (_moduleInfoWin == null) {
- _moduleInfoWin = new ModuleInfoWindow (_app, _base, module);
- _moduleInfoWin.setLocation (moduleInfoWinXPos, moduleInfoWinYPos);
-@@ -694,12 +694,12 @@ public class JhoveWindow extends JFrame
-
-
-
-- private Module getSelectedModule ()
-+ private edu.harvard.hul.ois.jhove.Module getSelectedModule ()
- {
- if (_selectedModule.equals ("")) {
- return null;
- }
-- return (Module) _base.getModuleMap().get (_selectedModule.toLowerCase ());
-+ return (edu.harvard.hul.ois.jhove.Module) _base.getModuleMap().get (_selectedModule.toLowerCase ());
- }
-
- private void reportError (String title, String msg)
-@@ -831,7 +831,7 @@ public class JhoveWindow extends JFrame
- private String _uri;
- private File _file;
- private List<File> _fileList;
-- private Module _module;
-+ private edu.harvard.hul.ois.jhove.Module _module;
-
-
- /** Constructor. */
-@@ -903,7 +903,7 @@ public class JhoveWindow extends JFrame
- * thread setup, in case the user changes the module
- * selection while the thread's running.
- */
-- protected void setModule (Module module)
-+ protected void setModule (edu.harvard.hul.ois.jhove.Module module)
- {
- _module = module;
- }
---- jhove-1.20.1.orig/jhove-core/src/main/java/edu/harvard/hul/ois/jhove/handler/XmlHandler.java
-+++ jhove-1.20.1/jhove-core/src/main/java/edu/harvard/hul/ois/jhove/handler/XmlHandler.java
-@@ -161,7 +161,7 @@ public class XmlHandler
- _writer.println (margn2 + elementStart ("modules"));
- Iterator iter = _je.getModuleMap ().keySet ().iterator ();
- while (iter.hasNext ()) {
-- Module module = _je.getModule ((String) iter.next ());
-+ edu.harvard.hul.ois.jhove.Module module = _je.getModule ((String) iter.next ());
- String [][] attr2 = { {"release", module.getRelease ()} };
- _writer.println (margn3 + element ("module", attr2,
- module.getName ()));
-@@ -224,7 +224,7 @@ public class XmlHandler
- /**
- * Outputs information about a Module
- */
-- public void show (Module module)
-+ public void show (edu.harvard.hul.ois.jhove.Module module)
- {
- String margin = getIndent (++_level);
- String margn2 = margin + " ";
-@@ -322,7 +322,7 @@ public class XmlHandler
- String margn2 = margin + " ";
- String margn3 = margn2 + " ";
-
-- Module module = info.getModule ();
-+ edu.harvard.hul.ois.jhove.Module module = info.getModule ();
- _logger.info ("Reporting RepInfo");
- if (_je.getSignatureFlag ()) {
- _logger.info ("Checking signatures only");
---- jhove-1.20.1.orig/jhove-core/src/main/java/edu/harvard/hul/ois/jhove/handler/TextHandler.java
-+++ jhove-1.20.1/jhove-core/src/main/java/edu/harvard/hul/ois/jhove/handler/TextHandler.java
-@@ -121,7 +121,7 @@ public class TextHandler
- _writer.println (margin + " BufferSize: " + _je.getBufferSize ());
- Iterator iter = _je.getModuleMap ().keySet ().iterator ();
- while (iter.hasNext ()) {
-- Module module = _je.getModule ((String) iter.next ());
-+ edu.harvard.hul.ois.jhove.Module module = _je.getModule ((String) iter.next ());
- _writer.println (margin + " Module: " + module.getName () + " " +
- module.getRelease ());
- }
-@@ -173,7 +173,7 @@ public class TextHandler
- /**
- * Outputs information about a Module
- */
-- public void show (Module module)
-+ public void show (edu.harvard.hul.ois.jhove.Module module)
- {
- String margin = getIndent (++_level);
-
-@@ -251,7 +251,7 @@ public class TextHandler
- {
- String margin = getIndent (++_level);
-
-- Module module = info.getModule ();
-+ edu.harvard.hul.ois.jhove.Module module = info.getModule ();
- _writer.println (margin + "RepresentationInformation: " +
- info.getUri ());
- if (module != null) {
diff --git a/debian/patches/series b/debian/patches/series
index 1b56877..6e8f753 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-ftbfs
binaries
gui
--
2.25.1
>From f2d98e95cd312fb6acd7e21ee5f664885d5a4667 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Tue, 25 Apr 2023 18:37:53 +0200
Subject: [PATCH 12/18] Update wrapper scripts
---
debian/patches/binaries | 25 ++++++++++++++++++-------
debian/patches/gui | 25 ++++++++++++++++++-------
2 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/debian/patches/binaries b/debian/patches/binaries
index 790d5a3..b7ef5ee 100644
--- a/debian/patches/binaries
+++ b/debian/patches/binaries
@@ -1,12 +1,23 @@
---- jhove-1.20.1.orig/jhove-installer/src/main/scripts/jhove
-+++ jhove-1.20.1/jhove-installer/src/main/scripts/jhove
-@@ -1,5 +1,9 @@
+From: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org>
+Date: Mon, 24 Apr 2023 18:18:12 +0200
+Subject: binaries
+
+---
+ jhove-installer/src/main/scripts/jhove | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/jhove-installer/src/main/scripts/jhove b/jhove-installer/src/main/scripts/jhove
+index 3ef25fc..1859a8c 100644
+--- a/jhove-installer/src/main/scripts/jhove
++++ b/jhove-installer/src/main/scripts/jhove
+@@ -1,4 +1,10 @@
#!/bin/sh
-
-+java -cp /usr/share/maven-repo/org/openpreservation/jhove/jhove-apps/debian/jhove-apps-debian.jar:/usr/share/maven-repo/org/openpreservation/jhove/jhove-core/debian/jhove-core-debian.jar:/usr/share/maven-repo/org/openpreservation/jhove/jhove-modules/debian/jhove-modules-debian.jar Jhove -c /etc/jhove/jhove.conf "${@}"
++set -e
+
-+exit $?
++CP=$(find /usr/share/maven-repo/org/openpreservation/jhove/ -name \*-debian.jar | paste -sd:)
++java -cp "$CP" edu.harvard.hul.ois.jhove.Jhove -c /etc/jhove/jhove.conf "${@}"
+
++exit $?
+
# JHOVE - JSTOR/Harvard Object Validation Environment
#
- # Copyright 2003-2005 by JSTOR and the President and Fellows of Harvard College
diff --git a/debian/patches/gui b/debian/patches/gui
index fc20b03..b79a239 100644
--- a/debian/patches/gui
+++ b/debian/patches/gui
@@ -1,12 +1,23 @@
---- jhove-1.20.1.orig/jhove-installer/src/main/scripts/jhove-gui
-+++ jhove-1.20.1/jhove-installer/src/main/scripts/jhove-gui
-@@ -1,5 +1,9 @@
+From: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org>
+Date: Mon, 24 Apr 2023 18:18:12 +0200
+Subject: gui
+
+---
+ jhove-installer/src/main/scripts/jhove-gui | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/jhove-installer/src/main/scripts/jhove-gui b/jhove-installer/src/main/scripts/jhove-gui
+index 46cff3e..4de24ce 100644
+--- a/jhove-installer/src/main/scripts/jhove-gui
++++ b/jhove-installer/src/main/scripts/jhove-gui
+@@ -1,4 +1,10 @@
#!/bin/sh
-
-+java -cp /usr/share/maven-repo/org/openpreservation/jhove/jhove-apps/debian/jhove-apps-debian.jar:/usr/share/maven-repo/org/openpreservation/jhove/jhove-core/debian/jhove-core-debian.jar:/usr/share/maven-repo/org/openpreservation/jhove/jhove-modules/debian/jhove-modules-debian.jar JhoveView -c /etc/jhove/jhove.conf "${@}"
++set -e
+
-+exit $?
++CP=$(find /usr/share/maven-repo/org/openpreservation/jhove/ -name \*-debian.jar | paste -sd:)
++java -cp "$CP" edu.harvard.hul.ois.jhove.viewer.JhoveView -c /etc/jhove/jhove.conf "${@}"
+
++exit $?
+
# JHOVE - JSTOR/Harvard Object Validation Environment
#
- # Copyright 2003-2005 by JSTOR and the President and Fellows of Harvard College
--
2.25.1
>From 3ab20b33beeb1e7618177887724bc456bcc798b3 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Fri, 28 Apr 2023 11:41:59 +0200
Subject: [PATCH 13/18] Minor fixes to the man page
---
debian/jhove-gui.1 | 45 +--------------------------------------------
debian/jhove.1 | 10 +++++-----
2 files changed, 6 insertions(+), 49 deletions(-)
diff --git a/debian/jhove-gui.1 b/debian/jhove-gui.1
index b0a464d..f270e24 100644
--- a/debian/jhove-gui.1
+++ b/debian/jhove-gui.1
@@ -1,44 +1 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH JHOVE 1 "August 28, 2007"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-JHOVE \- identify, validate, and characterize digital objects.
-.SH SYNOPSIS
-.B jhove
-.RI [ options ] " files" ...
-.br
-.B jhoveview
-.SH DESCRIPTION
-This manual page documents briefly the
-.B jhove
-and
-.B jhoveview
-commands.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" respectively.
-\fBjhove-gui\fP has a graphical user interface and no significant command line options.
-\fBjhove\fP has a command line interface, see full documentation in
-online at http://jhove.openpreservation.org/getting-started
-
-.SH AUTHOR
-JHOVE is copyright JSTOR and the President and Fellows of Harvard College, and
-the authors are not listed in the program source code.
-.PP
-This manual page was written by Jeff Breidenbach <j...@debian.org>,
-for the Debian project (but may be used by others).
+.so man1/jhove.1
diff --git a/debian/jhove.1 b/debian/jhove.1
index b0a464d..cff3c75 100644
--- a/debian/jhove.1
+++ b/debian/jhove.1
@@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
-.TH JHOVE 1 "August 28, 2007"
+.TH JHOVE 1 2023-04-28
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@@ -16,24 +16,24 @@
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
-JHOVE \- identify, validate, and characterize digital objects.
+jhove, jhove-gui \- identify, validate, and characterize digital objects.
.SH SYNOPSIS
.B jhove
.RI [ options ] " files" ...
.br
-.B jhoveview
+.B jhove-gui
.SH DESCRIPTION
This manual page documents briefly the
.B jhove
and
-.B jhoveview
+.B jhove-gui
commands.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
\fBjhove-gui\fP has a graphical user interface and no significant command line options.
-\fBjhove\fP has a command line interface, see full documentation in
+\fBjhove\fP has a command line interface, see full documentation
online at http://jhove.openpreservation.org/getting-started
.SH AUTHOR
--
2.25.1
>From ce8db8c635729512c3e0dc8a0eccb9f7fa9c50eb Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Fri, 5 May 2023 20:01:36 +0200
Subject: [PATCH 14/18] Add Rules-Requires-Root: no
---
debian/control | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/control b/debian/control
index 0456c90..4402494 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/java-team/jhove.git
Vcs-Browser: https://salsa.debian.org/java-team/jhove
Homepage: https://github.com/openpreserve/jhove/
+Rules-Requires-Root: no
Package: jhove
Architecture: all
--
2.25.1
>From efda735bbbefb5ae5c480f2868343007a9bb40cb Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Fri, 5 May 2023 20:01:51 +0200
Subject: [PATCH 15/18] Add Multi-Arch: foreign
---
debian/control | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/control b/debian/control
index 4402494..5ec6143 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Package: jhove
Architecture: all
Depends: ${misc:Depends}, ${maven:Depends}
Suggests: ${maven:OptionalDepends}
+Multi-Arch: foreign
Description: JSTOR/Harvard Object Validation Environment
Perform format-specific identification, validation, and
characterization of digital objects.
--
2.25.1
>From 68d0a7fff0bcaf7427746b362036d4e95c358fb1 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Wed, 24 May 2023 16:33:59 +0200
Subject: [PATCH 16/18] Skip tag signature verification as a temporary fix
This change should be reverted once the issue has been sorted out
upstream.
Bug: https://github.com/openpreserve/jhove/issues/856
---
debian/watch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/watch b/debian/watch
index 0b97eec..836a82d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=4
-opts="mode=git,pgpmode=gittag,filenamemangle=s%.*/v(@ANY_VERSION@)$%@PACKAGE@-$1%,dversionmangle=auto,repacksuffix=+dfsg1" \
+opts="mode=git,filenamemangle=s%.*/v(@ANY_VERSION@)$%@PACKAGE@-$1%,dversionmangle=auto,repacksuffix=+dfsg1" \
https://github.com/openpreserve/jhove.git \
^refs/tags/v(\d+\.\d*[02468](?:\.\d+)*)$
--
2.25.1
>From db4d40b7839573bb9265e204c95c2f2b96c3806d Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Wed, 31 May 2023 16:03:18 +0200
Subject: [PATCH 17/18] Add ftbfs.patch fixing dependency resolution error
(reported upstream)
---
debian/patches/ftbfs.patch | 19 +++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 20 insertions(+)
create mode 100644 debian/patches/ftbfs.patch
diff --git a/debian/patches/ftbfs.patch b/debian/patches/ftbfs.patch
new file mode 100644
index 0000000..60c421e
--- /dev/null
+++ b/debian/patches/ftbfs.patch
@@ -0,0 +1,19 @@
+Description: Fix internal dependency resolution failure
+ Make utf8-hul depend on the current version of pdf-hul.
+Author: Elias Oltmanns <oltma...@zib.de>
+Bug: https://github.com/openpreserve/jhove/issues/855
+
+---
+Last-Update: 2023-05-30
+
+--- jhove-1.28.0+dfsg1.orig/jhove-modules/utf8-hul/pom.xml
++++ jhove-1.28.0+dfsg1/jhove-modules/utf8-hul/pom.xml
+@@ -19,7 +19,7 @@
+ <dependency>
+ <groupId>org.openpreservation.jhove.modules</groupId>
+ <artifactId>pdf-hul</artifactId>
+- <version>1.12.1</version>
++ <version>1.12.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
diff --git a/debian/patches/series b/debian/patches/series
index 6e8f753..d17f173 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
binaries
gui
+ftbfs.patch
--
2.25.1
>From ec1eff8a2d152e79f9a348fce13cdc9d09c0ec1a Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Thu, 1 Jun 2023 15:58:26 +0200
Subject: [PATCH 18/18] Prepare release 1.28.0+dfsg1-1~exp1
---
debian/changelog | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ce498e8..5800976 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+jhove (1.28.0+dfsg1-1~exp1) experimental; urgency=low
+
+ * Team upload.
+ * New upstream release (closes: #1008968).
+ * Tighten version pattern in watch file and fix orig package name.
+ Make sure that the minor version number is even since this is what
+ upstream considers a production release.
+ * Remove ICC profiles and jar files from source for DFSG compliance.
+ Remove DFSG violating files from the source tarball and move this
+ application back to the main archive area of the distribution.
+ (Closes: #1008969).
+ * Fetch source via mode=git and verify signed tag.
+ * Bump Standards-Version to 4.6.2 (no changes).
+ * Update debian/copyright.
+ * Add dependencies on libjaxb-java and libjsonp-java.
+ * Bump debhelper compatibility level to 12 (no changes).
+ * Adjust maven-debian-helper files to changes in upstream jhove-modules.
+ * Switch to glassfish implementation of java xml bindings.
+ * Drop obsolete jhove_javax.patch.
+ * Drop obsolete ftbfs patch.
+ * Update wrapper scripts.
+ * Minor fixes to the man page.
+ * Add Rules-Requires-Root: no.
+ * Add Multi-Arch: foreign.
+ * Skip tag signature verification as a temporary fix.
+ This change should be reverted once the issue has been sorted out
+ upstream.
+ Bug: https://github.com/openpreserve/jhove/issues/856.
+ * Add ftbfs.patch fixing dependency resolution error (reported upstream).
+
+ -- Elias Oltmanns <oltma...@zib.de> Thu, 01 Jun 2023 15:48:23 +0200
+
jhove (1.20.1-5) unstable; urgency=medium
* Team upload.
--
2.25.1
