diff --git a/debian/changelog b/debian/changelog
index c4b0fb212b..e748dac8a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+petsc (3.18.4+dfsg1-2) UNRELEASED; urgency=medium
+
+ * Update lintian override info format in
+ d/libpetsc3.18-dev-common.lintian-overrides on line 2-3.
+ * Trim trailing whitespace.
+ * Use secure URI in debian/watch.
+ * Update renamed lintian tag names in lintian overrides.
+ * Set upstream metadata fields: Contact.
+ * Remove unnecessary get-orig-source-target.
+
+ -- Debian Janitor <janitor@jelmer.uk> Wed, 01 Mar 2023 13:09:37 -0000
+
petsc (3.18.4+dfsg1-1) unstable; urgency=medium
* New upstream release.
@@ -851,7 +863,7 @@ petsc (3.9.0+dfsg1-1exp1) experimental; urgency=medium
- tutorials no longer installed. Instead see
http://www.mcs.anl.gov/petsc/documentation/tutorials/index.html
* update debian/copyright: excluded (DFSG) dir bin/win32fe has been
- moved to lib/petsc/
+ moved to lib/petsc/
* d/rules override_dh_clean: remove build files
* libpetsc*dev packages Suggests: python3 | python, since python
support scripts are provided in $PETSC_DIR/lib/petsc/bin
@@ -1018,8 +1030,8 @@ petsc (3.7.6+dfsg1-2) unstable; urgency=medium
* Team upload.
* Standards-Version: 4.0.0
* debhelper compatibility level 10
- * debian/rules: build using make -j 1
- (petsc uses MAKE_NP to handle parallel builds,
+ * debian/rules: build using make -j 1
+ (petsc uses MAKE_NP to handle parallel builds,
see lib/petsc/conf/rules)
-- Drew Parsons <dparsons@debian.org> Sat, 15 Jul 2017 06:52:29 +0800
@@ -1027,7 +1039,7 @@ petsc (3.7.6+dfsg1-2) unstable; urgency=medium
petsc (3.7.6+dfsg1-1exp1) experimental; urgency=medium
* New upstream version.
- * libpetsc-3.7.6-dev, libpetsc-complex-3.7.6-dev Suggests:
+ * libpetsc-3.7.6-dev, libpetsc-complex-3.7.6-dev Suggests:
relax to unversioned dependency on petsc-dev, petsc3.7.6-doc
-- Drew Parsons <dparsons@debian.org> Tue, 30 May 2017 14:07:47 +0800
@@ -1038,15 +1050,15 @@ petsc (3.7.5+dfsg1-4) unstable; urgency=medium
invoked in PETSc.pc, so we Depend on their dev packages, we don't
simply Recommend them.
* Move petsc3.7 and petsc3.7-real alternatives handling from
- libpetsc3.7-dev to libpetsc3.7.5-dev. Similarly petsc3.7-complex.
- Otherwise alternatives for older patch versions are left unowned.
+ libpetsc3.7-dev to libpetsc3.7.5-dev. Similarly petsc3.7-complex.
+ Otherwise alternatives for older patch versions are left unowned.
Closes: #852514.
-- Drew Parsons <dparsons@debian.org> Mon, 06 Feb 2017 05:03:51 +0800
petsc (3.7.5+dfsg1-3) unstable; urgency=medium
- * Update libgfortran-5-dev dependency to gfortran to ensure
+ * Update libgfortran-5-dev dependency to gfortran to ensure
the default gfortran (currently 6) is linked to libpetsc*3.7.5-dev.
Closes: #852011.
@@ -1069,8 +1081,8 @@ petsc (3.7.5+dfsg1-1) experimental; urgency=medium
petsc (3.7.4+dfsg1-9) unstable; urgency=medium
- * Binary -dev packages Depends: libhdf5-mpi-dev.
- Needed since -lhdf5 is now added to PETSc pkgconfig flags.
+ * Binary -dev packages Depends: libhdf5-mpi-dev.
+ Needed since -lhdf5 is now added to PETSc pkgconfig flags.
Closes: #802706.
-- Drew Parsons <dparsons@debian.org> Fri, 06 Jan 2017 13:10:01 +0800
@@ -1080,7 +1092,7 @@ petsc (3.7.4+dfsg1-8) unstable; urgency=medium
* update for multiarch MPI. Closes: #848784.
* update build-time test for multiarch HDF5
- test for both mpi and serial versions of HDF5, with preference
- for mpi.
+ for mpi.
-- Drew Parsons <dparsons@debian.org> Wed, 21 Dec 2016 21:54:51 +0800
@@ -1137,7 +1149,7 @@ petsc (3.7.4+dfsg1-2) unstable; urgency=medium
petsc (3.7.4+dfsg1-1) unstable; urgency=medium
* New upstream version.
- * Mark the Debian DFSG version with '+dfsg' rather than '.dfsg' to
+ * Mark the Debian DFSG version with '+dfsg' rather than '.dfsg' to
make the distinction with the raw upstream version more clear.
-- Drew Parsons <dparsons@debian.org> Wed, 12 Oct 2016 16:06:53 +0800
@@ -1184,7 +1196,7 @@ petsc (3.7.2.dfsg1-1exp1) experimental; urgency=medium
petsc (3.7.1.dfsg1-1) experimental; urgency=medium
* New upstream version. New ABI 3.7
- * Temporarily disable SuperLU support:
+ * Temporarily disable SuperLU support:
PETSc 3.7 requires SuperLU 5.2.
-- Drew Parsons <dparsons@debian.org> Fri, 20 May 2016 01:18:11 +0800
@@ -1206,7 +1218,7 @@ petsc (3.6.4.dfsg1-2) unstable; urgency=medium
petsc (3.6.4.dfsg1-1) unstable; urgency=low
* New upstream version.
- - drop patch install_python_RDict_upstream_5a4fee...
+ - drop patch install_python_RDict_upstream_5a4fee...
(already applied in 3.6.4)
* Standards-Version: 3.9.8
@@ -1215,7 +1227,7 @@ petsc (3.6.4.dfsg1-1) unstable; urgency=low
petsc (3.6.3.dfsg2-6) unstable; urgency=medium
* don't build explicit soname links to libraries, they are handled
- by alternatives
+ by alternatives
-- Drew Parsons <dparsons@debian.org> Tue, 03 May 2016 22:20:08 +0800
@@ -1266,7 +1278,7 @@ petsc (3.6.3.dfsg2-1) unstable; urgency=medium
version (libpetsc3.6.3-dev). Different patch versions may be
installed in parallel (e.g. 3.6.2 and 3.6.3), but they share the
same soname (3.6). The preferred version for libpetsc.so.3.6 is
- controlled (by the specific patch version) using alternatives.
+ controlled (by the specific patch version) using alternatives.
Client packages should normally depend on libpetsc3.6-dev (or
petsc-dev) instead of libpetsc3.6.3-dev.
Likewise for libpetsc-complex-3.6-dev.
@@ -1277,13 +1289,13 @@ petsc (3.6.3.dfsg1-1) unstable; urgency=medium
* New upstream version.
* debian/rules: only print the configure log of failed builds.
- Closes: #811257.
+ Closes: #811257.
* Build doc package from files installed for the debug package.
Closes: #817165.
* Patch install_python_RDict_upstream_5a4fee... fixes installation
during package build (patch from upstream git commit 5a4feee).
* libpetsc-real.so and libpetsc-complex.so (dev packages) handled by
- alternatives.
+ alternatives.
* Standards-Version: 3.9.7
-- Drew Parsons <dparsons@debian.org> Sat, 12 Mar 2016 22:57:27 +0800
@@ -1291,7 +1303,7 @@ petsc (3.6.3.dfsg1-1) unstable; urgency=medium
petsc (3.6.2.dfsg1-3) unstable; urgency=medium
* Add Depends: libssl-dev, libgfortran-5-dev to petsc dev packages.
- Needed since petsc invokes external libraries -lssl -lcrypto -gfortran
+ Needed since petsc invokes external libraries -lssl -lcrypto -gfortran
in <petsc>/lib/pkgconfig/PETSc.pc and <petsc>/lib/petsc/conf/petscvariables
cf. bug #802706
@@ -1319,7 +1331,7 @@ petsc (3.6.2.dfsg1-1) unstable; urgency=medium
Closes: #736662.
* Add superlu support. Closes: #671062.
* Provide new packages libpetsc-complex-3.6.2-dev, libpetsc-complex-3.6
- and libpetsc-complex-3.6.2-dbg with support for complex numbers.
+ and libpetsc-complex-3.6.2-dbg with support for complex numbers.
Closes: #730317.
* The library and soname are modified for complex support,
libpetsc_complex.so. The standard build with real numbers has a
@@ -1390,7 +1402,7 @@ petsc (3.4.2.dfsg1-3) unstable; urgency=low
petsc (3.4.2.dfsg1-2) unstable; urgency=low
* [35ff06e] Add copyright-info of some files. (Closes: #722979)
- * [0002c26] Remove libpastix-dev and change libsuperlu4-dev on
+ * [0002c26] Remove libpastix-dev and change libsuperlu4-dev on
libsuperlu3-dev.
-- Anton Gladky <gladk@debian.org> Tue, 17 Sep 2013 07:52:56 +0200
@@ -1414,7 +1426,7 @@ petsc (3.4.2.dfsg-1) unstable; urgency=low
- remove liblapack-3gf.so and libblas-3gf.so
* update postinst script
- change the version from 3100 to 3420
-
+
[ Thomas Weber ]
* Make copying config.guess and config.sub independent of
automake version. (Closes: #713208)
@@ -1631,7 +1643,7 @@ petsc (3.0.0.dfsg-6) unstable; urgency=low
petsc (3.0.0.dfsg-5.1) unstable; urgency=low
* Non-maintainer upload.
- * fix Build-Depends for new dpkg-dev (closes: #535276)
+ * fix Build-Depends for new dpkg-dev (closes: #535276)
-- Rene Engelhard <rene@debian.org> Fri, 03 Jul 2009 10:31:34 +0200
diff --git a/debian/libpetsc-complex3.18-dbg.lintian-overrides b/debian/libpetsc-complex3.18-dbg.lintian-overrides
index e84af74986..8c6dd9682f 100644
--- a/debian/libpetsc-complex3.18-dbg.lintian-overrides
+++ b/debian/libpetsc-complex3.18-dbg.lintian-overrides
@@ -1,2 +1,2 @@
# common arch-indep files are installed in usr/share/petsc
-breakout-link usr/lib/petscdir/petsc* -> usr/share/petsc/*
+ldconfig-escape usr/lib/petscdir/petsc* -> usr/share/petsc/*
diff --git a/debian/libpetsc-complex3.18-dev.lintian-overrides b/debian/libpetsc-complex3.18-dev.lintian-overrides
index 92e989e2f4..7f8a22fcb9 100644
--- a/debian/libpetsc-complex3.18-dev.lintian-overrides
+++ b/debian/libpetsc-complex3.18-dev.lintian-overrides
@@ -1,4 +1,4 @@
# common arch-indep files are installed in usr/share/petsc
-breakout-link usr/lib/petscdir/petsc* -> usr/share/petsc/*
+ldconfig-escape usr/lib/petscdir/petsc* -> usr/share/petsc/*
# link actual libraries in PETSC_DIR to usr/lib/<arch>
-breakout-link usr/lib/petscdir/petsc* -> usr/lib/*
+ldconfig-escape usr/lib/petscdir/petsc* -> usr/lib/*
diff --git a/debian/libpetsc-complex3.18.lintian-overrides b/debian/libpetsc-complex3.18.lintian-overrides
index 60e902bb7f..71ff6e41eb 100644
--- a/debian/libpetsc-complex3.18.lintian-overrides
+++ b/debian/libpetsc-complex3.18.lintian-overrides
@@ -1,5 +1,5 @@
# libpetsc.so.X.Y soname links are managed by alternatives (libpetc.so.X.Y)
-ldconfig-symlink-missing-for-shlib usr/lib/*/libpetsc.so.* usr/lib/*/libpetsc-complex.so.* libpetsc.so.*
+lacks-versioned-link-to-shared-library usr/lib/*/libpetsc.so.* usr/lib/*/libpetsc-complex.so.* libpetsc.so.*
# libpetsc_complex.so is handled by alternatives in libpetsc-complexX.Y-dev
lacks-unversioned-link-to-shared-library example: usr/lib/*/libpetsc_complex.so [usr/lib/*/libpetsc_complex.so.*]
diff --git a/debian/libpetsc-real3.18-dbg.lintian-overrides b/debian/libpetsc-real3.18-dbg.lintian-overrides
index e84af74986..8c6dd9682f 100644
--- a/debian/libpetsc-real3.18-dbg.lintian-overrides
+++ b/debian/libpetsc-real3.18-dbg.lintian-overrides
@@ -1,2 +1,2 @@
# common arch-indep files are installed in usr/share/petsc
-breakout-link usr/lib/petscdir/petsc* -> usr/share/petsc/*
+ldconfig-escape usr/lib/petscdir/petsc* -> usr/share/petsc/*
diff --git a/debian/libpetsc-real3.18-dev.lintian-overrides b/debian/libpetsc-real3.18-dev.lintian-overrides
index 669840ef49..bed58b4516 100644
--- a/debian/libpetsc-real3.18-dev.lintian-overrides
+++ b/debian/libpetsc-real3.18-dev.lintian-overrides
@@ -1,6 +1,6 @@
# False positive: the copyright notice is somewhat buried in the upstream text
copyright-without-copyright-notice
# common arch-indep files are installed in usr/share/petsc
-breakout-link usr/lib/petscdir/petsc* -> usr/share/petsc/*
+ldconfig-escape usr/lib/petscdir/petsc* -> usr/share/petsc/*
# link actual libraries in PETSC_DIR to usr/lib/<arch>
-breakout-link usr/lib/petscdir/petsc* -> usr/lib/*
+ldconfig-escape usr/lib/petscdir/petsc* -> usr/lib/*
diff --git a/debian/libpetsc-real3.18.lintian-overrides b/debian/libpetsc-real3.18.lintian-overrides
index 7c310e6805..a2c93c3051 100644
--- a/debian/libpetsc-real3.18.lintian-overrides
+++ b/debian/libpetsc-real3.18.lintian-overrides
@@ -1,5 +1,5 @@
# libpetsc.so.X.Y soname links are managed by alternatives (libpetc.so.X.Y)
-ldconfig-symlink-missing-for-shlib usr/lib/*/libpetsc.so.* usr/lib/*/libpetsc-real.so.* libpetsc.so.*
+lacks-versioned-link-to-shared-library usr/lib/*/libpetsc.so.* usr/lib/*/libpetsc-real.so.* libpetsc.so.*
# libpetsc_real.so is handled by alternatives in libpetsc-realX.Y-dev
lacks-unversioned-link-to-shared-library example: usr/lib/*/libpetsc_real.so [usr/lib/*/libpetsc_real.so.*]
diff --git a/debian/libpetsc3.18-dev-common.lintian-overrides b/debian/libpetsc3.18-dev-common.lintian-overrides
index a9629367f2..bef4ff526f 100644
--- a/debian/libpetsc3.18-dev-common.lintian-overrides
+++ b/debian/libpetsc3.18-dev-common.lintian-overrides
@@ -1,3 +1,3 @@
# let matlab scripts remain executable
-executable-not-elf-or-script usr/share/petsc/*/share/petsc/matlab/*.m
-executable-not-elf-or-script usr/share/petsc/*/share/petsc/matlab/*/*.m
+executable-not-elf-or-script [usr/share/petsc/*/share/petsc/matlab/*.m]
+executable-not-elf-or-script [usr/share/petsc/*/share/petsc/matlab/*/*.m]
diff --git a/debian/libpetsc64-complex3.18-dbg.lintian-overrides b/debian/libpetsc64-complex3.18-dbg.lintian-overrides
index e84af74986..8c6dd9682f 100644
--- a/debian/libpetsc64-complex3.18-dbg.lintian-overrides
+++ b/debian/libpetsc64-complex3.18-dbg.lintian-overrides
@@ -1,2 +1,2 @@
# common arch-indep files are installed in usr/share/petsc
-breakout-link usr/lib/petscdir/petsc* -> usr/share/petsc/*
+ldconfig-escape usr/lib/petscdir/petsc* -> usr/share/petsc/*
diff --git a/debian/libpetsc64-complex3.18-dev.lintian-overrides b/debian/libpetsc64-complex3.18-dev.lintian-overrides
index 92e989e2f4..7f8a22fcb9 100644
--- a/debian/libpetsc64-complex3.18-dev.lintian-overrides
+++ b/debian/libpetsc64-complex3.18-dev.lintian-overrides
@@ -1,4 +1,4 @@
# common arch-indep files are installed in usr/share/petsc
-breakout-link usr/lib/petscdir/petsc* -> usr/share/petsc/*
+ldconfig-escape usr/lib/petscdir/petsc* -> usr/share/petsc/*
# link actual libraries in PETSC_DIR to usr/lib/<arch>
-breakout-link usr/lib/petscdir/petsc* -> usr/lib/*
+ldconfig-escape usr/lib/petscdir/petsc* -> usr/lib/*
diff --git a/debian/libpetsc64-complex3.18.lintian-overrides b/debian/libpetsc64-complex3.18.lintian-overrides
index f40a3fd30c..3a805c954b 100644
--- a/debian/libpetsc64-complex3.18.lintian-overrides
+++ b/debian/libpetsc64-complex3.18.lintian-overrides
@@ -1,5 +1,5 @@
# libpetsc64.so.X.Y soname links are managed by alternatives (libpetc64.so.X.Y)
-ldconfig-symlink-missing-for-shlib usr/lib/*/libpetsc64.so.* usr/lib/*/libpetsc64-complex.so.* libpetsc64.so.*
+lacks-versioned-link-to-shared-library usr/lib/*/libpetsc64.so.* usr/lib/*/libpetsc64-complex.so.* libpetsc64.so.*
# libpetsc64_complex.so is handled by alternatives in libpetsc64-complexX.Y-dev
lacks-unversioned-link-to-shared-library example: usr/lib/*/libpetsc64_complex.so [usr/lib/*/libpetsc64_complex.so.*]
diff --git a/debian/libpetsc64-real3.18-dbg.lintian-overrides b/debian/libpetsc64-real3.18-dbg.lintian-overrides
index e84af74986..8c6dd9682f 100644
--- a/debian/libpetsc64-real3.18-dbg.lintian-overrides
+++ b/debian/libpetsc64-real3.18-dbg.lintian-overrides
@@ -1,2 +1,2 @@
# common arch-indep files are installed in usr/share/petsc
-breakout-link usr/lib/petscdir/petsc* -> usr/share/petsc/*
+ldconfig-escape usr/lib/petscdir/petsc* -> usr/share/petsc/*
diff --git a/debian/libpetsc64-real3.18-dev.lintian-overrides b/debian/libpetsc64-real3.18-dev.lintian-overrides
index 669840ef49..bed58b4516 100644
--- a/debian/libpetsc64-real3.18-dev.lintian-overrides
+++ b/debian/libpetsc64-real3.18-dev.lintian-overrides
@@ -1,6 +1,6 @@
# False positive: the copyright notice is somewhat buried in the upstream text
copyright-without-copyright-notice
# common arch-indep files are installed in usr/share/petsc
-breakout-link usr/lib/petscdir/petsc* -> usr/share/petsc/*
+ldconfig-escape usr/lib/petscdir/petsc* -> usr/share/petsc/*
# link actual libraries in PETSC_DIR to usr/lib/<arch>
-breakout-link usr/lib/petscdir/petsc* -> usr/lib/*
+ldconfig-escape usr/lib/petscdir/petsc* -> usr/lib/*
diff --git a/debian/libpetsc64-real3.18.lintian-overrides b/debian/libpetsc64-real3.18.lintian-overrides
index ddc022614c..9cadf7ff34 100644
--- a/debian/libpetsc64-real3.18.lintian-overrides
+++ b/debian/libpetsc64-real3.18.lintian-overrides
@@ -1,5 +1,5 @@
# libpetsc64.so.X.Y soname links are managed by alternatives (libpetc64.so.X.Y)
-ldconfig-symlink-missing-for-shlib usr/lib/*/libpetsc64.so.* usr/lib/*/libpetsc64-real.so.* libpetsc64.so.*
+lacks-versioned-link-to-shared-library usr/lib/*/libpetsc64.so.* usr/lib/*/libpetsc64-real.so.* libpetsc64.so.*
# libpetsc64_real.so is handled by alternatives in libpetsc64-realX.Y-dev
lacks-unversioned-link-to-shared-library example: usr/lib/*/libpetsc64_real.so [usr/lib/*/libpetsc64_real.so.*]
diff --git a/debian/rules b/debian/rules
index cad640c877..6bf334c085 100755
--- a/debian/rules
+++ b/debian/rules
@@ -659,7 +659,3 @@ override_dh_missing-indep:
dh_missing --list-missing
USCAN_DESTDIR := $(CURDIR)
-
-get-orig-source:
- uscan --no-conf --download-current-version --repack --compression xz
-
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000000..4ba0b27674
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,2 @@
+---
+Contact: Lisandro Dalcin <dalcinl@gmail.com>
diff --git a/debian/watch b/debian/watch
index 9613f7f602..eac47e97ab 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
opts=dversionmangle=s/\+dfsg\d//,repacksuffix=+dfsg1 \
- http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-with-docs-([\d\.]+).tar.gz
+ https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-with-docs-([\d\.]+).tar.gz
