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 gnunet-0.20.0/debian/changelog gnunet-0.20.0/debian/changelog
--- gnunet-0.20.0/debian/changelog      2024-02-07 05:59:35.000000000 +0000
+++ gnunet-0.20.0/debian/changelog      2024-02-28 19:31:01.000000000 +0000
@@ -1,3 +1,10 @@
+gnunet (0.20.0-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062452
+
+ -- Steve Langasek <vor...@debian.org>  Wed, 28 Feb 2024 19:31:01 +0000
+
 gnunet (0.20.0-4) sid; urgency=medium
 
   * Uploading to sid.
diff -Nru gnunet-0.20.0/debian/control gnunet-0.20.0/debian/control
--- gnunet-0.20.0/debian/control        2024-02-07 05:59:23.000000000 +0000
+++ gnunet-0.20.0/debian/control        2024-02-28 19:31:01.000000000 +0000
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Debian QA Group <packa...@qa.debian.org>
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  autoconf,
  automake,
  autopoint,
@@ -44,7 +44,7 @@
 Section: net
 Architecture: any
 Depends:
- libgnunet0.20 (= ${binary:Version}),
+ libgnunet0.20t64 (= ${binary:Version}),
  lsb-base,
  netbase,
  passwd,
@@ -87,7 +87,7 @@
  gnunet (= ${binary:Version}),
  libextractor-dev,
  libgcrypt20-dev,
- libgnunet0.20 (= ${binary:Version}),
+ libgnunet0.20t64 (= ${binary:Version}),
  libmicrohttpd-dev,
  ${misc:Depends},
  ${shlibs:Depends},
@@ -103,7 +103,8 @@
  .
  This package contains the development files.
 
-Package: libgnunet0.20
+Package: libgnunet0.20t64
+Provides: ${t64:Provides}
 Section: libs
 Architecture: any
 Pre-Depends:
@@ -111,7 +112,7 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
-Breaks:
+Breaks:libgnunet0.20 (<< ${source:Version}), 
  gnunet (<< 0.20.0),
  libgnunet0.14,
  libgnunet0.15,
@@ -122,7 +123,7 @@
  libgnunet0.15,
  libgnunet0.17,
  libgnunet0.19,
-Replaces:
+Replaces:libgnunet0.20, 
  gnunet,
 Description: GNU's framework for secure peer-to-peer networking (libraries)
  GNUnet is a framework for secure peer-to-peer networking that does not use any
diff -Nru gnunet-0.20.0/debian/libgnunet0.20.install 
gnunet-0.20.0/debian/libgnunet0.20.install
--- gnunet-0.20.0/debian/libgnunet0.20.install  2024-02-07 05:59:04.000000000 
+0000
+++ gnunet-0.20.0/debian/libgnunet0.20.install  1970-01-01 00:00:00.000000000 
+0000
@@ -1,16 +0,0 @@
-usr/bin/gnunet-arm
-usr/bin/gnunet-bugreport
-usr/bin/gnunet-config
-usr/bin/gnunet-ecc
-usr/lib/*/gnunet/libexec/gnunet-service-arm
-usr/lib/*/libgnunetarm.so.*
-usr/lib/*/libgnunetcurl.so.*
-usr/lib/*/libgnunetjson.so.*
-usr/lib/*/libgnunetsq.so.*
-usr/lib/*/libgnunetutil.so.*
-usr/share/gnunet/config.d/util.conf
-usr/share/locale
-usr/share/man/man1/gnunet-arm.1
-usr/share/man/man1/gnunet-bugreport.1
-usr/share/man/man1/gnunet-config.1
-usr/share/man/man1/gnunet-ecc.1
diff -Nru gnunet-0.20.0/debian/libgnunet0.20t64.install 
gnunet-0.20.0/debian/libgnunet0.20t64.install
--- gnunet-0.20.0/debian/libgnunet0.20t64.install       1970-01-01 
00:00:00.000000000 +0000
+++ gnunet-0.20.0/debian/libgnunet0.20t64.install       2024-02-07 
05:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+usr/bin/gnunet-arm
+usr/bin/gnunet-bugreport
+usr/bin/gnunet-config
+usr/bin/gnunet-ecc
+usr/lib/*/gnunet/libexec/gnunet-service-arm
+usr/lib/*/libgnunetarm.so.*
+usr/lib/*/libgnunetcurl.so.*
+usr/lib/*/libgnunetjson.so.*
+usr/lib/*/libgnunetsq.so.*
+usr/lib/*/libgnunetutil.so.*
+usr/share/gnunet/config.d/util.conf
+usr/share/locale
+usr/share/man/man1/gnunet-arm.1
+usr/share/man/man1/gnunet-bugreport.1
+usr/share/man/man1/gnunet-config.1
+usr/share/man/man1/gnunet-ecc.1
diff -Nru gnunet-0.20.0/debian/libgnunet0.20t64.lintian-overrides 
gnunet-0.20.0/debian/libgnunet0.20t64.lintian-overrides
--- gnunet-0.20.0/debian/libgnunet0.20t64.lintian-overrides     1970-01-01 
00:00:00.000000000 +0000
+++ gnunet-0.20.0/debian/libgnunet0.20t64.lintian-overrides     2024-02-28 
19:29:49.000000000 +0000
@@ -0,0 +1 @@
+libgnunet0.20t64: package-name-doesnt-match-sonames libgnunet0.20
diff -Nru gnunet-0.20.0/debian/rules gnunet-0.20.0/debian/rules
--- gnunet-0.20.0/debian/rules  2024-02-07 05:59:04.000000000 +0000
+++ gnunet-0.20.0/debian/rules  2024-02-28 19:31:01.000000000 +0000
@@ -32,4 +32,4 @@
 
 execute_after_dh_install-arch:
        # Removing files already present in libgnunet from gnunet package
-       cd debian/libgnunet0.20 && find . -type f,l -exec rm -f ../gnunet/{} \;
+       cd debian/libgnunet0.20t64 && find . -type f,l -exec rm -f ../gnunet/{} 
\;

Reply via email to