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
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru daq-2.0.7/debian/changelog daq-2.0.7/debian/changelog
--- daq-2.0.7/debian/changelog  2020-07-19 13:13:40.000000000 +0000
+++ daq-2.0.7/debian/changelog  2024-02-27 23:54:17.000000000 +0000
@@ -1,3 +1,10 @@
+daq (2.0.7-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062007
+
+ -- Michael Hudson-Doyle <mwhud...@debian.org>  Tue, 27 Feb 2024 23:54:17 +0000
+
 daq (2.0.7-5) unstable; urgency=medium
 
   * debian/libdaq-dev.install: Include the static modules again as they are
diff -Nru daq-2.0.7/debian/control daq-2.0.7/debian/control
--- daq-2.0.7/debian/control    2020-07-19 10:14:52.000000000 +0000
+++ daq-2.0.7/debian/control    2024-02-27 23:54:17.000000000 +0000
@@ -1,7 +1,7 @@
 Source: daq
 Priority: optional
 Maintainer: Javier Fernández-Sanguino Peña <j...@debian.org>
-Build-Depends: debhelper (>= 12~), flex, bison, libpcap0.8-dev, 
libdumbnet-dev, libnetfilter-queue-dev
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper (>= 12~), flex, bison, 
libpcap0.8-dev, libdumbnet-dev, libnetfilter-queue-dev
 Standards-Version: 4.5.0
 Section: libs
 Homepage: https://www.snort.org/downloads/
@@ -9,7 +9,7 @@
 Package: libdaq-dev
 Section: libdevel
 Architecture: any
-Depends: libdaq2 (= ${binary:Version}), libpcap0.8-dev, libdumbnet-dev, 
libnetfilter-queue-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: libdaq2t64 (= ${binary:Version}), libpcap0.8-dev, libdumbnet-dev, 
libnetfilter-queue-dev, ${shlibs:Depends}, ${misc:Depends}
 Description: Data Acquisition library for packet I/O - development files
  DAQ is a library that introduces an abstraction layer to PCAP functions
  facilitation operation in a variety of hardware and software interfaces. 
@@ -19,7 +19,10 @@
  .
  This package contains the static library and the C header files.
 
-Package: libdaq2
+Package: libdaq2t64
+Provides: ${t64:Provides}
+Replaces: libdaq2
+Breaks: libdaq2 (<< ${source:Version})
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libdaq0
diff -Nru daq-2.0.7/debian/libdaq2.dirs daq-2.0.7/debian/libdaq2.dirs
--- daq-2.0.7/debian/libdaq2.dirs       2010-11-10 23:52:29.000000000 +0000
+++ daq-2.0.7/debian/libdaq2.dirs       1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib
diff -Nru daq-2.0.7/debian/libdaq2.install daq-2.0.7/debian/libdaq2.install
--- daq-2.0.7/debian/libdaq2.install    2020-07-19 09:53:56.000000000 +0000
+++ daq-2.0.7/debian/libdaq2.install    1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/lib*.so.*
-usr/lib/*/daq/*.so
diff -Nru daq-2.0.7/debian/libdaq2t64.dirs daq-2.0.7/debian/libdaq2t64.dirs
--- daq-2.0.7/debian/libdaq2t64.dirs    1970-01-01 00:00:00.000000000 +0000
+++ daq-2.0.7/debian/libdaq2t64.dirs    2010-11-10 23:52:29.000000000 +0000
@@ -0,0 +1 @@
+usr/lib
diff -Nru daq-2.0.7/debian/libdaq2t64.install 
daq-2.0.7/debian/libdaq2t64.install
--- daq-2.0.7/debian/libdaq2t64.install 1970-01-01 00:00:00.000000000 +0000
+++ daq-2.0.7/debian/libdaq2t64.install 2020-07-19 09:53:56.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/lib*.so.*
+usr/lib/*/daq/*.so
diff -Nru daq-2.0.7/debian/libdaq2t64.lintian-overrides 
daq-2.0.7/debian/libdaq2t64.lintian-overrides
--- daq-2.0.7/debian/libdaq2t64.lintian-overrides       1970-01-01 
00:00:00.000000000 +0000
+++ daq-2.0.7/debian/libdaq2t64.lintian-overrides       2024-02-27 
23:54:09.000000000 +0000
@@ -0,0 +1 @@
+libdaq2t64: package-name-doesnt-match-sonames libdaq2

Reply via email to