Attaching an updated debdiff, which fixes usrmerge conflicts.
See https://bugs.debian.org/1062353
I'm also uploading this as ~exp2
-- Lukas
diff -Nru globus-common-18.13/debian/changelog
globus-common-18.13/debian/changelog
--- globus-common-18.13/debian/changelog 2022-07-05 18:58:40.000000000
+0000
+++ globus-common-18.13/debian/changelog 2024-02-05 11:48:13.000000000
+0000
@@ -1,3 +1,11 @@
+globus-common (18.13-2.1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+ * Account for additional t64 Breaks/Replaces (Closes: #1062353).
+
+ -- Lukas Märdian <sl...@debian.org> Mon, 05 Feb 2024 11:48:13 +0000
+
globus-common (18.13-2) unstable; urgency=medium
* Make doxygen Build-Depends-Indep
diff -Nru globus-common-18.13/debian/control globus-common-18.13/debian/control
--- globus-common-18.13/debian/control 2022-07-05 18:58:40.000000000 +0000
+++ globus-common-18.13/debian/control 2024-02-05 11:48:08.000000000 +0000
@@ -13,11 +13,14 @@
Vcs-Git: https://salsa.debian.org/ellert/globus-common.git
Homepage: https://github.com/gridcf/gct/
-Package: libglobus-common0
+Package: libglobus-common0t64
+Provides: ${t64:Provides}
+Breaks: libglobus-common0 (<< ${source:Version})
Section: libs
Architecture: any
Multi-Arch: same
Replaces:
+ libglobus-common0,
libglobus-usage0 (<< 6),
Conflicts:
libglobus-usage0 (<< 6)
@@ -34,7 +37,7 @@
Community Forum (GridCF) that provides community-based support for core
software packages in grid computing.
.
- The libglobus-common0 package contains:
+ The libglobus-common0t64 package contains:
Common Library
Package: globus-common-progs
@@ -42,7 +45,7 @@
Architecture: any
Multi-Arch: foreign
Depends:
- libglobus-common0 (= ${binary:Version}),
+ libglobus-common0t64 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Description: Grid Community Toolkit - Common Library Programs
@@ -66,7 +69,7 @@
libglobus-usage-dev (<< 6),
globus-core (<< 10),
Depends:
- libglobus-common0 (= ${binary:Version}),
+ libglobus-common0t64 (= ${binary:Version}),
${misc:Depends},
${perl:Depends},
libltdl-dev
diff -Nru globus-common-18.13/debian/libglobus-common0.docs
globus-common-18.13/debian/libglobus-common0.docs
--- globus-common-18.13/debian/libglobus-common0.docs 2019-07-11
13:15:01.000000000 +0000
+++ globus-common-18.13/debian/libglobus-common0.docs 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/README
diff -Nru globus-common-18.13/debian/libglobus-common0.install
globus-common-18.13/debian/libglobus-common0.install
--- globus-common-18.13/debian/libglobus-common0.install 2020-12-12
15:26:25.000000000 +0000
+++ globus-common-18.13/debian/libglobus-common0.install 1970-01-01
00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-/usr/lib/*/libglobus_common.so.*
-/usr/lib/*/libglobus_memory_debug.so.*
-/usr/lib/*/libglobus_thread_pthread.so
-/usr/share/perl5/Globus/Core/Config.pm
-/usr/share/perl5/Globus/Core/Paths.pm
diff -Nru globus-common-18.13/debian/libglobus-common0.lintian-overrides
globus-common-18.13/debian/libglobus-common0.lintian-overrides
--- globus-common-18.13/debian/libglobus-common0.lintian-overrides
2018-03-02 17:15:08.000000000 +0000
+++ globus-common-18.13/debian/libglobus-common0.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-# This is a loadable plugin - unversioned soname expected
-dev-pkg-without-shlib-symlink */libglobus_thread_pthread.so *
-shlib-without-versioned-soname */libglobus_thread_pthread.so *
diff -Nru globus-common-18.13/debian/libglobus-common0.shlibs
globus-common-18.13/debian/libglobus-common0.shlibs
--- globus-common-18.13/debian/libglobus-common0.shlibs 2018-03-02
17:15:08.000000000 +0000
+++ globus-common-18.13/debian/libglobus-common0.shlibs 1970-01-01
00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-libglobus_common 0 libglobus-common0 (>= 17)
-libglobus_memory_debug 0 libglobus-common0 (>= 17)
diff -Nru globus-common-18.13/debian/libglobus-common0t64.docs
globus-common-18.13/debian/libglobus-common0t64.docs
--- globus-common-18.13/debian/libglobus-common0t64.docs 1970-01-01
00:00:00.000000000 +0000
+++ globus-common-18.13/debian/libglobus-common0t64.docs 2024-02-05
11:46:59.000000000 +0000
@@ -0,0 +1 @@
+debian/README
diff -Nru globus-common-18.13/debian/libglobus-common0t64.install
globus-common-18.13/debian/libglobus-common0t64.install
--- globus-common-18.13/debian/libglobus-common0t64.install 1970-01-01
00:00:00.000000000 +0000
+++ globus-common-18.13/debian/libglobus-common0t64.install 2024-02-05
11:46:59.000000000 +0000
@@ -0,0 +1,5 @@
+/usr/lib/*/libglobus_common.so.*
+/usr/lib/*/libglobus_memory_debug.so.*
+/usr/lib/*/libglobus_thread_pthread.so
+/usr/share/perl5/Globus/Core/Config.pm
+/usr/share/perl5/Globus/Core/Paths.pm
diff -Nru globus-common-18.13/debian/libglobus-common0t64.lintian-overrides
globus-common-18.13/debian/libglobus-common0t64.lintian-overrides
--- globus-common-18.13/debian/libglobus-common0t64.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
+++ globus-common-18.13/debian/libglobus-common0t64.lintian-overrides
2024-02-05 11:46:59.000000000 +0000
@@ -0,0 +1,4 @@
+# This is a loadable plugin - unversioned soname expected
+dev-pkg-without-shlib-symlink */libglobus_thread_pthread.so *
+shlib-without-versioned-soname */libglobus_thread_pthread.so *
+libglobus-common0t64: package-name-doesnt-match-sonames libglobus-common0
diff -Nru globus-common-18.13/debian/libglobus-common0t64.shlibs
globus-common-18.13/debian/libglobus-common0t64.shlibs
--- globus-common-18.13/debian/libglobus-common0t64.shlibs 1970-01-01
00:00:00.000000000 +0000
+++ globus-common-18.13/debian/libglobus-common0t64.shlibs 2024-02-05
11:46:59.000000000 +0000
@@ -0,0 +1,2 @@
+libglobus_common 0 libglobus-common0t64 (>= 17)
+libglobus_memory_debug 0 libglobus-common0t64 (>= 17)
