Bug#1061891: apbs: NMU diff for 64-bit time_t transition

2024-02-27 Thread Steve Langasek
Dear maintainer,

Please find attached a final version of this patch for the time_t
transition.  This patch is being uploaded to unstable.

Note that this adds a versioned build-dependency on dpkg-dev, to guard
against accidental backports with a wrong ABI.

Thanks!


-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru apbs-3.4.1/debian/changelog apbs-3.4.1/debian/changelog
--- apbs-3.4.1/debian/changelog 2023-01-10 20:56:38.0 +
+++ apbs-3.4.1/debian/changelog 2024-02-28 01:04:53.0 +
@@ -1,3 +1,10 @@
+apbs (3.4.1-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1061891
+
+ -- Steve Langasek   Wed, 28 Feb 2024 01:04:53 +
+
 apbs (3.4.1-5) unstable; urgency=medium
 
   * Team upload.
diff -Nru apbs-3.4.1/debian/control apbs-3.4.1/debian/control
--- apbs-3.4.1/debian/control   2023-01-10 18:37:05.0 +
+++ apbs-3.4.1/debian/control   2024-02-28 01:04:53.0 +
@@ -3,7 +3,7 @@
 Uploaders: Michael Banck 
 Section: science
 Priority: optional
-Build-Depends: cmake,
+Build-Depends: dpkg-dev (>= 1.22.5), cmake,
  debhelper-compat (= 13),
  dh-python,
  pybuild-plugin-pyproject,
@@ -32,7 +32,7 @@
 Package: apbs
 Architecture: any
 Depends: apbs-data (= ${source:Version}),
- libapbs3 (= ${binary:Version}),
+ libapbs3t64 (= ${binary:Version}),
  libjs-mathjax,
  ${misc:Depends},
  ${shlibs:Depends},
@@ -61,7 +61,7 @@
 Package: python3-apbslib
 Section: python
 Architecture: any
-Depends: libapbs3 (= ${binary:Version}),
+Depends: libapbs3t64 (= ${binary:Version}),
  ${misc:Depends},
  ${python3:Depends},
  ${shlibs:Depends},
@@ -78,7 +78,7 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libapbs3 (= ${binary:Version}),
+Depends: libapbs3t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: Adaptive Poisson Boltzmann Solver
@@ -90,7 +90,10 @@
  This package contains the development headers to build against
  libapbs_* shared libraries.
 
-Package: libapbs3
+Package: libapbs3t64
+Provides: ${t64:Provides}
+Replaces: libapbs3
+Breaks: libapbs3 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -150,7 +153,7 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libfetk1.9 (= ${binary:Version}),
+Depends: libfetk1.9t64 (= ${binary:Version}),
  libmaloc-dev,
  ${misc:Depends},
  ${shlibs:Depends},
@@ -175,7 +178,10 @@
  This package contains the development headers to build against
  libapbs_* shared libraries.
 
-Package: libfetk1.9
+Package: libfetk1.9t64
+Provides: ${t64:Provides}
+Replaces: libfetk1.9
+Breaks: libfetk1.9 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
diff -Nru apbs-3.4.1/debian/external_deps/fetk/README.orig 
apbs-3.4.1/debian/external_deps/fetk/README.orig
--- apbs-3.4.1/debian/external_deps/fetk/README.orig2023-01-10 
18:37:05.0 +
+++ apbs-3.4.1/debian/external_deps/fetk/README.orig1970-01-01 
00:00:00.0 +
@@ -1,85 +0,0 @@
-
-Welcome to FETK (The Finite Element ToolKit).
-
-FETK is developed and maintained by the Mathematical and Computational 
-Physics Group in the Mathematics and Physics Departments at UC San Diego,
-together with colleagues from around the world.  The development effort 
-is based in the Center for Computational Mathematics at UCSD.  For more 
-detailed information about FETK, see the FETK.org website:
-
-http://FETK.org/
-
-In brief, FETK consists of a number of finite element modeling 
-software libraries that depend on each other in a hierarchical way.
-The dependencies in the core FETK libraries are:
-
-   MALOC
- |
- |-> SG .
- |   \
- |-> PUNC   > MC
- |   /
- |-> GAMer  /
-
-The solid lines mean that there is a build dependency; the dotted lines 
-means that there is run-time dependency, in that additional capabilities 
-are provided to MC if either/both of SG and/or GAMer have been built.
-FETK is based around a GNU autoconf build framework; you can build each 
-library independently, or you can build the entire FETK suite using a 
-script we provide (see below).  Below is a brief summary of what the 
-core libraries do.
-
-MALOC (Minimal Abstraction Layer for Object-oriented C):
-  All of the FETK libraries depend on the single low-level abstraction 
-  library MALOC (as does several tools developed separately from FETK, 
-  such as APBS; see the ABPS website for more information about APBS).
-  See the FETK website for more information about 

Bug#1061891: apbs: NMU diff for 64-bit time_t transition

2024-01-30 Thread Steve Langasek
Source: apbs
Followup-For: Bug #1061891

Apologies, an oversight in the conversion script caused us to fail to
update strict versioned dependencies on the previous package name.
Please find attached a fixed patch.

This has also now been uploaded to experimental.
diff -Nru apbs-3.4.1/debian/changelog apbs-3.4.1/debian/changelog
--- apbs-3.4.1/debian/changelog 2023-01-10 20:56:38.0 +
+++ apbs-3.4.1/debian/changelog 2024-01-31 05:45:09.0 +
@@ -1,3 +1,11 @@
+apbs (3.4.1-5.1~exp2) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+  * Fix uninstallable packages from the previous upload.
+
+ -- Steve Langasek   Wed, 31 Jan 2024 05:45:09 +
+
 apbs (3.4.1-5) unstable; urgency=medium
 
   * Team upload.
diff -Nru apbs-3.4.1/debian/control apbs-3.4.1/debian/control
--- apbs-3.4.1/debian/control   2023-01-10 18:37:05.0 +
+++ apbs-3.4.1/debian/control   2024-01-31 05:44:56.0 +
@@ -32,7 +32,7 @@
 Package: apbs
 Architecture: any
 Depends: apbs-data (= ${source:Version}),
- libapbs3 (= ${binary:Version}),
+ libapbs3t64 (= ${binary:Version}),
  libjs-mathjax,
  ${misc:Depends},
  ${shlibs:Depends},
@@ -61,7 +61,7 @@
 Package: python3-apbslib
 Section: python
 Architecture: any
-Depends: libapbs3 (= ${binary:Version}),
+Depends: libapbs3t64 (= ${binary:Version}),
  ${misc:Depends},
  ${python3:Depends},
  ${shlibs:Depends},
@@ -78,7 +78,7 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libapbs3 (= ${binary:Version}),
+Depends: libapbs3t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: Adaptive Poisson Boltzmann Solver
@@ -90,7 +90,10 @@
  This package contains the development headers to build against
  libapbs_* shared libraries.
 
-Package: libapbs3
+Package: libapbs3t64
+Provides: ${t64:Provides}
+Replaces: libapbs3
+Breaks: libapbs3 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -150,7 +153,7 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libfetk1.9 (= ${binary:Version}),
+Depends: libfetk1.9t64 (= ${binary:Version}),
  libmaloc-dev,
  ${misc:Depends},
  ${shlibs:Depends},
@@ -175,7 +178,10 @@
  This package contains the development headers to build against
  libapbs_* shared libraries.
 
-Package: libfetk1.9
+Package: libfetk1.9t64
+Provides: ${t64:Provides}
+Replaces: libfetk1.9
+Breaks: libfetk1.9 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
diff -Nru apbs-3.4.1/debian/external_deps/fetk/README.orig 
apbs-3.4.1/debian/external_deps/fetk/README.orig
--- apbs-3.4.1/debian/external_deps/fetk/README.orig2023-01-10 
18:37:05.0 +
+++ apbs-3.4.1/debian/external_deps/fetk/README.orig1970-01-01 
00:00:00.0 +
@@ -1,85 +0,0 @@
-
-Welcome to FETK (The Finite Element ToolKit).
-
-FETK is developed and maintained by the Mathematical and Computational 
-Physics Group in the Mathematics and Physics Departments at UC San Diego,
-together with colleagues from around the world.  The development effort 
-is based in the Center for Computational Mathematics at UCSD.  For more 
-detailed information about FETK, see the FETK.org website:
-
-http://FETK.org/
-
-In brief, FETK consists of a number of finite element modeling 
-software libraries that depend on each other in a hierarchical way.
-The dependencies in the core FETK libraries are:
-
-   MALOC
- |
- |-> SG .
- |   \
- |-> PUNC   > MC
- |   /
- |-> GAMer  /
-
-The solid lines mean that there is a build dependency; the dotted lines 
-means that there is run-time dependency, in that additional capabilities 
-are provided to MC if either/both of SG and/or GAMer have been built.
-FETK is based around a GNU autoconf build framework; you can build each 
-library independently, or you can build the entire FETK suite using a 
-script we provide (see below).  Below is a brief summary of what the 
-core libraries do.
-
-MALOC (Minimal Abstraction Layer for Object-oriented C):
-  All of the FETK libraries depend on the single low-level abstraction 
-  library MALOC (as does several tools developed separately from FETK, 
-  such as APBS; see the ABPS website for more information about APBS).
-  See the FETK website for more information about MALOC.
-
-PUNC (Portable Understructure for Numerical Computing):
-  The MC library (below) depends on having access to a standard set 
-  of numerical libraries such as BLAS, LAPACK, SuperLU, UMFPACK, ARPACK,
-  and a few other tools.  PUNC looks for these on the given platform,
-  and builds them if it is unable to locate a functioning library;
-  after building and installing PUNC, the MC library is assured of having
-  access to all of the standard libraries on which it depends.
-  See the FETK website for more information about PUNC.
-
-SG (Socket Graphics):
-  The SG library provides a 

Bug#1061891: apbs: NMU diff for 64-bit time_t transition

2024-01-29 Thread Steve Langasek
Source: apbs
Version: 3.4.1-5
Severity: serious
Tags: patch pending
Justification: library ABI skew on upgrade
User: debian-...@lists.debian.org
Usertags: time-t

Dear maintainer,

As part of the 64-bit time_t transition required to support 32-bit
architectures in 2038 and beyond
(https://wiki.debian.org/ReleaseGoals/64bit-time), we have identified
apbs as a source package shipping runtime libraries whose ABI
either is affected by the change in size of time_t, or could not be
analyzed via abi-compliance-checker (and therefore to be on the safe
side we assume is affected).

To ensure that inconsistent combinations of libraries with their
reverse-dependencies are never installed together, it is necessary to
have a library transition, which is most easily done by renaming the
runtime library package.

Since turning on 64-bit time_t is being handled centrally through a change
to the default dpkg-buildflags (https://bugs.debian.org/1037136), it is
important that libraries affected by this ABI change all be uploaded close
together in time.  Therefore I have prepared a 0-day NMU for apbs
which will initially be uploaded to experimental if possible, then to
unstable after packages have cleared binary NEW.

Please find the patch for this NMU attached.

If you have any concerns about this patch, please reach out ASAP.  Although
this package will be uploaded to experimental immediately, there will be a
period of several days before we begin uploads to unstable; so if information
becomes available that your package should not be included in the transition,
there is time for us to amend the planned uploads.



-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru apbs-3.4.1/debian/changelog apbs-3.4.1/debian/changelog
--- apbs-3.4.1/debian/changelog 2023-01-10 20:56:38.0 +
+++ apbs-3.4.1/debian/changelog 2024-01-30 00:38:50.0 +
@@ -1,3 +1,10 @@
+apbs (3.4.1-5.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Tue, 30 Jan 2024 00:38:50 +
+
 apbs (3.4.1-5) unstable; urgency=medium
 
   * Team upload.
diff -Nru apbs-3.4.1/debian/control apbs-3.4.1/debian/control
--- apbs-3.4.1/debian/control   2023-01-10 18:37:05.0 +
+++ apbs-3.4.1/debian/control   2024-01-30 00:38:50.0 +
@@ -90,7 +90,10 @@
  This package contains the development headers to build against
  libapbs_* shared libraries.
 
-Package: libapbs3
+Package: libapbs3t64
+Provides: ${t64:Provides}
+Replaces: libapbs3
+Breaks: libapbs3 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -175,7 +178,10 @@
  This package contains the development headers to build against
  libapbs_* shared libraries.
 
-Package: libfetk1.9
+Package: libfetk1.9t64
+Provides: ${t64:Provides}
+Replaces: libfetk1.9
+Breaks: libfetk1.9 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
diff -Nru apbs-3.4.1/debian/external_deps/fetk/README.orig 
apbs-3.4.1/debian/external_deps/fetk/README.orig
--- apbs-3.4.1/debian/external_deps/fetk/README.orig2023-01-10 
18:37:05.0 +
+++ apbs-3.4.1/debian/external_deps/fetk/README.orig1970-01-01 
00:00:00.0 +
@@ -1,85 +0,0 @@
-
-Welcome to FETK (The Finite Element ToolKit).
-
-FETK is developed and maintained by the Mathematical and Computational 
-Physics Group in the Mathematics and Physics Departments at UC San Diego,
-together with colleagues from around the world.  The development effort 
-is based in the Center for Computational Mathematics at UCSD.  For more 
-detailed information about FETK, see the FETK.org website:
-
-http://FETK.org/
-
-In brief, FETK consists of a number of finite element modeling 
-software libraries that depend on each other in a hierarchical way.
-The dependencies in the core FETK libraries are:
-
-   MALOC
- |
- |-> SG .
- |   \
- |-> PUNC   > MC
- |   /
- |-> GAMer  /
-
-The solid lines mean that there is a build dependency; the dotted lines 
-means that there is run-time dependency, in that additional capabilities 
-are provided to MC if either/both of SG and/or GAMer have been built.
-FETK is based around a GNU autoconf build framework; you can build each 
-library independently, or you can build the entire FETK suite using a 
-script we provide (see below).  Below is a brief summary of what the 
-core libraries do.
-
-MALOC (Minimal Abstraction Layer for Object-oriented C):
-  All of the FETK libraries depend on the single low-level