Source: libnatpmp
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-21-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: unable to detect
diff -Nru libnatpmp-20230423/debian/changelog 
libnatpmp-20230423/debian/changelog
--- libnatpmp-20230423/debian/changelog 2023-09-13 17:23:52.000000000 +0000
+++ libnatpmp-20230423/debian/changelog 2024-02-28 14:20:51.000000000 +0000
@@ -1,3 +1,10 @@
+libnatpmp (20230423-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062480
+
+ -- Benjamin Drung <bdr...@debian.org>  Wed, 28 Feb 2024 14:20:51 +0000
+
 libnatpmp (20230423-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru libnatpmp-20230423/debian/control libnatpmp-20230423/debian/control
--- libnatpmp-20230423/debian/control   2023-09-13 17:16:52.000000000 +0000
+++ libnatpmp-20230423/debian/control   2024-02-28 14:20:50.000000000 +0000
@@ -4,7 +4,7 @@
 Maintainer: Thomas Goirand <z...@debian.org>
 Uploaders:
  Yangfl <mmyan...@gmail.com>,
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  debhelper-compat (= 13),
  dh-python,
  libpython3-dev,
@@ -20,7 +20,7 @@
 Architecture: linux-any kfreebsd-any
 Section: libdevel
 Depends:
- libnatpmp1 (= ${binary:Version}),
+ libnatpmp1t64 (= ${binary:Version}),
  ${misc:Depends},
 Multi-Arch: same
 Description: portable and fully compliant implementation of NAT-PMP (dev files)
@@ -38,7 +38,10 @@
  .
  This package contains development files needed to build using libnatpmp.
 
-Package: libnatpmp1
+Package: libnatpmp1t64
+Provides: ${t64:Provides}
+Replaces: libnatpmp1
+Breaks: libnatpmp1 (<< ${source:Version})
 Architecture: linux-any kfreebsd-any
 Section: libs
 Depends:
diff -Nru libnatpmp-20230423/debian/libnatpmp1.install 
libnatpmp-20230423/debian/libnatpmp1.install
--- libnatpmp-20230423/debian/libnatpmp1.install        2023-09-13 
17:16:52.000000000 +0000
+++ libnatpmp-20230423/debian/libnatpmp1.install        1970-01-01 
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/libnatpmp*.so.*
diff -Nru libnatpmp-20230423/debian/libnatpmp1.symbols 
libnatpmp-20230423/debian/libnatpmp1.symbols
--- libnatpmp-20230423/debian/libnatpmp1.symbols        2023-09-13 
17:16:52.000000000 +0000
+++ libnatpmp-20230423/debian/libnatpmp1.symbols        1970-01-01 
00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-libnatpmp.so.1 libnatpmp1 #MINVER#
-* Build-Depends-Package: libnatpmp-dev
- closenatpmp@Base 20150609
- getdefaultgateway@Base 20150609
- getnatpmprequesttimeout@Base 20150609
- initnatpmp@Base 20150609
- readnatpmpresponse@Base 20150609
- readnatpmpresponseorretry@Base 20150609
- sendnatpmprequest@Base 20150609
- sendnewportmappingrequest@Base 20150609
- sendpendingrequest@Base 20150609
- sendpublicaddressrequest@Base 20150609
- strnatpmperr@Base 20150609
diff -Nru libnatpmp-20230423/debian/libnatpmp1t64.install 
libnatpmp-20230423/debian/libnatpmp1t64.install
--- libnatpmp-20230423/debian/libnatpmp1t64.install     1970-01-01 
00:00:00.000000000 +0000
+++ libnatpmp-20230423/debian/libnatpmp1t64.install     2023-09-13 
17:16:52.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/libnatpmp*.so.*
diff -Nru libnatpmp-20230423/debian/libnatpmp1t64.lintian-overrides 
libnatpmp-20230423/debian/libnatpmp1t64.lintian-overrides
--- libnatpmp-20230423/debian/libnatpmp1t64.lintian-overrides   1970-01-01 
00:00:00.000000000 +0000
+++ libnatpmp-20230423/debian/libnatpmp1t64.lintian-overrides   2024-02-28 
14:19:03.000000000 +0000
@@ -0,0 +1 @@
+libnatpmp1t64: package-name-doesnt-match-sonames libnatpmp1
diff -Nru libnatpmp-20230423/debian/libnatpmp1t64.symbols 
libnatpmp-20230423/debian/libnatpmp1t64.symbols
--- libnatpmp-20230423/debian/libnatpmp1t64.symbols     1970-01-01 
00:00:00.000000000 +0000
+++ libnatpmp-20230423/debian/libnatpmp1t64.symbols     2024-02-28 
14:19:03.000000000 +0000
@@ -0,0 +1,13 @@
+libnatpmp.so.1 libnatpmp1t64 #MINVER#
+* Build-Depends-Package: libnatpmp-dev
+ closenatpmp@Base 20150609
+ getdefaultgateway@Base 20150609
+ getnatpmprequesttimeout@Base 20150609
+ initnatpmp@Base 20150609
+ readnatpmpresponse@Base 20150609
+ readnatpmpresponseorretry@Base 20150609
+ sendnatpmprequest@Base 20150609
+ sendnewportmappingrequest@Base 20150609
+ sendpendingrequest@Base 20150609
+ sendpublicaddressrequest@Base 20150609
+ strnatpmperr@Base 20150609
diff -Nru libnatpmp-20230423/debian/rules libnatpmp-20230423/debian/rules
--- libnatpmp-20230423/debian/rules     2023-09-13 17:16:52.000000000 +0000
+++ libnatpmp-20230423/debian/rules     2024-02-28 14:20:49.000000000 +0000
@@ -23,5 +23,5 @@
        mv debian/tmp/usr/lib/libnatpmp* 
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
 
 override_dh_installdocs:
-       dh_installdocs -plibnatpmp-dev -plibnatpmp1 --link-doc=libnatpmp1
-       dh_installdocs -Nlibnatpmp-dev -Nlibnatpmp1
+       dh_installdocs -plibnatpmp-dev -plibnatpmp1t64 --link-doc=libnatpmp1t64
+       dh_installdocs -Nlibnatpmp-dev -Nlibnatpmp1t64

Reply via email to