Merging debian version 2.1.6-4.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

29 files changed, 71 insertions, 28 deletions

diff --git a/debian/changelog b/debian/changelog
index f0c8ee5..2d1df03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pacemaker (2.1.6-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063194
+
+ -- Benjamin Drung <bdrung@debian.org>  Thu, 29 Feb 2024 19:12:54 +0000
+
 pacemaker (2.1.6-4~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index 32af3ed..6fd60fe 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ XSBC-Original-Uploaders:
  Ferenc Wágner <wferi@debian.org>,
  Adrian Vondendriesch <adrian.vondendriesch@credativ.de>,
 Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  cluster-glue-dev,
  debhelper-compat (= 13),
  dh-exec,
@@ -184,7 +184,10 @@ Description: cluster resource manager HTML documentation
   * the Pacemaker Explained book and
   * the Pacemaker Remote book.
 
-Package: libcib27
+Package: libcib27t64
+Provides: ${t64:Provides}
+Replaces: libcib27
+Breaks: libcib27 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -196,7 +199,10 @@ Description: cluster resource manager CIB library
  .
  This package contains the Cluster Information Base library.
 
-Package: libcrmcluster29
+Package: libcrmcluster29t64
+Provides: ${t64:Provides}
+Replaces: libcrmcluster29
+Breaks: libcrmcluster29 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -208,7 +214,10 @@ Description: cluster resource manager cluster library
  .
  This package contains the cluster library.
 
-Package: libcrmcommon34
+Package: libcrmcommon34t64
+Provides: ${t64:Provides}
+Replaces: libcrmcommon34
+Breaks: libcrmcommon34 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -220,7 +229,10 @@ Description: cluster resource manager common library
  .
  This package contains the common library.
 
-Package: libcrmservice28
+Package: libcrmservice28t64
+Provides: ${t64:Provides}
+Replaces: libcrmservice28
+Breaks: libcrmservice28 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -232,7 +244,10 @@ Description: cluster resource manager service library
  .
  This package contains the service library.
 
-Package: liblrmd28
+Package: liblrmd28t64
+Provides: ${t64:Provides}
+Replaces: liblrmd28
+Breaks: liblrmd28 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -244,7 +259,10 @@ Description: cluster resource manager LRMD library
  .
  This package contains the Local Resource Manager Daemon library.
 
-Package: libpacemaker1
+Package: libpacemaker1t64
+Provides: ${t64:Provides}
+Replaces: libpacemaker1
+Breaks: libpacemaker1 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -257,7 +275,10 @@ Description: cluster resource manager utility library
  This package contains the utility library resulting from the merge
  of libpengine and libtransitioner.
 
-Package: libpe-rules26
+Package: libpe-rules26t64
+Provides: ${t64:Provides}
+Replaces: libpe-rules26
+Breaks: libpe-rules26 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -269,7 +290,10 @@ Description: cluster resource manager Policy Engine rules library
  .
  This package contains the Policy Engine rules library.
 
-Package: libpe-status28
+Package: libpe-status28t64
+Provides: ${t64:Provides}
+Replaces: libpe-status28
+Breaks: libpe-status28 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -281,7 +305,10 @@ Description: cluster resource manager Policy Engine status library
  .
  This package contains the Policy Engine status library.
 
-Package: libstonithd26
+Package: libstonithd26t64
+Provides: ${t64:Provides}
+Replaces: libstonithd26
+Breaks: libstonithd26 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -316,15 +343,15 @@ Multi-Arch: same
 Section: libdevel
 Depends:
  ${misc:Depends},
- libcib27 (= ${binary:Version}),
- libcrmcluster29 (= ${binary:Version}),
- libcrmcommon34 (= ${binary:Version}),
- libcrmservice28 (= ${binary:Version}),
- liblrmd28 (= ${binary:Version}),
- libpacemaker1 (= ${binary:Version}),
- libpe-rules26 (= ${binary:Version}),
- libpe-status28 (= ${binary:Version}),
- libstonithd26 (= ${binary:Version}),
+ libcib27t64 (= ${binary:Version}),
+ libcrmcluster29t64 (= ${binary:Version}),
+ libcrmcommon34t64 (= ${binary:Version}),
+ libcrmservice28t64 (= ${binary:Version}),
+ liblrmd28t64 (= ${binary:Version}),
+ libpacemaker1t64 (= ${binary:Version}),
+ libpe-rules26t64 (= ${binary:Version}),
+ libpe-status28t64 (= ${binary:Version}),
+ libstonithd26t64 (= ${binary:Version}),
 # we include headers from these:
  libcpg-dev,
  libglib2.0-dev,
diff --git a/debian/libcib27.install b/debian/libcib27t64.install
index c4c7f15..c4c7f15 100644
--- a/debian/libcib27.install
+++ b/debian/libcib27t64.install
diff --git a/debian/libcib27t64.lintian-overrides b/debian/libcib27t64.lintian-overrides
new file mode 100644
index 0000000..cddf222
--- /dev/null
+++ b/debian/libcib27t64.lintian-overrides
@@ -0,0 +1 @@
+libcib27t64: package-name-doesnt-match-sonames libcib27
diff --git a/debian/libcib27.symbols b/debian/libcib27t64.symbols
index 899b862..be0fc47 100644
--- a/debian/libcib27.symbols
+++ b/debian/libcib27t64.symbols
@@ -1,4 +1,4 @@
-libcib.so.27 libcib27 #MINVER#
+libcib.so.27 libcib27t64 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  cib__clean_up_connection@Base 2.1.4
  cib__config_changed_v1@Base 2.1.6
diff --git a/debian/libcrmcluster29.install b/debian/libcrmcluster29t64.install
index b3ad577..b3ad577 100644
--- a/debian/libcrmcluster29.install
+++ b/debian/libcrmcluster29t64.install
diff --git a/debian/libcrmcluster29t64.lintian-overrides b/debian/libcrmcluster29t64.lintian-overrides
new file mode 100644
index 0000000..8c79aa6
--- /dev/null
+++ b/debian/libcrmcluster29t64.lintian-overrides
@@ -0,0 +1 @@
+libcrmcluster29t64: package-name-doesnt-match-sonames libcrmcluster29
diff --git a/debian/libcrmcluster29.symbols b/debian/libcrmcluster29t64.symbols
index 6574ea0..e6557a9 100644
--- a/debian/libcrmcluster29.symbols
+++ b/debian/libcrmcluster29t64.symbols
@@ -1,4 +1,4 @@
-libcrmcluster.so.29 libcrmcluster29 #MINVER#
+libcrmcluster.so.29 libcrmcluster29t64 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  cluster_connect_cpg@Base 1.1.10
  cluster_disconnect_cpg@Base 1.1.10
diff --git a/debian/libcrmcommon34.install b/debian/libcrmcommon34t64.install
index 612e360..612e360 100644
--- a/debian/libcrmcommon34.install
+++ b/debian/libcrmcommon34t64.install
diff --git a/debian/libcrmcommon34t64.lintian-overrides b/debian/libcrmcommon34t64.lintian-overrides
new file mode 100644
index 0000000..9005ec8
--- /dev/null
+++ b/debian/libcrmcommon34t64.lintian-overrides
@@ -0,0 +1 @@
+libcrmcommon34t64: package-name-doesnt-match-sonames libcrmcommon34
diff --git a/debian/libcrmcommon34.symbols b/debian/libcrmcommon34t64.symbols
index b00f283..0539d05 100644
--- a/debian/libcrmcommon34.symbols
+++ b/debian/libcrmcommon34t64.symbols
@@ -1,4 +1,4 @@
-libcrmcommon.so.34 libcrmcommon34 #MINVER#
+libcrmcommon.so.34 libcrmcommon34t64 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  add_message_xml@Base 1.1.9
  add_node_copy@Base 1.1.9
diff --git a/debian/libcrmservice28.install b/debian/libcrmservice28t64.install
index 8910f1e..8910f1e 100644
--- a/debian/libcrmservice28.install
+++ b/debian/libcrmservice28t64.install
diff --git a/debian/libcrmservice28t64.lintian-overrides b/debian/libcrmservice28t64.lintian-overrides
new file mode 100644
index 0000000..6ce04f0
--- /dev/null
+++ b/debian/libcrmservice28t64.lintian-overrides
@@ -0,0 +1 @@
+libcrmservice28t64: package-name-doesnt-match-sonames libcrmservice28
diff --git a/debian/libcrmservice28.symbols b/debian/libcrmservice28t64.symbols
index f3210a1..8c00230 100644
--- a/debian/libcrmservice28.symbols
+++ b/debian/libcrmservice28t64.symbols
@@ -1,4 +1,4 @@
-libcrmservice.so.28 libcrmservice28 #MINVER#
+libcrmservice.so.28 libcrmservice28t64 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  get_directory_list@Base 1.1.13
  resources_action_create@Base 1.1.13
diff --git a/debian/liblrmd28.install b/debian/liblrmd28t64.install
index c553ddc..c553ddc 100644
--- a/debian/liblrmd28.install
+++ b/debian/liblrmd28t64.install
diff --git a/debian/liblrmd28t64.lintian-overrides b/debian/liblrmd28t64.lintian-overrides
new file mode 100644
index 0000000..0ccce55
--- /dev/null
+++ b/debian/liblrmd28t64.lintian-overrides
@@ -0,0 +1 @@
+liblrmd28t64: package-name-doesnt-match-sonames liblrmd28
diff --git a/debian/liblrmd28.symbols b/debian/liblrmd28t64.symbols
index 7bae4e0..5625a2e 100644
--- a/debian/liblrmd28.symbols
+++ b/debian/liblrmd28t64.symbols
@@ -1,4 +1,4 @@
-liblrmd.so.28 liblrmd28 #MINVER#
+liblrmd.so.28 liblrmd28t64 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  lrmd__init_remote_key@Base 2.1.1
  lrmd__metadata_async@Base 2.1.5
diff --git a/debian/libpacemaker1.install b/debian/libpacemaker1t64.install
index 71c739c..71c739c 100644
--- a/debian/libpacemaker1.install
+++ b/debian/libpacemaker1t64.install
diff --git a/debian/libpacemaker1t64.lintian-overrides b/debian/libpacemaker1t64.lintian-overrides
new file mode 100644
index 0000000..5ff868d
--- /dev/null
+++ b/debian/libpacemaker1t64.lintian-overrides
@@ -0,0 +1 @@
+libpacemaker1t64: package-name-doesnt-match-sonames libpacemaker1
diff --git a/debian/libpacemaker1.symbols b/debian/libpacemaker1t64.symbols
index 88adb98..40f2d83 100644
--- a/debian/libpacemaker1.symbols
+++ b/debian/libpacemaker1t64.symbols
@@ -1,4 +1,4 @@
-libpacemaker.so.1 libpacemaker1 #MINVER#
+libpacemaker.so.1 libpacemaker1t64 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  clone_action_flags@Base 1.1.14~rc4
  clone_append_meta@Base 1.1.14~rc4
diff --git a/debian/libpe-rules26.install b/debian/libpe-rules26t64.install
index 7cc301b..7cc301b 100644
--- a/debian/libpe-rules26.install
+++ b/debian/libpe-rules26t64.install
diff --git a/debian/libpe-rules26t64.lintian-overrides b/debian/libpe-rules26t64.lintian-overrides
new file mode 100644
index 0000000..892d400
--- /dev/null
+++ b/debian/libpe-rules26t64.lintian-overrides
@@ -0,0 +1 @@
+libpe-rules26t64: package-name-doesnt-match-sonames libpe-rules26
diff --git a/debian/libpe-rules26.symbols b/debian/libpe-rules26t64.symbols
index 2a31c7f..3a27153 100644
--- a/debian/libpe-rules26.symbols
+++ b/debian/libpe-rules26t64.symbols
@@ -1,4 +1,4 @@
-libpe_rules.so.26 libpe-rules26 #MINVER#
+libpe_rules.so.26 libpe-rules26t64 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  add_hash_param@Base 1.0.10
  fail2text@Base 1.0.10
diff --git a/debian/libpe-status28.install b/debian/libpe-status28t64.install
index 4d92e65..4d92e65 100644
--- a/debian/libpe-status28.install
+++ b/debian/libpe-status28t64.install
diff --git a/debian/libpe-status28t64.lintian-overrides b/debian/libpe-status28t64.lintian-overrides
new file mode 100644
index 0000000..3ad32ea
--- /dev/null
+++ b/debian/libpe-status28t64.lintian-overrides
@@ -0,0 +1 @@
+libpe-status28t64: package-name-doesnt-match-sonames libpe-status28
diff --git a/debian/libpe-status28.symbols b/debian/libpe-status28t64.symbols
index 6a1b193..1a8b8c5 100644
--- a/debian/libpe-status28.symbols
+++ b/debian/libpe-status28t64.symbols
@@ -1,4 +1,4 @@
-libpe_status.so.28 libpe-status28 #MINVER#
+libpe_status.so.28 libpe-status28t64 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  add_hash_param@Base 1.1.14~rc4
  add_tag_ref@Base 1.1.14~rc4
diff --git a/debian/libstonithd26.install b/debian/libstonithd26t64.install
index f88790f..f88790f 100644
--- a/debian/libstonithd26.install
+++ b/debian/libstonithd26t64.install
diff --git a/debian/libstonithd26t64.lintian-overrides b/debian/libstonithd26t64.lintian-overrides
new file mode 100644
index 0000000..53861ba
--- /dev/null
+++ b/debian/libstonithd26t64.lintian-overrides
@@ -0,0 +1 @@
+libstonithd26t64: package-name-doesnt-match-sonames libstonithd26
diff --git a/debian/libstonithd26.symbols b/debian/libstonithd26t64.symbols
index 8bca120..16caf25 100644
--- a/debian/libstonithd26.symbols
+++ b/debian/libstonithd26t64.symbols
@@ -1,4 +1,4 @@
-libstonithd.so.26 libstonithd26 #MINVER#
+libstonithd.so.26 libstonithd26t64 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  create_device_registration_xml@Base 1.1.9
  create_level_registration_xml@Base 1.1.9