[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1063285: xplc: NMU diff for 64-bit time_t transition



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 xplc-0.3.13/debian/changelog xplc-0.3.13/debian/changelog
--- xplc-0.3.13/debian/changelog	2022-11-27 04:40:10.000000000 +0000
+++ xplc-0.3.13/debian/changelog	2024-02-29 07:55:13.000000000 +0000
@@ -1,3 +1,10 @@
+xplc (0.3.13-12.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063285
+
+ -- Steve Langasek <vorlon@debian.org>  Thu, 29 Feb 2024 07:55:13 +0000
+
 xplc (0.3.13-12) unstable; urgency=medium
 
   * QA upload.
diff -Nru xplc-0.3.13/debian/control xplc-0.3.13/debian/control
--- xplc-0.3.13/debian/control	2022-11-27 04:40:10.000000000 +0000
+++ xplc-0.3.13/debian/control	2024-02-29 07:55:13.000000000 +0000
@@ -2,13 +2,16 @@
 Section: libs
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: uuid-dev, debhelper-compat (= 13)
+Build-Depends: dpkg-dev (>= 1.22.5), uuid-dev, debhelper-compat (= 13)
 Standards-Version: 4.6.1
 Homepage: https://xplc.sourceforge.net/
 Vcs-Git: https://salsa.debian.org/debian/xplc.git
 Vcs-Browser: https://salsa.debian.org/debian/xplc
 
-Package: libxplc0.3.13
+Package: libxplc0.3.13t64
+Provides: ${t64:Provides}
+Replaces: libxplc0.3.13
+Breaks: libxplc0.3.13 (<< ${source:Version})
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Multi-Arch: same
@@ -22,7 +25,7 @@
 Package: libxplc0.3.13-dev
 Section: libdevel
 Architecture: any
-Depends: libxplc0.3.13 (= ${binary:Version}), uuidcdef, ${shlibs:Depends}, ${misc:Depends}
+Depends: libxplc0.3.13t64 (= ${binary:Version}), uuidcdef, ${shlibs:Depends}, ${misc:Depends}
 Description: Light weight component system (Development libraries and headers)
  XPLC ("Cross-Platform Lightweight Components") is a component system that
  will provide extensibility and reusability both inside and between
diff -Nru xplc-0.3.13/debian/libxplc0.3.13.symbols xplc-0.3.13/debian/libxplc0.3.13.symbols
--- xplc-0.3.13/debian/libxplc0.3.13.symbols	2022-11-27 04:40:10.000000000 +0000
+++ xplc-0.3.13/debian/libxplc0.3.13.symbols	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-libxplc.so.0.3.13-unstable libxplc0.3.13 #MINVER#
- XPLC_getServiceManager@Base 0.3.13
diff -Nru xplc-0.3.13/debian/libxplc0.3.13t64.lintian-overrides xplc-0.3.13/debian/libxplc0.3.13t64.lintian-overrides
--- xplc-0.3.13/debian/libxplc0.3.13t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ xplc-0.3.13/debian/libxplc0.3.13t64.lintian-overrides	2024-02-29 07:49:30.000000000 +0000
@@ -0,0 +1 @@
+libxplc0.3.13t64: package-name-doesnt-match-sonames libxplc0.3.13
diff -Nru xplc-0.3.13/debian/libxplc0.3.13t64.symbols xplc-0.3.13/debian/libxplc0.3.13t64.symbols
--- xplc-0.3.13/debian/libxplc0.3.13t64.symbols	1970-01-01 00:00:00.000000000 +0000
+++ xplc-0.3.13/debian/libxplc0.3.13t64.symbols	2024-02-29 07:49:30.000000000 +0000
@@ -0,0 +1,2 @@
+libxplc.so.0.3.13-unstable libxplc0.3.13t64 #MINVER#
+ XPLC_getServiceManager@Base 0.3.13
diff -Nru xplc-0.3.13/debian/rules xplc-0.3.13/debian/rules
--- xplc-0.3.13/debian/rules	2022-11-27 04:40:10.000000000 +0000
+++ xplc-0.3.13/debian/rules	2024-02-29 07:55:12.000000000 +0000
@@ -16,7 +16,7 @@
 
 # Make sure the install files are in the right place
 execute_before_dh_auto_install:
-	cp -f debian/libxplc.install debian/libxplc$(PKG_VERSION).install
+	cp -f debian/libxplc.install debian/libxplc$(PKG_VERSION)t64.install
 	cp -f debian/libxplc-dev.install debian/libxplc$(PKG_VERSION)-dev.install
 	cp -f debian/libxplc-dev.examples debian/libxplc$(PKG_VERSION)-dev.examples
 
@@ -26,10 +26,10 @@
 	ln -f debian/tmp/usr/share/man/man1/uuidgen.1 debian/tmp/usr/share/man/man1/uuidcdef
 
 execute_after_dh_shlibdeps:
-	/sbin/ldconfig -v -n debian/libxplc$(PKG_VERSION)/usr/lib/$(DEB_HOST_MULTIARCH)
+	/sbin/ldconfig -v -n debian/libxplc$(PKG_VERSION)t64/usr/lib/$(DEB_HOST_MULTIARCH)
 
 execute_after_dh_auto_clean:
-	rm -f debian/libxplc$(PKG_VERSION).install
+	rm -f debian/libxplc$(PKG_VERSION)t64.install
 	rm -f debian/libxplc$(PKG_VERSION)-dev.install
 	rm -f debian/libxplc$(PKG_VERSION)-dev.examples
 

Reply to: