Source: checkit-tiff
Version: 0.4.2-1
Followup-For: Bug #1000120
X-Debbugs-Cc: oltma...@zib.de
Control: tags -1 patch
Dear Maintainer,
please consider reviewing the attached patches for a new upstream
version of checkit-tiff. This would fix this bug flagged serious and
should prevent the tool from dropping out of Debian testing.
Thank you very much in advance for your assistance,
Elias
>From 634e808f1ac76ecdc3830e6691a1e240855ec359 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Tue, 20 Jun 2023 18:57:42 +0200
Subject: [PATCH 01/10] Switch to new upstream repository
Closes: #969162
---
debian/control | 2 +-
debian/copyright | 4 ++--
debian/watch | 5 +++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control
index d4dc58a..f978411 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 13),
Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/debian-phototools-team/checkit-tiff
Vcs-Git: https://salsa.debian.org/debian-phototools-team/checkit-tiff.git
-Homepage: https://github.com/SLUB-digitalpreservation/checkit_tiff
+Homepage: https://git.fsfe.org/art1pirat/checkit_tiff
Rules-Requires-Root: no
Package: checkit-tiff
diff --git a/debian/copyright b/debian/copyright
index 7903d4f..c233c16 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: checkit_tiff
Upstream-Contact: Andreas Romeyke <a...@andreas-romeyke.de>
-Source: https://github.com/SLUB-digitalpreservation/checkit_tiff/releases
+Source: https://git.fsfe.org/art1pirat/checkit_tiff/releases
Files: *
-Copyright: 2015-2016 Andreas Romeyke <a...@andreas-romeyke.de>
+Copyright: 2015-2023 Andreas Romeyke <a...@andreas-romeyke.de>
code is based on parts of libtiff:
1988-1997 Sam Leffler
1991-1997 Silicon Graphics, Inc.
diff --git a/debian/watch b/debian/watch
index f5dc74f..084fdfe 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
version=4
-
-https://github.com/SLUB-digitalpreservation/checkit_tiff/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz
+opts="mode=git,filenamemangle=s%.*/v(@ANY_VERSION@)$%@PACKAGE@-$1%" \
+ https://git.fsfe.org/art1pirat/checkit_tiff.git \
+ ^refs/tags/v(\d+(?:\.\d+)*)$
--
2.39.2
>From ea0a150b06f4529d8e638f197bbdde4208c94f95 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Mon, 26 Jun 2023 18:50:24 +0200
Subject: [PATCH 02/10] Update build dependencies
Closes: #1000120
---
debian/control | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index f978411..80cfc00 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,12 @@ Section: science
Priority: optional
Build-Depends: debhelper-compat (= 13),
cmake,
- libpcre3-dev
+ dh-cmake,
+ dh-cmake-compat (= 1),
+ libpcre2-dev,
+ libdata-printer-perl,
+ libfile-slurp-perl,
+ libtest-base-perl
Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/debian-phototools-team/checkit-tiff
Vcs-Git: https://salsa.debian.org/debian-phototools-team/checkit-tiff.git
--
2.39.2
>From 2f84fc914eda967da2c2bf7f3246b158551c6da2 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Wed, 28 Jun 2023 11:53:18 +0200
Subject: [PATCH 03/10] Build in directory "build" as expected by upstream test
code
---
debian/rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index 879abd8..92b6797 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
- dh $@ --sourcedirectory=src --buildsystem=cmake
+ dh $@ --sourcedirectory=src --builddirectory=build --buildsystem=cmake
override_dh_install:
dh_install
--
2.39.2
>From 5adaaa86432a449ea6bb6b3a327336c11571dea3 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Fri, 30 Jun 2023 18:47:48 +0200
Subject: [PATCH 04/10] Enforce non-parallel build preventing interference
between tests
---
debian/rules | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index 92b6797..6f249fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,8 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
- dh $@ --sourcedirectory=src --builddirectory=build --buildsystem=cmake
+ dh $@ --sourcedirectory=src --builddirectory=build \
+ --no-parallel --buildsystem=cmake
override_dh_install:
dh_install
--
2.39.2
>From c9c9d596d1b2307e68bb2f3647a50c8e6dd92657 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Fri, 30 Jun 2023 20:07:33 +0200
Subject: [PATCH 05/10] Disable fortify from hardening feature area due to
failing test
---
debian/rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index 6f249fb..7853760 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-fortify
%:
dh $@ --sourcedirectory=src --builddirectory=build \
--
2.39.2
>From e758726f92e2088726ee57af01efe9c35f2d613a Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Mon, 3 Jul 2023 13:35:29 +0200
Subject: [PATCH 06/10] Add patch fixing version string for builds outside
upstream repository
---
debian/patches/series | 1 +
debian/patches/version-string.patch | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 debian/patches/version-string.patch
diff --git a/debian/patches/series b/debian/patches/series
index a72bdbf..6b69729 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
add_manual
+version-string.patch
diff --git a/debian/patches/version-string.patch b/debian/patches/version-string.patch
new file mode 100644
index 0000000..fa0410b
--- /dev/null
+++ b/debian/patches/version-string.patch
@@ -0,0 +1,27 @@
+From: Elias Oltmanns <oltma...@zib.de>
+Date: Mon, 3 Jul 2023 13:23:25 +0200
+Subject: Fix version string for builds outside the upstream repository
+
+---
+ src/CMakeLists.txt | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 54de968..131f030 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -35,7 +35,13 @@ execute_process( COMMAND git rev-parse --abbrev-ref HEAD OUTPUT_VARIABLE BUILD_B
+ execute_process( COMMAND git describe --tags OUTPUT_VARIABLE BUILD_TAG OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process( COMMAND git rev-parse HEAD OUTPUT_VARIABLE BUILD_REV_ID OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process( COMMAND git describe --long --tags --dirty --always OUTPUT_VARIABLE BUILD_REV_ID_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
+-add_definitions(-DVERSION="${BUILD_BRANCH}_${BUILD_TAG}")
++set(DEBIAN_DIR ${PROJECT_SOURCE_DIR}/../debian )
++execute_process( COMMAND head -1 changelog
++ COMMAND sed -e 's/^.*\\(([-.0-9]*)\\).*$/\\1/'
++ WORKING_DIRECTORY ${DEBIAN_DIR}
++ OUTPUT_VARIABLE DEBIAN_BUILD_VERSION
++ OUTPUT_STRIP_TRAILING_WHITESPACE)
++add_definitions(-DVERSION="debian_${DEBIAN_BUILD_VERSION}")
+ add_definitions(-DREPO_REVISION="${REPO_REVISION}")
+ add_definitions(-D_GNU_SOURCE)
+
--
2.39.2
>From 2ca679704d43ee3b86e982267a2b54d75b9c670e Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Mon, 3 Jul 2023 18:51:17 +0200
Subject: [PATCH 07/10] Bump Standards-Version to 4.6.2
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 80cfc00..e3354ca 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper-compat (= 13),
libdata-printer-perl,
libfile-slurp-perl,
libtest-base-perl
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/debian-phototools-team/checkit-tiff
Vcs-Git: https://salsa.debian.org/debian-phototools-team/checkit-tiff.git
Homepage: https://git.fsfe.org/art1pirat/checkit_tiff
--
2.39.2
>From fcad1dd3e864a211ade24c8f5ed7577b0cbe9cb3 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Mon, 3 Jul 2023 19:06:31 +0200
Subject: [PATCH 08/10] Drop reference to non-existing file from
debian/copyright
---
debian/copyright | 5 -----
1 file changed, 5 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index c233c16..7cca65e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,11 +19,6 @@ Copyright: 2015-2023 Andreas Romeyke <a...@andreas-romeyke.de>
2000 Frank Warmerdam
License: Hylafax
-Files: src/headers/tiff.h
-Copyright: 1988-1997 Sam Leffler
- 1991-1997 Silicon Graphics, Inc.
-License: Hylafax
-
Files: debian/*
Copyright: 2016 Andreas Romeyke <a...@andreas-romeyke.de>
License: Hylafax
--
2.39.2
>From 0a9f39ea628042debdf3219c638c6a1cee7266f3 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Tue, 11 Jul 2023 15:25:09 +0200
Subject: [PATCH 09/10] Add lintian-overrides for grammar.xhtml
---
debian/source/lintian-overrides | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 debian/source/lintian-overrides
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..c65acbb
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# Generated from src/parser/config_dsl.grammar.peg, check README.grammar
+checkit-tiff source: source-is-missing [grammar.xhtml]
--
2.39.2
>From 6e701947dc55c1f5a307cd6e4a348aed2295fbfa Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <oltma...@zib.de>
Date: Wed, 12 Jul 2023 09:58:18 +0200
Subject: [PATCH 10/10] Prepare release 1.4.3-1
---
debian/changelog | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 0776e06..a104b91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+checkit-tiff (1.4.3-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream version 1.4.3.
+ * Switch to new upstream repository (Closes: #969162).
+ * Update build dependencies (Closes: #1000120).
+ * Build in directory "build" as expected by upstream test code.
+ * Enforce non-parallel build preventing interference between tests.
+ * Disable fortify from hardening feature area due to failing test.
+ * Add patch fixing version string for builds outside upstream repository.
+ * Bump Standards-Version to 4.6.2.
+ * Drop reference to non-existing file from debian/copyright.
+ * Add lintian-overrides for grammar.xhtml.
+
+ -- Elias Oltmanns <oltma...@zib.de> Wed, 12 Jul 2023 09:56:22 +0200
+
checkit-tiff (0.4.2-1) unstable; urgency=medium
* Team upload.
--
2.39.2
