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-21-generic (SMP w/4 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)
-------------- next part --------------
diff -Nru jellyfish-2.3.1/debian/changelog jellyfish-2.3.1/debian/changelog
--- jellyfish-2.3.1/debian/changelog 2024-01-01 10:43:16.000000000 +0000
+++ jellyfish-2.3.1/debian/changelog 2024-02-28 13:23:36.000000000 +0000
@@ -1,3 +1,10 @@
+jellyfish (2.3.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1064157
+
+ -- Lukas M?rdian <slyon at debian.org> Wed, 28 Feb 2024 13:23:36 +0000
+
jellyfish (2.3.1-2) unstable; urgency=medium
[ Zhang Na ]
diff -Nru jellyfish-2.3.1/debian/control jellyfish-2.3.1/debian/control
--- jellyfish-2.3.1/debian/control 2024-01-01 10:17:41.000000000 +0000
+++ jellyfish-2.3.1/debian/control 2024-02-28 13:23:36.000000000 +0000
@@ -6,8 +6,8 @@
?tienne Mollier <emollier at debian.org>
Section: science
Priority: optional
-Build-Depends: debhelper-compat (= 13),
- d-shlibs,
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
+ d-shlibs (>= 0.106~),
autoconf-archive,
yaggo,
pkg-config,
@@ -32,7 +32,7 @@
Architecture: amd64 arm64 armel armhf i386 mips64el ppc64el hppa hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 riscv64 loong64
Depends: ${shlibs:Depends},
${misc:Depends},
- libjellyfish-2.0-2 (= ${binary:Version})
+ libjellyfish-2.0-2t64 (= ${binary:Version})
Description: count k-mers in DNA sequences
JELLYFISH is a tool for fast, memory-efficient counting of k-mers in
DNA. A k-mer is a substring of length k, and counting the occurrences
@@ -48,7 +48,10 @@
binary format, which can be translated into a human-readable text
format using the "jellyfish dump" command.
-Package: libjellyfish-2.0-2
+Package: libjellyfish-2.0-2t64
+Provides: ${t64:Provides}
+Replaces: libjellyfish-2.0-2
+Conflicts: libjellyfish-2.0-2 (<< ${source:Version})
Architecture: amd64 arm64 armel armhf i386 mips64el ppc64el hppa hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 riscv64 loong64
Multi-Arch: same
Section: libs
@@ -76,7 +79,7 @@
Architecture: amd64 arm64 armel armhf i386 mips64el ppc64el hppa hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 riscv64 loong64
Section: libdevel
Depends: ${misc:Depends},
- libjellyfish-2.0-2 (= ${binary:Version})
+ libjellyfish-2.0-2t64 (= ${binary:Version})
Description: count k-mers in DNA sequences (development files of jellyfish)
JELLYFISH is a tool for fast, memory-efficient counting of k-mers in
DNA. A k-mer is a substring of length k, and counting the occurrences
diff -Nru jellyfish-2.3.1/debian/libjellyfish-2.0-2.lintian-overrides jellyfish-2.3.1/debian/libjellyfish-2.0-2.lintian-overrides
--- jellyfish-2.3.1/debian/libjellyfish-2.0-2.lintian-overrides 2024-01-01 10:16:41.000000000 +0000
+++ jellyfish-2.3.1/debian/libjellyfish-2.0-2.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# Upstream decided to use a dynamic library without really intending to make this a development package
-libjellyfish-2.0-2: no-symbols-control-file usr/lib/*/libjellyfish-*.so.*
diff -Nru jellyfish-2.3.1/debian/libjellyfish-2.0-2t64.lintian-overrides jellyfish-2.3.1/debian/libjellyfish-2.0-2t64.lintian-overrides
--- jellyfish-2.3.1/debian/libjellyfish-2.0-2t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
+++ jellyfish-2.3.1/debian/libjellyfish-2.0-2t64.lintian-overrides 2024-02-28 13:13:51.000000000 +0000
@@ -0,0 +1,3 @@
+# Upstream decided to use a dynamic library without really intending to make this a development package
+libjellyfish-2.0-2t64: no-symbols-control-file usr/lib/*/libjellyfish-*.so.*
+libjellyfish-2.0-2t64: package-name-doesnt-match-sonames libjellyfish-2.0-2
diff -Nru jellyfish-2.3.1/debian/rules jellyfish-2.3.1/debian/rules
--- jellyfish-2.3.1/debian/rules 2024-01-01 10:16:41.000000000 +0000
+++ jellyfish-2.3.1/debian/rules 2024-02-28 13:23:32.000000000 +0000
@@ -43,6 +43,7 @@
chrpath --delete debian/tmp/usr/lib/*/perl5/*/auto/jellyfish/jellyfish.so
dh_install
d-shlibmove --commit \
+ --t64 \
--multiarch \
--devunversioned \
--movedev "debian/tmp/usr/include/$(DEB_SOURCE)*/$(DEB_SOURCE)/*.hpp" usr/include/$(DEB_SOURCE) \