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_WARN, 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 fbreader-0.99.4+dfsg/debian/changelog fbreader-0.99.4+dfsg/debian/changelog --- fbreader-0.99.4+dfsg/debian/changelog 2023-09-07 15:41:50.000000000 +0000 +++ fbreader-0.99.4+dfsg/debian/changelog 2024-02-29 02:32:43.000000000 +0000 @@ -1,3 +1,10 @@ +fbreader (0.99.4+dfsg-5.1) unstable; urgency=medium + + * Non-maintainer upload. + * Rename libraries for 64-bit time_t transition. + + -- Michael Hudson-Doyle <mwhud...@debian.org> Thu, 29 Feb 2024 02:32:43 +0000 + fbreader (0.99.4+dfsg-5) unstable; urgency=medium * QA upload. diff -Nru fbreader-0.99.4+dfsg/debian/control fbreader-0.99.4+dfsg/debian/control --- fbreader-0.99.4+dfsg/debian/control 2023-09-07 15:41:50.000000000 +0000 +++ fbreader-0.99.4+dfsg/debian/control 2024-02-29 02:32:43.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian QA Group <packa...@qa.debian.org> Standards-Version: 4.2.1 -Build-Depends: debhelper (>= 9), libjpeg-dev, +Build-Depends: dpkg-dev (>= 1.22.5), debhelper (>= 9), libjpeg-dev, libexpat1-dev, libbz2-dev, libz-dev, libunibreak-dev, libfribidi-dev, libcurl4-gnutls-dev, libsqlite3-dev, pkg-config, qtbase5-dev @@ -35,12 +35,13 @@ * searching and downloading books from www.feedbooks.com and www.litres.ru * partial CSS support for epub files -Package: libzlcore0.13 +Package: libzlcore0.13t64 +Provides: ${t64:Provides} Section: libs Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore-data (>= ${source:Version}) -Breaks: libzlcore0.12 -Replaces: libzlcore0.12 +Breaks: libzlcore0.13 (<< ${source:Version}), libzlcore0.12 +Replaces: libzlcore0.13, libzlcore0.12 Conflicts: fbreader-gtk, fbreader-qt, fbreader-qt4 Description: ZLibrary cross-platform development library (shared library) This is the core of ZLibrary, the library that the fbreader e-book reader @@ -62,13 +63,14 @@ ZLibrary is a cross-platform library to build applications running on desktop Linux, Windows, different Linux-based PDAs using this library. -Package: libzltext0.13 +Package: libzltext0.13t64 +Provides: ${t64:Provides} Section: libs Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.13 (= ${binary:Version}), +Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.13t64 (= ${binary:Version}), libzltext-data (>= ${source:Version}) -Breaks: libzltext0.12 -Replaces: libzltext0.12 +Breaks: libzltext0.13 (<< ${source:Version}), libzltext0.12 +Replaces: libzltext0.13, libzltext0.12 Description: ZLibrary text model/viewer part (shared library) This package provides text model/viewer part of ZLibrary. See also libzlcore0.10 package. @@ -84,7 +86,7 @@ Replaces: libzltext, libzltext0.9 Description: ZLibrary text model/viewer part (support files) This package contains the support files for the text model/viewer part - of ZLibrary. See also libzltext0.13 package. + of ZLibrary. See also libzltext0.13t64 package. . ZLibrary is a cross-platform library to build applications running on desktop Linux, Windows, different Linux-based PDAs using this library. @@ -92,9 +94,9 @@ Package: libzlcore-dev Section: libdevel Architecture: any -Breaks: libzlcore0.13 (<< 0.99.4+dfsg-5) -Replaces: libzlcore0.13 (<< 0.99.4+dfsg-5) -Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.13 (= ${binary:Version}) +Breaks: libzlcore0.13t64 (<< 0.99.4+dfsg-5) +Replaces: libzlcore0.13t64 (<< 0.99.4+dfsg-5) +Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.13t64 (= ${binary:Version}) Description: ZLibrary cross-platform development library (development files) This package contains development files for the ZLibrary core. . @@ -104,9 +106,9 @@ Package: libzltext-dev Section: libdevel Architecture: any -Breaks: libzltext0.13 (<< 0.99.4+dfsg-5) -Replaces: libzltext0.13 (<< 0.99.4+dfsg-5) -Depends: ${misc:Depends}, ${shlibs:Depends}, libzltext0.13 (= ${binary:Version}) +Breaks: libzltext0.13t64 (<< 0.99.4+dfsg-5) +Replaces: libzltext0.13t64 (<< 0.99.4+dfsg-5) +Depends: ${misc:Depends}, ${shlibs:Depends}, libzltext0.13t64 (= ${binary:Version}) Description: ZLibrary text model/viewer part (development files) This package contains development files for the ZLibrary text model/viewer library. diff -Nru fbreader-0.99.4+dfsg/debian/libzlcore0.13.dirs fbreader-0.99.4+dfsg/debian/libzlcore0.13.dirs --- fbreader-0.99.4+dfsg/debian/libzlcore0.13.dirs 2023-09-07 15:41:50.000000000 +0000 +++ fbreader-0.99.4+dfsg/debian/libzlcore0.13.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib diff -Nru fbreader-0.99.4+dfsg/debian/libzlcore0.13t64.dirs fbreader-0.99.4+dfsg/debian/libzlcore0.13t64.dirs --- fbreader-0.99.4+dfsg/debian/libzlcore0.13t64.dirs 1970-01-01 00:00:00.000000000 +0000 +++ fbreader-0.99.4+dfsg/debian/libzlcore0.13t64.dirs 2024-02-29 02:32:40.000000000 +0000 @@ -0,0 +1 @@ +usr/lib diff -Nru fbreader-0.99.4+dfsg/debian/libzlcore0.13t64.lintian-overrides fbreader-0.99.4+dfsg/debian/libzlcore0.13t64.lintian-overrides --- fbreader-0.99.4+dfsg/debian/libzlcore0.13t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ fbreader-0.99.4+dfsg/debian/libzlcore0.13t64.lintian-overrides 2024-02-29 02:32:40.000000000 +0000 @@ -0,0 +1 @@ +libzlcore0.13t64: package-name-doesnt-match-sonames libzlcore0.13 diff -Nru fbreader-0.99.4+dfsg/debian/libzltext0.13.dirs fbreader-0.99.4+dfsg/debian/libzltext0.13.dirs --- fbreader-0.99.4+dfsg/debian/libzltext0.13.dirs 2023-09-07 15:41:50.000000000 +0000 +++ fbreader-0.99.4+dfsg/debian/libzltext0.13.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib diff -Nru fbreader-0.99.4+dfsg/debian/libzltext0.13t64.dirs fbreader-0.99.4+dfsg/debian/libzltext0.13t64.dirs --- fbreader-0.99.4+dfsg/debian/libzltext0.13t64.dirs 1970-01-01 00:00:00.000000000 +0000 +++ fbreader-0.99.4+dfsg/debian/libzltext0.13t64.dirs 2024-02-29 02:32:40.000000000 +0000 @@ -0,0 +1 @@ +usr/lib diff -Nru fbreader-0.99.4+dfsg/debian/libzltext0.13t64.lintian-overrides fbreader-0.99.4+dfsg/debian/libzltext0.13t64.lintian-overrides --- fbreader-0.99.4+dfsg/debian/libzltext0.13t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ fbreader-0.99.4+dfsg/debian/libzltext0.13t64.lintian-overrides 2024-02-29 02:32:40.000000000 +0000 @@ -0,0 +1 @@ +libzltext0.13t64: package-name-doesnt-match-sonames libzltext0.13 diff -Nru fbreader-0.99.4+dfsg/debian/rules fbreader-0.99.4+dfsg/debian/rules --- fbreader-0.99.4+dfsg/debian/rules 2023-09-07 15:41:50.000000000 +0000 +++ fbreader-0.99.4+dfsg/debian/rules 2024-02-29 02:32:40.000000000 +0000 @@ -32,13 +32,13 @@ mv $(DEB_DIR)/tmp/zltext/usr/share/zlibrary $(DEB_DIR)/libzltext-data/usr/share override_dh_auto_install-arch: install-common - mv $(DEB_DIR)/tmp/zlcore/usr/lib $(DEB_DIR)/libzlcore0.13/usr - mv $(DEB_DIR)/tmp/zltext/usr/lib $(DEB_DIR)/libzltext0.13/usr + mv $(DEB_DIR)/tmp/zlcore/usr/lib $(DEB_DIR)/libzlcore0.13t64/usr + mv $(DEB_DIR)/tmp/zltext/usr/lib $(DEB_DIR)/libzltext0.13t64/usr $(MAKE) -C zlibrary/core TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/libzlcore-dev do_install_dev $(MAKE) -C zlibrary/text TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/libzltext-dev do_install_dev $(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt4 DESTDIR=$(DEB_DIR)/fbreader do_install $(MAKE) -C fbreader TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/fbreader do_install override_dh_makeshlibs: - dh_makeshlibs -plibzlcore0.13 - dh_makeshlibs -plibzltext0.13 + dh_makeshlibs -plibzlcore0.13t64 + dh_makeshlibs -plibzltext0.13t64