[Resent Cc'ing in the bug, Evolution dropped it first time round, sigh]
On Sat, 2023-06-17 at 13:05 +0100, Adam D. Barratt wrote:
> You appear to have attached a binary debdiff. Please provide a _source_
> debdiff for checking.
My apologies, first time I've done this. I had generated it as well.
Please find the source debdiff attached.
The patches are managed using git-dpm which is why the git commit ID has
changed for all of them. The patch in question is debianize_version.diff .
Cheers,
Andrew
--
Andrew Ruthven, Wellington, New Zealand
and...@etc.gen.nz |
Catalyst Cloud: | This space intentionally left blank
https://catalystcloud.nz |
diff -Nru request-tracker5-5.0.3+dfsg/debian/changelog request-tracker5-5.0.3+dfsg/debian/changelog
--- request-tracker5-5.0.3+dfsg/debian/changelog 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/changelog 2023-06-11 14:19:13.000000000 +1200
@@ -1,3 +1,11 @@
+request-tracker5 (5.0.3+dfsg-2+deb12u1) bookworm; urgency=medium
+
+ * Strip Debian version suffix from generated hyperlinks to upstream docs
+ (Closes: 1033304).
+ * Fix the changelog date entry for the 5.0.3+dfsg-2 release.
+
+ -- Andrew Ruthven <and...@etc.gen.nz> Sun, 11 Jun 2023 14:19:13 +1200
+
request-tracker5 (5.0.3+dfsg-2) unstable; urgency=medium
* Add more fields to d/upstream/metadata
@@ -13,7 +21,7 @@
* Remove dependency on lsb-base as it is an obsolete package.
* Refresh d/copyright
- -- Andrew Ruthven <and...@etc.gen.nz> Fri, 22 Jul 2022 01:28:17 +1200
+ -- Andrew Ruthven <and...@etc.gen.nz> Sat, 04 Feb 2023 12:30:17 +1300
request-tracker5 (5.0.3+dfsg-1.1) unstable; urgency=medium
diff -Nru request-tracker5-5.0.3+dfsg/debian/.git-dpm request-tracker5-5.0.3+dfsg/debian/.git-dpm
--- request-tracker5-5.0.3+dfsg/debian/.git-dpm 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/.git-dpm 2023-06-05 20:13:11.000000000 +1200
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-c18433eb098f64a7c1d81502e7bcc689a2df0943
-c18433eb098f64a7c1d81502e7bcc689a2df0943
+28481171ee3345c8bed6efb9d5a46cfce1547fc0
+28481171ee3345c8bed6efb9d5a46cfce1547fc0
52cb0ca22325e7a067f0a3411ffb55ef03d47aa4
52cb0ca22325e7a067f0a3411ffb55ef03d47aa4
request-tracker5_5.0.3+dfsg.orig.tar.gz
diff -Nru request-tracker5-5.0.3+dfsg/debian/patches/debianize_charts.diff request-tracker5-5.0.3+dfsg/debian/patches/debianize_charts.diff
--- request-tracker5-5.0.3+dfsg/debian/patches/debianize_charts.diff 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/patches/debianize_charts.diff 2023-06-05 20:13:11.000000000 +1200
@@ -1,4 +1,4 @@
-From 90ca199172517271447e571d777964324343ef1a Mon Sep 17 00:00:00 2001
+From e4a897eeca21986a0fe788ad15edb6f500c99772 Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <and...@etc.gen.nz>
Date: Thu, 9 Jul 2020 23:03:35 +1200
Subject: On Debian there is no need to install the GD modules if GD is
diff -Nru request-tracker5-5.0.3+dfsg/debian/patches/debianize_commands.diff request-tracker5-5.0.3+dfsg/debian/patches/debianize_commands.diff
--- request-tracker5-5.0.3+dfsg/debian/patches/debianize_commands.diff 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/patches/debianize_commands.diff 2023-06-05 20:13:11.000000000 +1200
@@ -1,4 +1,4 @@
-From 13f2358416863200df51361f2643e7ec35680748 Mon Sep 17 00:00:00 2001
+From 2b5ef414f9d88dc4321d602dda5556c6bd04eb90 Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <and...@etc.gen.nz>
Date: Thu, 9 Jul 2020 22:53:09 +1200
Subject: Use Debian location of commands and data
diff -Nru request-tracker5-5.0.3+dfsg/debian/patches/debianize_extensions.diff request-tracker5-5.0.3+dfsg/debian/patches/debianize_extensions.diff
--- request-tracker5-5.0.3+dfsg/debian/patches/debianize_extensions.diff 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/patches/debianize_extensions.diff 2023-06-05 20:13:11.000000000 +1200
@@ -1,4 +1,4 @@
-From 4ea4ef63b501e9c635c0d18340f15107427f59be Mon Sep 17 00:00:00 2001
+From 83787c6f7b0c8f3683bc06c756575e444e2fc808 Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <and...@etc.gen.nz>
Date: Thu, 9 Jul 2020 22:33:55 +1200
Subject: Point to Debian locaton of mason_data.
diff -Nru request-tracker5-5.0.3+dfsg/debian/patches/debianize_version.diff request-tracker5-5.0.3+dfsg/debian/patches/debianize_version.diff
--- request-tracker5-5.0.3+dfsg/debian/patches/debianize_version.diff 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/patches/debianize_version.diff 2023-06-05 20:13:11.000000000 +1200
@@ -1,4 +1,4 @@
-From 55312fbba42fbedd49061601741d5960061d5703 Mon Sep 17 00:00:00 2001
+From e00d7b16bc8b70db0125349ead6841adfa1d4c32 Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <d...@earth.li>
Date: Thu, 31 Dec 2015 12:17:56 +0000
Subject: Extract the correct (Debian) version number in configure.ac
@@ -8,9 +8,10 @@
Patch-Name: debianize_version.diff
---
- configure.ac | 8 ++++----
- share/html/Elements/Footer | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
+ configure.ac | 8 ++++----
+ share/html/Admin/Tools/Config/Elements/Option | 3 +++
+ share/html/Elements/Footer | 2 +-
+ 3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index eeb333e8..c861df92 100755
@@ -40,6 +41,20 @@
test "x$rt_version_major" = 'x' && rt_version_major=0
test "x$rt_version_minor" = 'x' && rt_version_minor=0
test "x$rt_version_patch" = 'x' && rt_version_patch=0
+diff --git a/share/html/Admin/Tools/Config/Elements/Option b/share/html/Admin/Tools/Config/Elements/Option
+index af06242f..77258d9b 100644
+--- a/share/html/Admin/Tools/Config/Elements/Option
++++ b/share/html/Admin/Tools/Config/Elements/Option
+@@ -74,6 +74,9 @@ my $stringify = sub {
+ };
+
+ my $doc_version = $RT::VERSION;
++# Strip Debian version suffix first, since we add it as a suffix to upstream
++# version.
++$doc_version =~ s/\+dfsg-.*$//; # 5.0.3+dfsg-1 -> 5.0.3
+ $doc_version =~ s/\.\d+-\d+-g\w+$//; # 4.4.3-1-g123 -> 4.4
+
+ my $name = $option->{Name};
diff --git a/share/html/Elements/Footer b/share/html/Elements/Footer
index 556efcc9..5d6707ad 100644
--- a/share/html/Elements/Footer
diff -Nru request-tracker5-5.0.3+dfsg/debian/patches/disable-test-smime-realmail.diff request-tracker5-5.0.3+dfsg/debian/patches/disable-test-smime-realmail.diff
--- request-tracker5-5.0.3+dfsg/debian/patches/disable-test-smime-realmail.diff 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/patches/disable-test-smime-realmail.diff 2023-06-05 20:13:11.000000000 +1200
@@ -1,4 +1,4 @@
-From b54ea18f936fbfe2bb4bd5ba1e9c21088c0d9168 Mon Sep 17 00:00:00 2001
+From 4ed3112009e4afdbb828528d7e065810a5c6abcc Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <and...@etc.gen.nz>
Date: Sun, 26 Jun 2022 10:54:21 +1200
Subject: Skip t/mail/smime/realmail.t for now.
diff -Nru request-tracker5-5.0.3+dfsg/debian/patches/fcgi_client_sigpipe.diff request-tracker5-5.0.3+dfsg/debian/patches/fcgi_client_sigpipe.diff
--- request-tracker5-5.0.3+dfsg/debian/patches/fcgi_client_sigpipe.diff 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/patches/fcgi_client_sigpipe.diff 2023-06-05 20:13:11.000000000 +1200
@@ -1,4 +1,4 @@
-From b9eb251dbb57522a3138c273f7c23ade58df19cf Mon Sep 17 00:00:00 2001
+From 56f0eb7bbab1d09ee0d7b48056aa32877c56bcd9 Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <and...@etc.gen.nz>
Date: Wed, 1 Dec 2021 21:42:47 +1300
Subject: A client terminating a connection shouldn't kill a FCGI process
diff -Nru request-tracker5-5.0.3+dfsg/debian/patches/fix_pod_rt_munge_attachments.diff request-tracker5-5.0.3+dfsg/debian/patches/fix_pod_rt_munge_attachments.diff
--- request-tracker5-5.0.3+dfsg/debian/patches/fix_pod_rt_munge_attachments.diff 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/patches/fix_pod_rt_munge_attachments.diff 2023-06-05 20:13:11.000000000 +1200
@@ -1,4 +1,4 @@
-From 9ad36e96668631fabbca47a624445a0d388b6327 Mon Sep 17 00:00:00 2001
+From 97b0c538a78d95b578a181c6e5954071918d2920 Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <d...@earth.li>
Date: Sun, 29 Mar 2020 19:18:28 +0100
Subject: Fix POD for rt-munge-attachments
diff -Nru request-tracker5-5.0.3+dfsg/debian/patches/fix_shebang_upgrade_mysql_schema.diff request-tracker5-5.0.3+dfsg/debian/patches/fix_shebang_upgrade_mysql_schema.diff
--- request-tracker5-5.0.3+dfsg/debian/patches/fix_shebang_upgrade_mysql_schema.diff 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/patches/fix_shebang_upgrade_mysql_schema.diff 2023-06-05 20:13:11.000000000 +1200
@@ -1,4 +1,4 @@
-From 8b63275883f347891fa5637876b9af42bd9a3acf Mon Sep 17 00:00:00 2001
+From 3e02e45799776359052a3dfffc8d9a2b4a45bbc8 Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <d...@earth.li>
Date: Sun, 29 Mar 2020 19:37:52 +0100
Subject: Fix shebang for Debian policy
diff -Nru request-tracker5-5.0.3+dfsg/debian/patches/fix_test_ldap_ipv4.diff request-tracker5-5.0.3+dfsg/debian/patches/fix_test_ldap_ipv4.diff
--- request-tracker5-5.0.3+dfsg/debian/patches/fix_test_ldap_ipv4.diff 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/patches/fix_test_ldap_ipv4.diff 2023-06-05 20:13:11.000000000 +1200
@@ -1,4 +1,4 @@
-From 599ab333cc3897b67bc89817b037af16bc042145 Mon Sep 17 00:00:00 2001
+From c214c478b6a39df04637a2ba9e02ad3d9129de23 Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <and...@etc.gen.nz>
Date: Mon, 6 Jul 2020 21:30:54 +1200
Subject: Force use of IPv4 for LDAP test.
diff -Nru request-tracker5-5.0.3+dfsg/debian/patches/fonts_use_noto_sans.diff request-tracker5-5.0.3+dfsg/debian/patches/fonts_use_noto_sans.diff
--- request-tracker5-5.0.3+dfsg/debian/patches/fonts_use_noto_sans.diff 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/patches/fonts_use_noto_sans.diff 2023-06-05 20:13:11.000000000 +1200
@@ -1,4 +1,4 @@
-From 6022749c014c8517fc7031d5be442869508d26df Mon Sep 17 00:00:00 2001
+From 4f301835ed8ebfdd38dcac14bf9d34f209af1c9e Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <d...@earth.li>
Date: Fri, 1 Jan 2016 18:23:08 +0000
Subject: Use Noto Sans instead of Droid Sans
diff -Nru request-tracker5-5.0.3+dfsg/debian/patches/ignore_Mozilla::CA.diff request-tracker5-5.0.3+dfsg/debian/patches/ignore_Mozilla::CA.diff
--- request-tracker5-5.0.3+dfsg/debian/patches/ignore_Mozilla::CA.diff 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/patches/ignore_Mozilla::CA.diff 2023-06-05 20:13:11.000000000 +1200
@@ -1,4 +1,4 @@
-From 124dd05dd48b4554eba28d02e0ee755ef6d9f557 Mon Sep 17 00:00:00 2001
+From c41826ef2391d6db0672d1fcc1bfaf0a0e18040f Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <and...@etc.gen.nz>
Date: Sat, 13 Feb 2021 21:40:00 +1300
Subject: Debian provides the Mozilla CAs in the ca-certificates package.
diff -Nru request-tracker5-5.0.3+dfsg/debian/patches/libdatetime-format-natural-perl-v0.14.diff request-tracker5-5.0.3+dfsg/debian/patches/libdatetime-format-natural-perl-v0.14.diff
--- request-tracker5-5.0.3+dfsg/debian/patches/libdatetime-format-natural-perl-v0.14.diff 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/patches/libdatetime-format-natural-perl-v0.14.diff 2023-06-05 20:13:11.000000000 +1200
@@ -1,4 +1,4 @@
-From c18433eb098f64a7c1d81502e7bcc689a2df0943 Mon Sep 17 00:00:00 2001
+From 28481171ee3345c8bed6efb9d5a46cfce1547fc0 Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <and...@etc.gen.nz>
Date: Sat, 4 Feb 2023 02:45:55 +1300
Subject: Support DateTime::Format::Natural >= 0.13_01
diff -Nru request-tracker5-5.0.3+dfsg/debian/patches/remove_exclude_Test::WWW::Mechanize.diff request-tracker5-5.0.3+dfsg/debian/patches/remove_exclude_Test::WWW::Mechanize.diff
--- request-tracker5-5.0.3+dfsg/debian/patches/remove_exclude_Test::WWW::Mechanize.diff 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/patches/remove_exclude_Test::WWW::Mechanize.diff 2023-06-05 20:13:11.000000000 +1200
@@ -1,4 +1,4 @@
-From 18479bf5389ce83fcca74a4acde3c029dd9d21be Mon Sep 17 00:00:00 2001
+From 7de0b0d97de59f8f34e63fe87a3f87ca71cb83d0 Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <and...@etc.gen.nz>
Date: Sun, 17 Jul 2022 17:07:47 +1200
Subject: Remove exclude of Test::WWW::Mechanize 1.58
diff -Nru request-tracker5-5.0.3+dfsg/debian/patches/test_locale.diff request-tracker5-5.0.3+dfsg/debian/patches/test_locale.diff
--- request-tracker5-5.0.3+dfsg/debian/patches/test_locale.diff 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/patches/test_locale.diff 2023-06-05 20:13:11.000000000 +1200
@@ -1,4 +1,4 @@
-From a70c5ef6add20fc9153ba79a7e5dbf825dcce1e0 Mon Sep 17 00:00:00 2001
+From f87179ba3988910d0d95af1143035e77879bbeb6 Mon Sep 17 00:00:00 2001
From: gregor herrmann <gre...@debian.org>
Date: Tue, 11 Oct 2016 20:40:39 +0200
Subject: set LC_ALL to C
diff -Nru request-tracker5-5.0.3+dfsg/debian/patches/Update-tests-for-EN-datetime-locale-change-to-space.diff request-tracker5-5.0.3+dfsg/debian/patches/Update-tests-for-EN-datetime-locale-change-to-space.diff
--- request-tracker5-5.0.3+dfsg/debian/patches/Update-tests-for-EN-datetime-locale-change-to-space.diff 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/patches/Update-tests-for-EN-datetime-locale-change-to-space.diff 2023-06-05 20:13:11.000000000 +1200
@@ -1,4 +1,4 @@
-From a84bb6997bb74381b909abb1cb45adf163ecb397 Mon Sep 17 00:00:00 2001
+From 209637ab6be6d3d3142eebc4d87494801bf6b6d0 Mon Sep 17 00:00:00 2001
From: Jim Brandt <jbra...@bestpractical.com>
Date: Mon, 7 Nov 2022 17:18:48 -0500
Subject: Update tests for EN datetime locale change to space
diff -Nru request-tracker5-5.0.3+dfsg/debian/patches/use_cpanel_json_xs.diff request-tracker5-5.0.3+dfsg/debian/patches/use_cpanel_json_xs.diff
--- request-tracker5-5.0.3+dfsg/debian/patches/use_cpanel_json_xs.diff 2022-07-22 01:28:17.000000000 +1200
+++ request-tracker5-5.0.3+dfsg/debian/patches/use_cpanel_json_xs.diff 2023-06-05 20:13:11.000000000 +1200
@@ -1,4 +1,4 @@
-From 67098dc63a70592f39feb6949ac9072b679a1791 Mon Sep 17 00:00:00 2001
+From bced9f01114884a9464e718dce1f9374aeebe17d Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <d...@earth.li>
Date: Sun, 9 Sep 2018 21:35:08 +0100
Subject: Force the use of Cpanel::JSON::XS
