Source: neon27
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 neon27-0.33.0/debian/changelog neon27-0.33.0/debian/changelog
--- neon27-0.33.0/debian/changelog      2024-02-02 22:12:14.000000000 +0000
+++ neon27-0.33.0/debian/changelog      2024-02-28 22:40:56.000000000 +0000
@@ -1,3 +1,10 @@
+neon27 (0.33.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1064246
+
+ -- Benjamin Drung <bdr...@debian.org>  Wed, 28 Feb 2024 22:40:56 +0000
+
 neon27 (0.33.0-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru neon27-0.33.0/debian/control neon27-0.33.0/debian/control
--- neon27-0.33.0/debian/control        2023-10-03 21:27:50.000000000 +0000
+++ neon27-0.33.0/debian/control        2024-02-28 22:40:56.000000000 +0000
@@ -2,12 +2,15 @@
 Section: net
 Priority: optional
 Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.org>
-Build-Depends: debhelper-compat (= 13), pkgconf, libxml2-dev, libssl-dev (>= 
0.9.8c), libgnutls28-dev, libkrb5-dev, libz-dev, ca-certificates, chrpath, xmlto
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), pkgconf, 
libxml2-dev, libssl-dev (>= 0.9.8c), libgnutls28-dev, libkrb5-dev, libz-dev, 
ca-certificates, chrpath, xmlto
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://notroj.github.io/neon/
 
-Package: libneon27
+Package: libneon27t64
+Provides: ${t64:Provides}
+Replaces: libneon27
+Breaks: libneon27 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -46,15 +49,19 @@
 Conflicts: libneon-dev, libneon24-doc (<= 0.24.5-1), libneon25-dev (<< 
0.28.2-5), libneon27-gnutls-dev
 Provides: libneon-dev
 Replaces: libneon-dev, libneon25-dev, libneon27-gnutls-dev
-Depends: ${misc:Depends}, libneon27 (= ${binary:Version}), libssl-dev, 
libxml2-dev, libkrb5-dev, pkgconf
-Description: Header and static library files for libneon27
+Depends: ${misc:Depends}, libneon27t64 (= ${binary:Version}), libssl-dev, 
libxml2-dev, libkrb5-dev, pkgconf
+Description: Header and static library files for libneon27t64
  This package contains the headers and the static library for libneon27.
  .
  Neon provides lower-level interfaces to directly implement new HTTP
  methods, and higher-level interfaces so that you don't have to
  worry about the lower-level stuff.
 
-Package: libneon27-gnutls
+Package: libneon27t64-gnutls
+Provides: ${t64:Provides}
+X-Time64-Compat: libneon27-gnutls
+Replaces: libneon27-gnutls
+Breaks: libneon27-gnutls (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -94,9 +101,9 @@
 Conflicts: libneon-dev, libneon24-doc (<= 0.24.5-1), libneon25-dev (<< 
0.28.2-5), libneon27-dev
 Provides: libneon-dev
 Replaces: libneon-dev, libneon25-dev, libneon27-dev
-Depends: ${misc:Depends}, libneon27-gnutls (= ${binary:Version}),
+Depends: ${misc:Depends}, libneon27t64-gnutls (= ${binary:Version}),
  libgnutls28-dev, libxml2-dev, libkrb5-dev, pkgconf
-Description: Header and static library files for libneon27 (GnuTLS enabled)
+Description: Header and static library files for libneon27t64 (GnuTLS enabled)
  This package contains the headers and the static library for
  libneon27-gnutls.
  .
diff -Nru neon27-0.33.0/debian/libneon27-gnutls.lintian-overrides 
neon27-0.33.0/debian/libneon27-gnutls.lintian-overrides
--- neon27-0.33.0/debian/libneon27-gnutls.lintian-overrides     2015-10-03 
19:36:41.000000000 +0000
+++ neon27-0.33.0/debian/libneon27-gnutls.lintian-overrides     1970-01-01 
00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# this is known due to common package naming
-libneon27-gnutls: package-name-doesnt-match-sonames libneon-gnutls27
diff -Nru neon27-0.33.0/debian/libneon27.lintian-overrides 
neon27-0.33.0/debian/libneon27.lintian-overrides
--- neon27-0.33.0/debian/libneon27.lintian-overrides    2020-06-01 
21:20:34.000000000 +0000
+++ neon27-0.33.0/debian/libneon27.lintian-overrides    1970-01-01 
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-libneon27: possible-gpl-code-linked-with-openssl
diff -Nru neon27-0.33.0/debian/libneon27t64-gnutls.lintian-overrides 
neon27-0.33.0/debian/libneon27t64-gnutls.lintian-overrides
--- neon27-0.33.0/debian/libneon27t64-gnutls.lintian-overrides  1970-01-01 
00:00:00.000000000 +0000
+++ neon27-0.33.0/debian/libneon27t64-gnutls.lintian-overrides  2024-02-28 
22:39:30.000000000 +0000
@@ -0,0 +1,3 @@
+# this is known due to common package naming
+libneon27t64-gnutls: package-name-doesnt-match-sonames libneon-gnutls27
+libneon27t64-gnutls: package-name-doesnt-match-sonames libneon27-gnutls
diff -Nru neon27-0.33.0/debian/libneon27t64.lintian-overrides 
neon27-0.33.0/debian/libneon27t64.lintian-overrides
--- neon27-0.33.0/debian/libneon27t64.lintian-overrides 1970-01-01 
00:00:00.000000000 +0000
+++ neon27-0.33.0/debian/libneon27t64.lintian-overrides 2024-02-28 
22:39:30.000000000 +0000
@@ -0,0 +1,2 @@
+libneon27t64: possible-gpl-code-linked-with-openssl
+libneon27t64: package-name-doesnt-match-sonames libneon27
diff -Nru neon27-0.33.0/debian/rules neon27-0.33.0/debian/rules
--- neon27-0.33.0/debian/rules  2021-09-27 16:50:40.000000000 +0000
+++ neon27-0.33.0/debian/rules  2024-02-28 22:40:54.000000000 +0000
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-package=libneon27
+package=libneon27t64
+dev_package=libneon27
 upstream-version=$(shell head -n 1 debian/changelog | sed -e 
's/.*(\(\([0-9]\+:\)\?\([^-]\+\).*\).*).*/\3/' )
 
 export KRB5_CONFIG=/usr/bin/krb5-config.mit
@@ -96,10 +97,10 @@
        cd $(BUILDDIR)/neon-openssl/ && $(MAKE) install-lib install-headers 
install-config install-man DESTDIR=$(DESTDIR)/$(package)
        chrpath -d $(CURDIR)/debian/$(package)/usr/lib/*/libneon.so.27
        rm -f $(CURDIR)/debian/$(package)/usr/lib/*/libneon.la
-       dh_movefiles -v -p$(package)-dev --sourcedir=debian/$(package)
-       install -d debian/$(package)-dev/usr/share/aclocal
+       dh_movefiles -v -p$(dev_package)-dev --sourcedir=debian/$(package)
+       install -d debian/$(dev_package)-dev/usr/share/aclocal
        cp macros/neon*.m4 \
-               debian/$(package)-dev/usr/share/aclocal/
+               debian/$(dev_package)-dev/usr/share/aclocal/
 
        rm -rf debian/$(package)/usr/include \
                debian/$(package)/usr/bin \
@@ -115,13 +116,13 @@
        cd $(BUILDDIR)/neon-gnutls/ && $(MAKE) install-lib install-headers 
install-config install-man DESTDIR=$(DESTDIR)/$(package)-gnutls
        chrpath -d 
$(CURDIR)/debian/$(package)-gnutls/usr/lib/*/libneon-gnutls.so.27
        rm -f $(CURDIR)/debian/$(package)-gnutls/usr/lib/*/libneon-gnutls.la
-       dh_movefiles -v -p$(package)-gnutls-dev \
+       dh_movefiles -v -p$(dev_package)-gnutls-dev \
          --sourcedir=debian/$(package)-gnutls
-       ln -sf libneon-gnutls.so 
debian/$(package)-gnutls-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libneon.so
-       ln -sf libneon-gnutls.a  
debian/$(package)-gnutls-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libneon.a
-       install -d debian/$(package)-gnutls-dev/usr/share/aclocal
+       ln -sf libneon-gnutls.so 
debian/$(dev_package)-gnutls-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libneon.so
+       ln -sf libneon-gnutls.a  
debian/$(dev_package)-gnutls-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libneon.a
+       install -d debian/$(dev_package)-gnutls-dev/usr/share/aclocal
        cp macros/neon*.m4 \
-               debian/$(package)-gnutls-dev/usr/share/aclocal/
+               debian/$(dev_package)-gnutls-dev/usr/share/aclocal/
 
        rm -rf debian/$(package)-gnutls/usr/include \
                debian/$(package)-gnutls/usr/bin \

Reply via email to