summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-14 19:25:20 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-14 19:26:55 +0000
commitc99aa3b3e5684bbdcc2bbc15302e0b822c4fc891 (patch)
tree1ab4e9e4f861b667dcbccf6e106319a0919158f3 /debian
parentMerging debian version 2.39.3-6.1. (diff)
downloadutil-linux-c99aa3b3e5684bbdcc2bbc15302e0b822c4fc891.tar.xz
util-linux-c99aa3b3e5684bbdcc2bbc15302e0b822c4fc891.zip
Reverting t64 migration for backports.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian')
-rw-r--r--debian/control11
-rw-r--r--debian/libuuid1.install (renamed from debian/libuuid1t64.install)0
-rw-r--r--debian/libuuid1.shlibs2
-rw-r--r--debian/libuuid1.symbols (renamed from debian/libuuid1t64.symbols)2
-rw-r--r--debian/libuuid1t64.lintian-overrides1
-rw-r--r--debian/libuuid1t64.shlibs2
6 files changed, 7 insertions, 11 deletions
diff --git a/debian/control b/debian/control
index 71aacfb..7aea0dd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: util-linux
-Build-Depends: dpkg-dev (>= 1.22.5),
+Build-Depends:
asciidoctor <!stage1 !nodoc>,
bc <!stage1 !nocheck>,
bison,
@@ -412,10 +412,7 @@ Description: smart column output alignment library - headers
.
This package contains the development environment for the mount library.
-Package: libuuid1t64
-Provides: ${t64:Provides}
-Replaces: libuuid1
-Breaks: libuuid1 (<< ${source:Version})
+Package: libuuid1
Architecture: any
Section: libs
Priority: optional
@@ -442,7 +439,7 @@ Build-Profiles: <!stage1>
Section: utils
Priority: optional
Pre-Depends:
- libuuid1t64,
+ libuuid1,
${misc:Pre-Depends}
Depends:
adduser,
@@ -486,7 +483,7 @@ Section: libdevel
Priority: optional
Depends:
libc6-dev | libc-dev,
- libuuid1t64 (= ${binary:Version}),
+ libuuid1 (= ${binary:Version}),
${misc:Depends}
Multi-Arch: same
Description: Universally Unique ID library - headers and static libraries
diff --git a/debian/libuuid1t64.install b/debian/libuuid1.install
index 76c1cf9..76c1cf9 100644
--- a/debian/libuuid1t64.install
+++ b/debian/libuuid1.install
diff --git a/debian/libuuid1.shlibs b/debian/libuuid1.shlibs
new file mode 100644
index 0000000..b050d60
--- /dev/null
+++ b/debian/libuuid1.shlibs
@@ -0,0 +1,2 @@
+libuuid 1 libuuid1 (>= 2.31)
+udeb: libuuid 1 libuuid1-udeb (>= 2.31)
diff --git a/debian/libuuid1t64.symbols b/debian/libuuid1.symbols
index d7d0f14..43559d1 100644
--- a/debian/libuuid1t64.symbols
+++ b/debian/libuuid1.symbols
@@ -1,4 +1,4 @@
-libuuid.so.1 libuuid1t64 #MINVER#
+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
diff --git a/debian/libuuid1t64.lintian-overrides b/debian/libuuid1t64.lintian-overrides
deleted file mode 100644
index 624ce7b..0000000
--- a/debian/libuuid1t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libuuid1t64: package-name-doesnt-match-sonames libuuid1
diff --git a/debian/libuuid1t64.shlibs b/debian/libuuid1t64.shlibs
deleted file mode 100644
index 30fc1ed..0000000
--- a/debian/libuuid1t64.shlibs
+++ /dev/null
@@ -1,2 +0,0 @@
-libuuid 1 libuuid1t64 (>= 2.31)
-udeb: libuuid 1 libuuid1t64-udeb (>= 2.31)