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-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 vips-8.15.1/debian/changelog vips-8.15.1/debian/changelog
--- vips-8.15.1/debian/changelog        2024-01-03 05:58:38.000000000 +0000
+++ vips-8.15.1/debian/changelog        2024-02-28 22:40:47.000000000 +0000
@@ -1,3 +1,10 @@
+vips (8.15.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063046
+
+ -- Steve Langasek <vor...@debian.org>  Wed, 28 Feb 2024 22:40:47 +0000
+
 vips (8.15.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru vips-8.15.1/debian/control vips-8.15.1/debian/control
--- vips-8.15.1/debian/control  2023-11-09 16:14:31.000000000 +0000
+++ vips-8.15.1/debian/control  2024-02-28 22:40:47.000000000 +0000
@@ -1,7 +1,7 @@
 Source: vips
 Section: libs
 Priority: optional
-Build-Depends: debhelper-compat (= 13), meson, pkgconf,
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), meson, pkgconf,
  libjpeg-dev, libtiff-dev, libspng-dev, libcgif-dev, librsvg2-dev,
  libjxl-dev, libpoppler-glib-dev, gobject-introspection, zlib1g-dev,
  libfftw3-dev | fftw3-dev, liblcms2-dev, libmagickcore-dev,
@@ -15,13 +15,15 @@
 Rules-Requires-Root: no
 Homepage: https://libvips.github.io/libvips/
 
-Package: libvips42
+Package: libvips42t64
+Replaces: libvips42
+Breaks: libvips42 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Provides: libvips
+Provides: ${t64:Provides}, libvips
 Suggests: nip2
 Description: image processing system good for very large ones
  VIPS is an image processing system designed with efficiency in mind.
@@ -41,7 +43,7 @@
 Package: libvips-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libvips42 (= ${binary:Version}), gir1.2-vips-8.0 (= 
${binary:Version}),
+Depends: ${misc:Depends}, libvips42t64 (= ${binary:Version}), gir1.2-vips-8.0 
(= ${binary:Version}),
  libjpeg-dev, libtiff-dev, zlib1g-dev, libfftw3-dev | fftw3-dev, liblcms2-dev,
  libspng-dev, libmagickcore-dev, libmagickwand-dev, libfreetype-dev,
  libpango1.0-dev, libfontconfig-dev, libglib2.0-dev, libice-dev, gettext,
diff -Nru vips-8.15.1/debian/libvips42.install 
vips-8.15.1/debian/libvips42.install
--- vips-8.15.1/debian/libvips42.install        2023-01-17 00:32:29.000000000 
+0000
+++ vips-8.15.1/debian/libvips42.install        1970-01-01 00:00:00.000000000 
+0000
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/*/libvips*.so.*
-debian/tmp/usr/lib/*/vips-modules-*/
-debian/tmp/usr/share/locale
diff -Nru vips-8.15.1/debian/libvips42.shlibs 
vips-8.15.1/debian/libvips42.shlibs
--- vips-8.15.1/debian/libvips42.shlibs 2019-11-02 22:36:19.000000000 +0000
+++ vips-8.15.1/debian/libvips42.shlibs 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-libvips 42 libvips42 (>> 8.0.2-1~)
-libvips-cpp 42 libvips42 (>> 8.0.2-1~)
diff -Nru vips-8.15.1/debian/libvips42t64.install 
vips-8.15.1/debian/libvips42t64.install
--- vips-8.15.1/debian/libvips42t64.install     1970-01-01 00:00:00.000000000 
+0000
+++ vips-8.15.1/debian/libvips42t64.install     2023-01-17 00:32:29.000000000 
+0000
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/*/libvips*.so.*
+debian/tmp/usr/lib/*/vips-modules-*/
+debian/tmp/usr/share/locale
diff -Nru vips-8.15.1/debian/libvips42t64.lintian-overrides 
vips-8.15.1/debian/libvips42t64.lintian-overrides
--- vips-8.15.1/debian/libvips42t64.lintian-overrides   1970-01-01 
00:00:00.000000000 +0000
+++ vips-8.15.1/debian/libvips42t64.lintian-overrides   2024-02-28 
22:39:52.000000000 +0000
@@ -0,0 +1 @@
+libvips42t64: package-name-doesnt-match-sonames libvips42
diff -Nru vips-8.15.1/debian/libvips42t64.shlibs 
vips-8.15.1/debian/libvips42t64.shlibs
--- vips-8.15.1/debian/libvips42t64.shlibs      1970-01-01 00:00:00.000000000 
+0000
+++ vips-8.15.1/debian/libvips42t64.shlibs      2024-02-28 22:39:52.000000000 
+0000
@@ -0,0 +1,2 @@
+libvips 42 libvips42t64 (>> 8.0.2-1~)
+libvips-cpp 42 libvips42t64 (>> 8.0.2-1~)

Reply via email to