From 2d01464d04d3d0ce83fce8f574b664485266f48e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 14 Apr 2024 21:20:49 +0200 Subject: Merging debian version 2.39.3-6.1. Signed-off-by: Daniel Baumann --- debian/changelog | 7 +++++++ debian/control | 11 +++++++---- debian/libuuid1.install | 1 - debian/libuuid1.shlibs | 2 -- debian/libuuid1.symbols | 29 ----------------------------- debian/libuuid1t64.install | 1 + debian/libuuid1t64.lintian-overrides | 1 + debian/libuuid1t64.shlibs | 2 ++ debian/libuuid1t64.symbols | 29 +++++++++++++++++++++++++++++ 9 files changed, 47 insertions(+), 36 deletions(-) delete mode 100644 debian/libuuid1.install delete mode 100644 debian/libuuid1.shlibs delete mode 100644 debian/libuuid1.symbols create mode 100644 debian/libuuid1t64.install create mode 100644 debian/libuuid1t64.lintian-overrides create mode 100644 debian/libuuid1t64.shlibs create mode 100644 debian/libuuid1t64.symbols (limited to 'debian') 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 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 , bc , 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: 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.install b/debian/libuuid1.install deleted file mode 100644 index 76c1cf9..0000000 --- a/debian/libuuid1.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libuuid*.so.* 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.symbols b/debian/libuuid1.symbols deleted file mode 100644 index 43559d1..0000000 --- a/debian/libuuid1.symbols +++ /dev/null @@ -1,29 +0,0 @@ -libuuid.so.1 libuuid1 #MINVER# -* Build-Depends-Package: uuid-dev - UUIDD_PRIVATE@UUIDD_PRIVATE 2.20.1 - UUID_1.0@UUID_1.0 2.16 - UUID_2.20@UUID_2.20 2.20.1 - UUID_2.31@UUID_2.31 2.31.1 - UUID_2.36@UUID_2.36 2.36 - __uuid_generate_random@UUIDD_PRIVATE 2.20.1 - __uuid_generate_time@UUIDD_PRIVATE 2.20.1 - __uuid_generate_time_cont@UUIDD_PRIVATE 2.38.1-2~ - uuid_clear@UUID_1.0 2.16 - uuid_compare@UUID_1.0 2.16 - uuid_copy@UUID_1.0 2.16 - uuid_generate@UUID_1.0 2.16 - uuid_generate_md5@UUID_2.31 2.31.1 - uuid_generate_random@UUID_1.0 2.16 - uuid_generate_sha1@UUID_2.31 2.31.1 - uuid_generate_time@UUID_1.0 2.16 - uuid_generate_time_safe@UUID_2.20 2.20.1 - uuid_get_template@UUID_2.31 2.31.1 - uuid_is_null@UUID_1.0 2.16 - uuid_parse@UUID_1.0 2.16 - uuid_parse_range@UUID_2.36 2.36 - uuid_time@UUID_1.0 2.16 - uuid_type@UUID_1.0 2.16 - uuid_unparse@UUID_1.0 2.16 - uuid_unparse_lower@UUID_1.0 2.16 - uuid_unparse_upper@UUID_1.0 2.16 - uuid_variant@UUID_1.0 2.16 diff --git a/debian/libuuid1t64.install b/debian/libuuid1t64.install new file mode 100644 index 0000000..76c1cf9 --- /dev/null +++ b/debian/libuuid1t64.install @@ -0,0 +1 @@ +usr/lib/*/libuuid*.so.* 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/libuuid1t64.symbols b/debian/libuuid1t64.symbols new file mode 100644 index 0000000..d7d0f14 --- /dev/null +++ b/debian/libuuid1t64.symbols @@ -0,0 +1,29 @@ +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 + UUID_2.20@UUID_2.20 2.20.1 + UUID_2.31@UUID_2.31 2.31.1 + UUID_2.36@UUID_2.36 2.36 + __uuid_generate_random@UUIDD_PRIVATE 2.20.1 + __uuid_generate_time@UUIDD_PRIVATE 2.20.1 + __uuid_generate_time_cont@UUIDD_PRIVATE 2.38.1-2~ + uuid_clear@UUID_1.0 2.16 + uuid_compare@UUID_1.0 2.16 + uuid_copy@UUID_1.0 2.16 + uuid_generate@UUID_1.0 2.16 + uuid_generate_md5@UUID_2.31 2.31.1 + uuid_generate_random@UUID_1.0 2.16 + uuid_generate_sha1@UUID_2.31 2.31.1 + uuid_generate_time@UUID_1.0 2.16 + uuid_generate_time_safe@UUID_2.20 2.20.1 + uuid_get_template@UUID_2.31 2.31.1 + uuid_is_null@UUID_1.0 2.16 + uuid_parse@UUID_1.0 2.16 + uuid_parse_range@UUID_2.36 2.36 + uuid_time@UUID_1.0 2.16 + uuid_type@UUID_1.0 2.16 + uuid_unparse@UUID_1.0 2.16 + uuid_unparse_lower@UUID_1.0 2.16 + uuid_unparse_upper@UUID_1.0 2.16 + uuid_variant@UUID_1.0 2.16 -- cgit v1.2.3