Bug#1035017: unblock: pdl/1:2.081-2

[Bas Couwenberg]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock
X-Debbugs-Cc: pdl at packages.debian.org
Control: affects -1 + src:pdl

Please unblock package pdl

[ Reason ]
It fixed the upgrade failure from bullseye reported in #1034942.

[ Impact ]
Upgrade from bullseye to bookworm fails.

[ Tests ]
autopkgtest, Salsa CI, and upstream test suite.

I've manually verified the fix for #1034942 by upgrading a bullseye chroot to bookworm using the fixed pdl from my local repo.

[ Risks ]
Low, the other changes that were pending in git since 1:2.081-1 don't risk breakage.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]
The package has been uploaded to unstable.

unblock pdl/1:2.081-2
-------------- next part --------------
diff -Nru pdl-2.081/debian/changelog pdl-2.081/debian/changelog
--- pdl-2.081/debian/changelog	2022-10-27 18:57:46.000000000 +0200
+++ pdl-2.081/debian/changelog	2023-04-27 15:54:44.000000000 +0200
@@ -1,3 +1,22 @@
+pdl (1:2.081-2) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Bas Couwenberg ]
+  * Add Rules-Requires-Root to control file.
+  * Add a debhelper sequence to run dh_pdl.
+  * Bump Standards-Version to 4.6.2, no changes.
+  * Add Breaks/Replaces on libpdl-stats-perl to fix upgrade.
+    (closes: #1034942)
+
+  [ Debian Janitor ]
+  * Update lintian override info to new format:
+    + debian/source/lintian-overrides: line 2
+    + debian/pdl.lintian-overrides: line 6, 10, 22, 28
+  * Use secure URI in Homepage field.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 27 Apr 2023 15:54:44 +0200
+
 pdl (1:2.081-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru pdl-2.081/debian/control pdl-2.081/debian/control
--- pdl-2.081/debian/control	2022-07-04 19:03:29.000000000 +0200
+++ pdl-2.081/debian/control	2023-04-27 15:53:33.000000000 +0200
@@ -37,10 +37,11 @@
                proj-bin,
                sharutils,
                x11proto-core-dev
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/pdl
 Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/pdl.git
-Homepage: http://pdl.perl.org/
+Homepage: https://pdl.perl.org/
+Rules-Requires-Root: binary-targets
 
 Package: pdl
 Architecture: any
@@ -66,9 +67,12 @@
           libpgplot-perl,
           netpbm | imagemagick,
           proj-bin
+Breaks: libpdl-stats-perl (<< 0.77)
 Conflicts: r-pdl
-Provides: ${pdlapi:Provides}
-Replaces: r-pdl
+Provides: dh-sequence-pdl,
+          ${pdlapi:Provides}
+Replaces: libpdl-stats-perl (<< 0.77),
+          r-pdl
 Description: perl data language: Perl extensions for numerics
  PDL gives standard perl the ability to COMPACTLY
  store and SPEEDILY manipulate the large N-dimensional data arrays
diff -Nru pdl-2.081/debian/Debian/Debhelper/Sequence/pdl.pm pdl-2.081/debian/Debian/Debhelper/Sequence/pdl.pm
--- pdl-2.081/debian/Debian/Debhelper/Sequence/pdl.pm	1970-01-01 01:00:00.000000000 +0100
+++ pdl-2.081/debian/Debian/Debhelper/Sequence/pdl.pm	2023-04-27 15:41:56.000000000 +0200
@@ -0,0 +1,15 @@
+# pdl.pm - debhelper addon for running dh_pdl
+#
+# Copyright 2022, Bas Couwenberg <sebastic at debian.org>
+#
+# This program is free software, you can redistribute it and/or modify it
+# under the same terms as Perl itself.
+
+use strict;
+use warnings;
+
+use Debian::Debhelper::Dh_Lib;
+
+insert_after("dh_perl", "dh_pdl");
+
+1;
diff -Nru pdl-2.081/debian/pdl.install pdl-2.081/debian/pdl.install
--- pdl-2.081/debian/pdl.install	2022-03-16 18:50:30.000000000 +0100
+++ pdl-2.081/debian/pdl.install	2023-04-27 15:41:56.000000000 +0200
@@ -1,3 +1,4 @@
 Doc/scantree.pl  usr/lib/x86_64-linux-gnu/perl5/5.22/PDL/Doc/
 Doc/mkhtmldoc.pl usr/lib/x86_64-linux-gnu/perl5/5.22/PDL/Doc/
 debian/dh_pdl    usr/bin
+debian/Debian    usr/share/perl5
diff -Nru pdl-2.081/debian/pdl.install.in pdl-2.081/debian/pdl.install.in
--- pdl-2.081/debian/pdl.install.in	2022-03-16 18:50:30.000000000 +0100
+++ pdl-2.081/debian/pdl.install.in	2023-04-27 15:41:56.000000000 +0200
@@ -1,3 +1,4 @@
 Doc/scantree.pl  @vendorarch@/PDL/Doc/
 Doc/mkhtmldoc.pl @vendorarch@/PDL/Doc/
 debian/dh_pdl    usr/bin
+debian/Debian    usr/share/perl5
diff -Nru pdl-2.081/debian/pdl.lintian-overrides pdl-2.081/debian/pdl.lintian-overrides
--- pdl-2.081/debian/pdl.lintian-overrides	2022-10-26 18:32:22.000000000 +0200
+++ pdl-2.081/debian/pdl.lintian-overrides	2023-04-27 15:41:56.000000000 +0200
@@ -3,11 +3,11 @@
 doc-base-file-references-missing-file /var/lib/pdl/html/*.html *
 
 # these two images need to be in usr/lib
-image-file-in-usr-lib */PDL/Transform/Cartography/earth_*.jpg*
+image-file-in-usr-lib [*/PDL/Transform/Cartography/earth_*.jpg*]
 
 # Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
 #  Fortify Source functions: no, only unprotected functions found!
-hardening-no-fortify-functions *
+hardening-no-fortify-functions [*]
 
 # False positive, string not included in source
 spelling-error-in-binary wtH with *
@@ -19,11 +19,11 @@
 typo-in-manual-page lon long *
 
 # Perl module
-spare-manual-page *usr/share/man/man1/PDL::*
+spare-manual-page [*usr/share/man/man1/PDL::*]
 
 # /usr/share/doc/pdl/html is symlinked to /var/lib/pdl/html
 doc-base-file-references-wrong-path *
 
 # Not a problem
-national-encoding *
+national-encoding [*]
 
diff -Nru pdl-2.081/debian/source/lintian-overrides pdl-2.081/debian/source/lintian-overrides
--- pdl-2.081/debian/source/lintian-overrides	2022-06-21 08:16:23.000000000 +0200
+++ pdl-2.081/debian/source/lintian-overrides	2023-04-27 15:41:56.000000000 +0200
@@ -1,3 +1,3 @@
 # Not a problem
-national-encoding *debian/fix_man_encoding.sed*
+national-encoding [*debian/fix_man_encoding.sed*]