Dear maintainer,
Please find attached a final version of this patch for the time_t
transition. This patch is being uploaded to unstable.
Note that this adds a versioned build-dependency on dpkg-dev, to guard
against accidental backports with a wrong ABI.
Thanks!
-- System Information:
Debian Release: trixie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 6.5.0-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru wvstreams-4.6.1/debian/changelog wvstreams-4.6.1/debian/changelog
--- wvstreams-4.6.1/debian/changelog 2024-02-03 22:43:16.000000000 +0000
+++ wvstreams-4.6.1/debian/changelog 2024-02-29 05:52:13.000000000 +0000
@@ -1,3 +1,10 @@
+wvstreams (4.6.1-17.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1063887
+
+ -- Steve Langasek <vor...@debian.org> Thu, 29 Feb 2024 05:52:13 +0000
+
wvstreams (4.6.1-17) unstable; urgency=medium
* QA upload.
diff -Nru wvstreams-4.6.1/debian/control wvstreams-4.6.1/debian/control
--- wvstreams-4.6.1/debian/control 2024-02-03 22:42:59.000000000 +0000
+++ wvstreams-4.6.1/debian/control 2024-02-29 05:52:13.000000000 +0000
@@ -2,7 +2,7 @@
Maintainer: Debian QA Group <packa...@qa.debian.org>
Section: libs
Priority: optional
-Build-Depends: debhelper-compat (= 10),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 10),
autoconf,
autotools-dev,
libdb-dev,
@@ -17,7 +17,11 @@
Standards-Version: 3.9.8
Homepage: https://github.com/apenwarr/wvstreams/
-Package: libwvstreams4.6-base
+Package: libwvstreams4.6t64-base
+Provides: ${t64:Provides}
+X-Time64-Compat: libwvstreams4.6-base
+Replaces: libwvstreams4.6-base
+Breaks: libwvstreams4.6-base (<< ${source:Version})
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -32,7 +36,11 @@
* WvLog: a log files handler
* UniIniGen: a tiny version of UniConf for simple configuration systems
-Package: libwvstreams4.6-extras
+Package: libwvstreams4.6t64-extras
+Provides: ${t64:Provides}
+X-Time64-Compat: libwvstreams4.6-extras
+Replaces: libwvstreams4.6-extras
+Breaks: libwvstreams4.6-extras (<< ${source:Version})
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -46,7 +54,10 @@
WvDial, TunnelVision, FastForward, KWvDial, retchmail, and many more yet
to come. ;)
-Package: libuniconf4.6
+Package: libuniconf4.6t64
+Provides: ${t64:Provides}
+Replaces: libuniconf4.6
+Breaks: libuniconf4.6 (<< ${source:Version})
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -75,9 +86,9 @@
Package: libwvstreams-dev
Architecture: any
Section: libdevel
-Depends: libwvstreams4.6-base (= ${binary:Version}),
- libwvstreams4.6-extras (= ${binary:Version}),
- libuniconf4.6 (= ${binary:Version}),
+Depends: libwvstreams4.6t64-base (= ${binary:Version}),
+ libwvstreams4.6t64-extras (= ${binary:Version}),
+ libuniconf4.6t64 (= ${binary:Version}),
libxplc0.3.13-dev,
${misc:Depends}
Suggests: tk8.5 | wish
diff -Nru wvstreams-4.6.1/debian/libuniconf4.6.install
wvstreams-4.6.1/debian/libuniconf4.6.install
--- wvstreams-4.6.1/debian/libuniconf4.6.install 2011-05-19
22:00:22.000000000 +0000
+++ wvstreams-4.6.1/debian/libuniconf4.6.install 1970-01-01
00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/libuniconf.so*
-debian/tmp/etc/uniconf.conf
diff -Nru wvstreams-4.6.1/debian/libuniconf4.6t64.install
wvstreams-4.6.1/debian/libuniconf4.6t64.install
--- wvstreams-4.6.1/debian/libuniconf4.6t64.install 1970-01-01
00:00:00.000000000 +0000
+++ wvstreams-4.6.1/debian/libuniconf4.6t64.install 2011-05-19
22:00:22.000000000 +0000
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libuniconf.so*
+debian/tmp/etc/uniconf.conf
diff -Nru wvstreams-4.6.1/debian/libuniconf4.6t64.lintian-overrides
wvstreams-4.6.1/debian/libuniconf4.6t64.lintian-overrides
--- wvstreams-4.6.1/debian/libuniconf4.6t64.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ wvstreams-4.6.1/debian/libuniconf4.6t64.lintian-overrides 2024-02-29
05:49:01.000000000 +0000
@@ -0,0 +1 @@
+libuniconf4.6t64: package-name-doesnt-match-sonames libuniconf4.6
diff -Nru wvstreams-4.6.1/debian/libwvstreams4.6-base.dirs
wvstreams-4.6.1/debian/libwvstreams4.6-base.dirs
--- wvstreams-4.6.1/debian/libwvstreams4.6-base.dirs 2011-05-19
22:00:22.000000000 +0000
+++ wvstreams-4.6.1/debian/libwvstreams4.6-base.dirs 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/share/lintian/overrides
diff -Nru wvstreams-4.6.1/debian/libwvstreams4.6-base.install
wvstreams-4.6.1/debian/libwvstreams4.6-base.install
--- wvstreams-4.6.1/debian/libwvstreams4.6-base.install 2011-05-19
22:00:22.000000000 +0000
+++ wvstreams-4.6.1/debian/libwvstreams4.6-base.install 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libwvbase.so*
diff -Nru wvstreams-4.6.1/debian/libwvstreams4.6-base.lintian-override
wvstreams-4.6.1/debian/libwvstreams4.6-base.lintian-override
--- wvstreams-4.6.1/debian/libwvstreams4.6-base.lintian-override
2011-05-19 22:00:22.000000000 +0000
+++ wvstreams-4.6.1/debian/libwvstreams4.6-base.lintian-override
1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-libwvstreams4.6-base: package-name-doesnt-match-sonames
diff -Nru wvstreams-4.6.1/debian/libwvstreams4.6-extras.dirs
wvstreams-4.6.1/debian/libwvstreams4.6-extras.dirs
--- wvstreams-4.6.1/debian/libwvstreams4.6-extras.dirs 2011-05-19
22:00:22.000000000 +0000
+++ wvstreams-4.6.1/debian/libwvstreams4.6-extras.dirs 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/share/lintian/overrides
diff -Nru wvstreams-4.6.1/debian/libwvstreams4.6-extras.install
wvstreams-4.6.1/debian/libwvstreams4.6-extras.install
--- wvstreams-4.6.1/debian/libwvstreams4.6-extras.install 2011-05-19
22:00:22.000000000 +0000
+++ wvstreams-4.6.1/debian/libwvstreams4.6-extras.install 1970-01-01
00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/libwvstreams.so*
-debian/tmp/usr/lib/libwvutils.so*
-debian/tmp/usr/lib/libwvdbus.so*
diff -Nru wvstreams-4.6.1/debian/libwvstreams4.6-extras.lintian-override
wvstreams-4.6.1/debian/libwvstreams4.6-extras.lintian-override
--- wvstreams-4.6.1/debian/libwvstreams4.6-extras.lintian-override
2011-05-19 22:00:22.000000000 +0000
+++ wvstreams-4.6.1/debian/libwvstreams4.6-extras.lintian-override
1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-libwvstreams4.6-extras: package-name-doesnt-match-sonames
diff -Nru wvstreams-4.6.1/debian/libwvstreams4.6t64-base.dirs
wvstreams-4.6.1/debian/libwvstreams4.6t64-base.dirs
--- wvstreams-4.6.1/debian/libwvstreams4.6t64-base.dirs 1970-01-01
00:00:00.000000000 +0000
+++ wvstreams-4.6.1/debian/libwvstreams4.6t64-base.dirs 2011-05-19
22:00:22.000000000 +0000
@@ -0,0 +1 @@
+usr/share/lintian/overrides
diff -Nru wvstreams-4.6.1/debian/libwvstreams4.6t64-base.install
wvstreams-4.6.1/debian/libwvstreams4.6t64-base.install
--- wvstreams-4.6.1/debian/libwvstreams4.6t64-base.install 1970-01-01
00:00:00.000000000 +0000
+++ wvstreams-4.6.1/debian/libwvstreams4.6t64-base.install 2011-05-19
22:00:22.000000000 +0000
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libwvbase.so*
diff -Nru wvstreams-4.6.1/debian/libwvstreams4.6t64-base.lintian-overrides
wvstreams-4.6.1/debian/libwvstreams4.6t64-base.lintian-overrides
--- wvstreams-4.6.1/debian/libwvstreams4.6t64-base.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
+++ wvstreams-4.6.1/debian/libwvstreams4.6t64-base.lintian-overrides
2024-02-29 05:49:01.000000000 +0000
@@ -0,0 +1 @@
+libwvstreams4.6t64-base: package-name-doesnt-match-sonames libwvstreams4.6-base
diff -Nru wvstreams-4.6.1/debian/libwvstreams4.6t64-extras.dirs
wvstreams-4.6.1/debian/libwvstreams4.6t64-extras.dirs
--- wvstreams-4.6.1/debian/libwvstreams4.6t64-extras.dirs 1970-01-01
00:00:00.000000000 +0000
+++ wvstreams-4.6.1/debian/libwvstreams4.6t64-extras.dirs 2011-05-19
22:00:22.000000000 +0000
@@ -0,0 +1 @@
+usr/share/lintian/overrides
diff -Nru wvstreams-4.6.1/debian/libwvstreams4.6t64-extras.install
wvstreams-4.6.1/debian/libwvstreams4.6t64-extras.install
--- wvstreams-4.6.1/debian/libwvstreams4.6t64-extras.install 1970-01-01
00:00:00.000000000 +0000
+++ wvstreams-4.6.1/debian/libwvstreams4.6t64-extras.install 2011-05-19
22:00:22.000000000 +0000
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/libwvstreams.so*
+debian/tmp/usr/lib/libwvutils.so*
+debian/tmp/usr/lib/libwvdbus.so*
diff -Nru wvstreams-4.6.1/debian/libwvstreams4.6t64-extras.lintian-overrides
wvstreams-4.6.1/debian/libwvstreams4.6t64-extras.lintian-overrides
--- wvstreams-4.6.1/debian/libwvstreams4.6t64-extras.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
+++ wvstreams-4.6.1/debian/libwvstreams4.6t64-extras.lintian-overrides
2024-02-29 05:49:01.000000000 +0000
@@ -0,0 +1 @@
+libwvstreams4.6t64-extras: package-name-doesnt-match-sonames
libwvstreams4.6-extras
diff -Nru wvstreams-4.6.1/debian/rules wvstreams-4.6.1/debian/rules
--- wvstreams-4.6.1/debian/rules 2024-02-03 22:42:19.000000000 +0000
+++ wvstreams-4.6.1/debian/rules 2024-02-29 05:51:53.000000000 +0000
@@ -18,7 +18,7 @@
version:=$(shell awk -F= '/SO_VERSION=/{print $$2}' $(CURDIR)/configure.ac)
base=libwvstreams$(version)
# This is used the wvstreams makefile to set the .so links
-PKG=$(CURDIR)/debian/${base}
+PKG=$(CURDIR)/debian/${base}t64
PKGDEV=$(CURDIR)/debian/libwvstreams-dev
PKGDOC=$(CURDIR)/debian/${base}-doc
DOCDIR=$(PKGDOC)/usr/share/doc/$(base)-doc
@@ -128,8 +128,7 @@
$(MAKE) install-dev DESTDIR=$(PKGDEV)
# Install lintian overrides
- install -m644 debian/libwvstreams$(version)-base.lintian-override
debian/libwvstreams$(version)-base/usr/share/lintian/overrides/libwvstreams$(version)-base
- install -m644 debian/libwvstreams$(version)-extras.lintian-override
debian/libwvstreams$(version)-extras/usr/share/lintian/overrides/libwvstreams$(version)-extras
+ dh_lintian
install -Dm644 debian/libwvstreams-dev.lintian-override
debian/libwvstreams-dev/usr/share/lintian/overrides/libwvstreams-dev
@@ -150,14 +149,14 @@
dh_strip --exclude=libwvtest.a
dh_compress
dh_fixperms
- dh_makeshlibs -plibwvstreams$(version)-base \
- -plibwvstreams$(version)-extras \
- -plibuniconf$(version)
+ dh_makeshlibs -plibwvstreams$(version)t64-base \
+ -plibwvstreams$(version)t64-extras \
+ -plibuniconf$(version)t64
dh_installdeb
- dh_shlibdeps -L libwvstreams$(version)-base \
- -L libwvstreams$(version)-extras \
- -L libuniconf$(version) \
- -l
debian/libwvstreams$(version)-base/usr/lib:debian/libwvstreams$(version)-extras/usr/lib:debian/libuniconf$(version)/usr/lib
+ dh_shlibdeps -L libwvstreams$(version)t64-base \
+ -L libwvstreams$(version)t64-extras \
+ -L libuniconf$(version)t64 \
+ -l
debian/libwvstreams$(version)t64-base/usr/lib:debian/libwvstreams$(version)t64-extras/usr/lib:debian/libuniconf$(version)t64/usr/lib
# Build architecture independant packages using the common target.
binary-indep: build-indep install-indep
