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! -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
diff -Nru libphonenumber-8.12.57+ds/debian/changelog
libphonenumber-8.12.57+ds/debian/changelog
--- libphonenumber-8.12.57+ds/debian/changelog 2023-07-20 04:36:41.000000000
+0000
+++ libphonenumber-8.12.57+ds/debian/changelog 2024-03-01 05:44:33.000000000
+0000
@@ -1,3 +1,10 @@
+libphonenumber (8.12.57+ds-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Adjust Provides for 64-bit time_t transition. Closes: #1062585.
+
+ -- Steve Langasek <vor...@debian.org> Fri, 01 Mar 2024 05:44:33 +0000
+
libphonenumber (8.12.57+ds-4) unstable; urgency=medium
* Team upload.
diff -Nru libphonenumber-8.12.57+ds/debian/control
libphonenumber-8.12.57+ds/debian/control
--- libphonenumber-8.12.57+ds/debian/control 2023-07-20 04:36:41.000000000
+0000
+++ libphonenumber-8.12.57+ds/debian/control 2024-03-01 05:44:33.000000000
+0000
@@ -8,6 +8,7 @@
dh-sequence-javahelper,
default-jdk,
default-jdk-doc,
+ dpkg-dev (>= 1.22.5),
libabsl-dev,
libgtest-dev,
libicu-dev,
diff -Nru libphonenumber-8.12.57+ds/debian/rules
libphonenumber-8.12.57+ds/debian/rules
--- libphonenumber-8.12.57+ds/debian/rules 2023-07-20 04:36:41.000000000
+0000
+++ libphonenumber-8.12.57+ds/debian/rules 2024-03-01 05:44:17.000000000
+0000
@@ -1,5 +1,8 @@
#!/usr/bin/make -f
+DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
%:
dh $@
@@ -9,10 +12,13 @@
protobufapi := $(shell dpkg-query -W -f '$${Provides}' libprotobuf-dev | grep
-o 'protobuf-api-[^ ]*')
# virtual package to represent libphonenumber and protobuf ABI
-phonenumberprotoabi := libphonenumber8-protobuf$(shell dpkg-query -W -f
'$${Depends}' libprotobuf-dev | sed -n 's/.*libprotobuf\([0-9]*\) .*/\1/p')
+phonenumberprotoabi := libphonenumber8t64-protobuf$(shell dpkg-query -W -f
'$${Depends}' libprotobuf-dev | sed -n 's/.*libprotobuf\([0-9]*\) .*/\1/p')
+ifneq (,$(filter 64,$(DEB_HOST_ARCH_BITS))$(filter i386,$(DEB_HOST_ARCH)))
+ phonenumberprotocompatabi := , libphonenumber8-protobuf$(shell dpkg-query -W
-f '$${Depends}' libprotobuf-dev | sed -n 's/.*libprotobuf\([0-9]*\) .*/\1/p')
+endif
execute_before_dh_gencontrol:
- echo 'libphonenumber:Provides=$(phonenumberprotoabi)' >>
debian/libphonenumber8.substvars
+ echo
'libphonenumber:Provides=$(phonenumberprotoabi)$(phonenumberprotocompatabi)' >>
debian/libphonenumber8.substvars
echo 'protobuf:API=$(protobufapi)' >>
debian/libphonenumber-dev.substvars
override_dh_makeshlibs:
signature.asc
Description: PGP signature
