Merging debian version 2.39.3-6.1.

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

7 files changed, 18 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index abf823d..0ea83a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+util-linux (2.39.3-6.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063039
+
+ -- Steve Langasek <vorlon@debian.org>  Wed, 28 Feb 2024 21:32:09 +0000
+
 util-linux (2.39.3-6~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index 7aea0dd..71aacfb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: util-linux
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  asciidoctor <!stage1 !nodoc>,
  bc <!stage1 !nocheck>,
  bison,
@@ -412,7 +412,10 @@ Description: smart column output alignment library - headers
  .
  This package contains the development environment for the mount library.
 
-Package: libuuid1
+Package: libuuid1t64
+Provides: ${t64:Provides}
+Replaces: libuuid1
+Breaks: libuuid1 (<< ${source:Version})
 Architecture: any
 Section: libs
 Priority: optional
@@ -439,7 +442,7 @@ Build-Profiles: <!stage1>
 Section: utils
 Priority: optional
 Pre-Depends:
- libuuid1,
+ libuuid1t64,
  ${misc:Pre-Depends}
 Depends:
  adduser,
@@ -483,7 +486,7 @@ Section: libdevel
 Priority: optional
 Depends:
  libc6-dev | libc-dev,
- libuuid1 (= ${binary:Version}),
+ libuuid1t64 (= ${binary:Version}),
  ${misc:Depends}
 Multi-Arch: same
 Description: Universally Unique ID library - headers and static libraries
diff --git a/debian/libuuid1.shlibs b/debian/libuuid1.shlibs
deleted file mode 100644
index b050d60..0000000
--- a/debian/libuuid1.shlibs
+++ /dev/null
@@ -1,2 +0,0 @@
-libuuid 1 libuuid1 (>= 2.31)
-udeb: libuuid 1 libuuid1-udeb (>= 2.31)
diff --git a/debian/libuuid1.install b/debian/libuuid1t64.install
index 76c1cf9..76c1cf9 100644
--- a/debian/libuuid1.install
+++ b/debian/libuuid1t64.install
diff --git a/debian/libuuid1t64.lintian-overrides b/debian/libuuid1t64.lintian-overrides
new file mode 100644
index 0000000..624ce7b
--- /dev/null
+++ b/debian/libuuid1t64.lintian-overrides
@@ -0,0 +1 @@
+libuuid1t64: package-name-doesnt-match-sonames libuuid1
diff --git a/debian/libuuid1t64.shlibs b/debian/libuuid1t64.shlibs
new file mode 100644
index 0000000..30fc1ed
--- /dev/null
+++ b/debian/libuuid1t64.shlibs
@@ -0,0 +1,2 @@
+libuuid 1 libuuid1t64 (>= 2.31)
+udeb: libuuid 1 libuuid1t64-udeb (>= 2.31)
diff --git a/debian/libuuid1.symbols b/debian/libuuid1t64.symbols
index 43559d1..d7d0f14 100644
--- a/debian/libuuid1.symbols
+++ b/debian/libuuid1t64.symbols
@@ -1,4 +1,4 @@
-libuuid.so.1 libuuid1 #MINVER#
+libuuid.so.1 libuuid1t64 #MINVER#
 * Build-Depends-Package: uuid-dev
  UUIDD_PRIVATE@UUIDD_PRIVATE 2.20.1
  UUID_1.0@UUID_1.0 2.16