17 files changed, 61 insertions, 34 deletions

diff --git a/debian/changelog b/debian/changelog
index 4e103f2..0562aa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cluster-glue (1.0.12-22.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062082
+
+ -- Steve Langasek <vorlon@debian.org>  Wed, 28 Feb 2024 16:16:41 +0000
+
 cluster-glue (1.0.12-22) unstable; urgency=medium
 
   [ Valentin Vidic ]
diff --git a/debian/control b/debian/control
index 081caa4..f90d110 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian HA Maintainers <debian-ha-maintainers@alioth-lists.debian.net
 Uploaders:
  Valentin Vidic <vvidic@debian.org>,
  Ferenc Wágner <wferi@debian.org>,
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  debhelper-compat (= 13),
  asciidoctor,
  autoconf,
@@ -54,11 +54,11 @@ Depends: ${shlibs:Depends},
  adduser,
  bzip2,
  libtimedate-perl,
- liblrm2 (>= ${binary:Version}),
- libpils2 (>= ${binary:Version}),
- libplumb2 (>= ${binary:Version}),
- libplumbgpl2 (>= ${binary:Version}),
- libstonith1 (>= ${binary:Version}),
+ liblrm2t64 (>= ${binary:Version}),
+ libpils2t64 (>= ${binary:Version}),
+ libplumb2t64 (>= ${binary:Version}),
+ libplumbgpl2t64 (>= ${binary:Version}),
+ libstonith1t64 (>= ${binary:Version}),
 Pre-Depends: ${misc:Pre-Depends}
 Suggests:
  ipmitool
@@ -89,60 +89,75 @@ Description: Development files for the cluster glue components
  If you are developing for cluster-glue, you probably want to
  install this package.
 
-Package: liblrm2
+Package: liblrm2t64
+Provides: ${t64:Provides}
+Replaces: liblrm2
+Breaks: liblrm2 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Description: Reusable cluster libraries -- liblrm2
+Description: Reusable cluster libraries -- liblrm2t64
  This package contains the lrm helper library from cluster-glue,
  the reusable cluster components package.
  .
  If you want to use the pacemaker cluster manager, than you want
  to install this package.
 
-Package: libpils2
+Package: libpils2t64
+Provides: ${t64:Provides}
+Replaces: libpils2
+Breaks: libpils2 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Description: Reusable cluster libraries -- libpils2
+Description: Reusable cluster libraries -- libpils2t64
  This package contains the pils library from cluster-glue, the
  reusable cluster components package.
  .
  If you want to use the pacemaker cluster manager, than you want
  to install this package.
 
-Package: libplumb2
+Package: libplumb2t64
+Provides: ${t64:Provides}
+Replaces: libplumb2
+Breaks: libplumb2 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Description: Reusable cluster libraries -- libplumb2
+Description: Reusable cluster libraries -- libplumb2t64
  This package contains the plumber library from cluster-glue, the
  reusable cluster components package.
  .
  If you want to use the pacemaker cluster manager, than you want
  to install this package.
 
-Package: libplumbgpl2
+Package: libplumbgpl2t64
+Provides: ${t64:Provides}
+Replaces: libplumbgpl2
+Breaks: libplumbgpl2 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Description: Reusable cluster libraries -- libplumbgpl2
+Description: Reusable cluster libraries -- libplumbgpl2t64
  This package contains the plumber library from cluster-glue,
  the reusable cluster components package, in the GPL version.
  .
  If you want to use the pacemaker cluster manager, than you want
  to install this package.
 
-Package: libstonith1
+Package: libstonith1t64
+Provides: ${t64:Provides}
+Replaces: libstonith1
+Breaks: libstonith1 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Description: Reusable cluster libraries -- libstonith1
+Description: Reusable cluster libraries -- libstonith1t64
  This package contains the stonith library from cluster-glue, the
  reusable cluster components package.
  .
@@ -153,61 +168,61 @@ Package: liblrm2-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
- liblrm2 (= ${binary:Version})
+ liblrm2t64 (= ${binary:Version})
 Description: Reusable cluster development files -- liblrm
  This package contains the development files of the lrm helper
  library from cluster-glue, the reusable cluster components
  package.
  .
- If you are developing with liblrm2, you probably want to
+ If you are developing with liblrm2t64, you probably want to
  install this package.
 
 Package: libpils2-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
- libpils2 (= ${binary:Version}),
+ libpils2t64 (= ${binary:Version}),
  libltdl-dev
-Description: Reusable cluster development files -- libpils2
+Description: Reusable cluster development files -- libpils2t64
  This package contains the development files of the pils
  library from cluster-glue, the reusable cluster components
  package.
  .
- If you are developing with libpils2, you probably want to
+ If you are developing with libpils2t64, you probably want to
  install this package.
 
 Package: libplumb2-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
- libplumb2 (= ${binary:Version})
-Description: Reusable cluster development files -- libplumb2
+ libplumb2t64 (= ${binary:Version})
+Description: Reusable cluster development files -- libplumb2t64
  This package contains the development files of the plumber
  library from cluster-glue, the reusable cluster components
  package.
  .
- If you are developing with libplumb2, you probably want to
+ If you are developing with libplumb2t64, you probably want to
  install this package.
 
 Package: libplumbgpl2-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
- libplumbgpl2 (= ${binary:Version})
-Description: Reusable cluster development files -- libplumbgpl2
+ libplumbgpl2t64 (= ${binary:Version})
+Description: Reusable cluster development files -- libplumbgpl2t64
  This package contains the development files of the plumber
  library from cluster-glue, the reusable cluster components
  package, in the GPL version.
  .
- If you are developing with libplumbgpl2, you probably want to
+ If you are developing with libplumbgpl2t64, you probably want to
  install this package.
 
 Package: libstonith1-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
- libstonith1 (= ${binary:Version})
-Description: Reusable cluster development files -- libstonith1
+ libstonith1t64 (= ${binary:Version})
+Description: Reusable cluster development files -- libstonith1t64
  This package contains the development files of the stonith
  library from cluster-glue, the reusable cluster components
  package.
diff --git a/debian/liblrm2.install b/debian/liblrm2t64.install
index ab3ceb1..ab3ceb1 100644
--- a/debian/liblrm2.install
+++ b/debian/liblrm2t64.install
diff --git a/debian/liblrm2t64.lintian-overrides b/debian/liblrm2t64.lintian-overrides
new file mode 100644
index 0000000..5f49562
--- /dev/null
+++ b/debian/liblrm2t64.lintian-overrides
@@ -0,0 +1 @@
+liblrm2t64: package-name-doesnt-match-sonames liblrm2
diff --git a/debian/liblrm2.symbols b/debian/liblrm2t64.symbols
index 98db2fc..4cd5746 100644
--- a/debian/liblrm2.symbols
+++ b/debian/liblrm2t64.symbols
@@ -1,4 +1,4 @@
-liblrm.so.2 liblrm2 #MINVER#
+liblrm.so.2 liblrm2t64 #MINVER#
 * Build-Depends-Package: liblrm2-dev
  closefiles@Base 0
  copy_str_table@Base 0
diff --git a/debian/libpils2.install b/debian/libpils2t64.install
index f36befc..f36befc 100644
--- a/debian/libpils2.install
+++ b/debian/libpils2t64.install
diff --git a/debian/libpils2t64.lintian-overrides b/debian/libpils2t64.lintian-overrides
new file mode 100644
index 0000000..cd1aa96
--- /dev/null
+++ b/debian/libpils2t64.lintian-overrides
@@ -0,0 +1 @@
+libpils2t64: package-name-doesnt-match-sonames libpils2
diff --git a/debian/libpils2.symbols b/debian/libpils2t64.symbols
index 5557ca4..be97d00 100644
--- a/debian/libpils2.symbols
+++ b/debian/libpils2t64.symbols
@@ -1,4 +1,4 @@
-libpils.so.2 libpils2 #MINVER#
+libpils.so.2 libpils2t64 #MINVER#
 * Build-Depends-Package: libpils2-dev
  DelPILPluginUniv@Base 0
  NewPILPluginUniv@Base 0
diff --git a/debian/libplumb2.install b/debian/libplumb2t64.install
index 574594c..574594c 100644
--- a/debian/libplumb2.install
+++ b/debian/libplumb2t64.install
diff --git a/debian/libplumb2t64.lintian-overrides b/debian/libplumb2t64.lintian-overrides
new file mode 100644
index 0000000..bd254d3
--- /dev/null
+++ b/debian/libplumb2t64.lintian-overrides
@@ -0,0 +1 @@
+libplumb2t64: package-name-doesnt-match-sonames libplumb2
diff --git a/debian/libplumb2.symbols b/debian/libplumb2t64.symbols
index c821b44..14c8238 100644
--- a/debian/libplumb2.symbols
+++ b/debian/libplumb2t64.symbols
@@ -1,4 +1,4 @@
-libplumb.so.2 libplumb2 #MINVER#
+libplumb.so.2 libplumb2t64 #MINVER#
 * Build-Depends-Package: libplumb2-dev
  CompressFuncs@Base 0
  DisableProcLogging@Base 0
diff --git a/debian/libplumbgpl2.install b/debian/libplumbgpl2t64.install
index fab8102..fab8102 100644
--- a/debian/libplumbgpl2.install
+++ b/debian/libplumbgpl2t64.install
diff --git a/debian/libplumbgpl2t64.lintian-overrides b/debian/libplumbgpl2t64.lintian-overrides
new file mode 100644
index 0000000..d5f74e7
--- /dev/null
+++ b/debian/libplumbgpl2t64.lintian-overrides
@@ -0,0 +1 @@
+libplumbgpl2t64: package-name-doesnt-match-sonames libplumbgpl2
diff --git a/debian/libplumbgpl2.symbols b/debian/libplumbgpl2t64.symbols
index c68f399..c78e11f 100644
--- a/debian/libplumbgpl2.symbols
+++ b/debian/libplumbgpl2t64.symbols
@@ -1,4 +1,4 @@
-libplumbgpl.so.2 libplumbgpl2 #MINVER#
+libplumbgpl.so.2 libplumbgpl2t64 #MINVER#
 * Build-Depends-Package: libplumbgpl2-dev
  init_set_proc_title@Base 0
  nosuchfunctionname@Base 0
diff --git a/debian/libstonith1.install b/debian/libstonith1t64.install
index 6dda1c7..6dda1c7 100644
--- a/debian/libstonith1.install
+++ b/debian/libstonith1t64.install
diff --git a/debian/libstonith1t64.lintian-overrides b/debian/libstonith1t64.lintian-overrides
new file mode 100644
index 0000000..77e0807
--- /dev/null
+++ b/debian/libstonith1t64.lintian-overrides
@@ -0,0 +1 @@
+libstonith1t64: package-name-doesnt-match-sonames libstonith1
diff --git a/debian/libstonith1.symbols b/debian/libstonith1t64.symbols
index bb89df0..c45f2f7 100644
--- a/debian/libstonith1.symbols
+++ b/debian/libstonith1t64.symbols
@@ -1,4 +1,4 @@
-libstonith.so.1 libstonith1 #MINVER#
+libstonith.so.1 libstonith1t64 #MINVER#
 * Build-Depends-Package: libstonith1-dev
  StonithPIsys@Base 0
  free_NVpair@Base 0