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')
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 grpc-1.51.1/debian/changelog grpc-1.51.1/debian/changelog
--- grpc-1.51.1/debian/changelog        2023-12-26 06:49:37.000000000 +0000
+++ grpc-1.51.1/debian/changelog        2024-02-29 01:10:41.000000000 +0000
@@ -1,3 +1,10 @@
+grpc (1.51.1-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1064100
+
+ -- Steve Langasek <vor...@debian.org>  Thu, 29 Feb 2024 01:10:41 +0000
+
 grpc (1.51.1-4) unstable; urgency=medium
 
   [ Pirate Praveen <prav...@debian.org> ]
diff -Nru grpc-1.51.1/debian/control grpc-1.51.1/debian/control
--- grpc-1.51.1/debian/control  2023-12-26 06:49:37.000000000 +0000
+++ grpc-1.51.1/debian/control  2024-02-29 01:10:41.000000000 +0000
@@ -1,7 +1,7 @@
 Source: grpc
 Priority: optional
 Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.org>
-Build-Depends: debhelper-compat (= 13), cmake, pkgconf,
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), cmake, pkgconf,
  googletest (>= 1.12~), zlib1g-dev, libssl-dev, libabsl-dev (>= 20220623.1),
  libprotobuf-dev, protobuf-compiler (>= 3.21.0~),
  libgflags-dev, libgtest-dev, libbenchmark-dev,
@@ -31,21 +31,22 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libgrpc29 (= ${binary:Version}), pkgconf, zlib1g-dev, libssl-dev, 
libabsl-dev (>= 20220623.1), libc-ares-dev, libre2-dev, ${misc:Depends}
+Depends: libgrpc29t64 (= ${binary:Version}), pkgconf, zlib1g-dev, libssl-dev, 
libabsl-dev (>= 20220623.1), libc-ares-dev, libre2-dev, ${misc:Depends}
 Conflicts: libgpr1-dev, libgpr2-dev, libgpr3-dev, libupb-dev
 Description: high performance general RPC framework (development)
  A modern, open source remote procedure call (RPC) framework that can
  run anywhere. It enables client and server applications to communicate
  transparently, and makes it easier to build connected systems.
  .
- This package contains the headers and the static library for libgrpc29 .
+ This package contains the headers and the static library for libgrpc29t64 .
 
-Package: libgrpc29
+Package: libgrpc29t64
+Provides: ${t64:Provides}
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libgrpc9, libgrpc10, libgrpc28, libgrpc22
-Replaces: libgrpc9, libgrpc10, libgrpc28, libgrpc22
+Breaks: libgrpc29 (<< ${source:Version}), libgrpc9, libgrpc10, libgrpc28, 
libgrpc22
+Replaces: libgrpc29, libgrpc9, libgrpc10, libgrpc28, libgrpc22
 Description: high performance general RPC framework
  A modern, open source remote procedure call (RPC) framework that can
  run anywhere. It enables client and server applications to communicate
@@ -57,15 +58,18 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libgrpc++1.51 (= ${binary:Version}), libgrpc-dev (= 
${binary:Version}), pkgconf, zlib1g-dev, libssl-dev, libabsl-dev (>= 
20220623.1), libc-ares-dev, libre2-dev, ${misc:Depends}
+Depends: libgrpc++1.51t64 (= ${binary:Version}), libgrpc-dev (= 
${binary:Version}), pkgconf, zlib1g-dev, libssl-dev, libabsl-dev (>= 
20220623.1), libc-ares-dev, libre2-dev, ${misc:Depends}
 Description: high performance general RPC framework (development)
  A modern, open source remote procedure call (RPC) framework that can
  run anywhere. It enables client and server applications to communicate
  transparently, and makes it easier to build connected systems.
  .
- This package contains the headers and the static library for libgrpc++1.51 .
+ This package contains the headers and the static library for libgrpc++1.51t64 
.
 
-Package: libgrpc++1.51
+Package: libgrpc++1.51t64
+Provides: ${t64:Provides}
+Replaces: libgrpc++1.51
+Breaks: libgrpc++1.51 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff -Nru grpc-1.51.1/debian/libgrpc++1.51.dirs 
grpc-1.51.1/debian/libgrpc++1.51.dirs
--- grpc-1.51.1/debian/libgrpc++1.51.dirs       2021-01-13 21:50:31.000000000 
+0000
+++ grpc-1.51.1/debian/libgrpc++1.51.dirs       1970-01-01 00:00:00.000000000 
+0000
@@ -1 +0,0 @@
-usr/lib
diff -Nru grpc-1.51.1/debian/libgrpc++1.51.install 
grpc-1.51.1/debian/libgrpc++1.51.install
--- grpc-1.51.1/debian/libgrpc++1.51.install    2021-10-06 23:26:49.000000000 
+0000
+++ grpc-1.51.1/debian/libgrpc++1.51.install    1970-01-01 00:00:00.000000000 
+0000
@@ -1,2 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libgrpc++*.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libgrpcpp_channelz.so.*
diff -Nru grpc-1.51.1/debian/libgrpc++1.51t64.dirs 
grpc-1.51.1/debian/libgrpc++1.51t64.dirs
--- grpc-1.51.1/debian/libgrpc++1.51t64.dirs    1970-01-01 00:00:00.000000000 
+0000
+++ grpc-1.51.1/debian/libgrpc++1.51t64.dirs    2021-01-13 21:50:31.000000000 
+0000
@@ -0,0 +1 @@
+usr/lib
diff -Nru grpc-1.51.1/debian/libgrpc++1.51t64.install 
grpc-1.51.1/debian/libgrpc++1.51t64.install
--- grpc-1.51.1/debian/libgrpc++1.51t64.install 1970-01-01 00:00:00.000000000 
+0000
+++ grpc-1.51.1/debian/libgrpc++1.51t64.install 2021-10-06 23:26:49.000000000 
+0000
@@ -0,0 +1,2 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libgrpc++*.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libgrpcpp_channelz.so.*
diff -Nru grpc-1.51.1/debian/libgrpc++1.51t64.lintian-overrides 
grpc-1.51.1/debian/libgrpc++1.51t64.lintian-overrides
--- grpc-1.51.1/debian/libgrpc++1.51t64.lintian-overrides       1970-01-01 
00:00:00.000000000 +0000
+++ grpc-1.51.1/debian/libgrpc++1.51t64.lintian-overrides       2024-02-29 
01:09:47.000000000 +0000
@@ -0,0 +1 @@
+libgrpc++1.51t64: package-name-doesnt-match-sonames libgrpc++1.51
diff -Nru grpc-1.51.1/debian/libgrpc29.install 
grpc-1.51.1/debian/libgrpc29.install
--- grpc-1.51.1/debian/libgrpc29.install        2021-10-26 19:27:03.000000000 
+0000
+++ grpc-1.51.1/debian/libgrpc29.install        1970-01-01 00:00:00.000000000 
+0000
@@ -1,6 +0,0 @@
-usr/share/grpc/roots.pem
-usr/lib/${DEB_HOST_MULTIARCH}/libgpr.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libgrpc.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libgrpc_*.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libaddress_sorting.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libupb.so.*
diff -Nru grpc-1.51.1/debian/libgrpc29t64.install 
grpc-1.51.1/debian/libgrpc29t64.install
--- grpc-1.51.1/debian/libgrpc29t64.install     1970-01-01 00:00:00.000000000 
+0000
+++ grpc-1.51.1/debian/libgrpc29t64.install     2021-10-26 19:27:03.000000000 
+0000
@@ -0,0 +1,6 @@
+usr/share/grpc/roots.pem
+usr/lib/${DEB_HOST_MULTIARCH}/libgpr.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libgrpc.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libgrpc_*.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libaddress_sorting.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libupb.so.*
diff -Nru grpc-1.51.1/debian/libgrpc29t64.lintian-overrides 
grpc-1.51.1/debian/libgrpc29t64.lintian-overrides
--- grpc-1.51.1/debian/libgrpc29t64.lintian-overrides   1970-01-01 
00:00:00.000000000 +0000
+++ grpc-1.51.1/debian/libgrpc29t64.lintian-overrides   2024-02-29 
01:09:47.000000000 +0000
@@ -0,0 +1 @@
+libgrpc29t64: package-name-doesnt-match-sonames libgrpc29

Reply via email to