Bug#1063223: wpewebkit: NMU diff for 64-bit time_t transition

[Steve Langasek]

The previous NMU patch fell afoul of debian/control.in and the debian/rules
mapping between soup2 and soup3.  Please find attached an improved patch.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                   https://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
diff -Nru wpewebkit-2.42.5/debian/changelog wpewebkit-2.42.5/debian/changelog
--- wpewebkit-2.42.5/debian/changelog	2024-02-05 16:36:25.000000000 +0000
+++ wpewebkit-2.42.5/debian/changelog	2024-02-29 02:43:03.000000000 +0000
@@ -1,3 +1,10 @@
+wpewebkit (2.42.5-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063223
+
+ -- Steve Langasek <vorlon at debian.org>  Thu, 29 Feb 2024 02:43:03 +0000
+
 wpewebkit (2.42.5-1) unstable; urgency=high
 
   * New upstream release.
diff -Nru wpewebkit-2.42.5/debian/control wpewebkit-2.42.5/debian/control
--- wpewebkit-2.42.5/debian/control	2024-02-05 16:36:25.000000000 +0000
+++ wpewebkit-2.42.5/debian/control	2024-02-29 02:43:03.000000000 +0000
@@ -51,7 +51,7 @@
 Section: libdevel
 Architecture: linux-any
 Multi-Arch: same
-Depends: libwpewebkit-1.1-0 (= ${binary:Version}),
+Depends: libwpewebkit-1.1-0t64 (= ${binary:Version}),
          libglib2.0-dev,
          libsoup-3.0-dev,
          libwpe-1.0-dev,
@@ -73,7 +73,10 @@
  .
  This package contains the development files.
 
-Package: libwpewebkit-1.1-0
+Package: libwpewebkit-1.1-0t64
+Provides: ${t64:Provides}
+Breaks: libwebkit-1.1-0 (<= ${source:Version})
+Replaces: libwebkit-1.1-0
 Architecture: linux-any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
diff -Nru wpewebkit-2.42.5/debian/control.in wpewebkit-2.42.5/debian/control.in
--- wpewebkit-2.42.5/debian/control.in	2024-02-05 16:36:25.000000000 +0000
+++ wpewebkit-2.42.5/debian/control.in	2024-02-29 02:43:03.000000000 +0000
@@ -73,6 +73,9 @@
  This package contains the development files.
 
 Package: @LIBWPEWEBKIT_PKG@
+Provides: ${t64:Provides}
+Breaks: libwebkit-1.1-0 (<= ${source:Version})
+Replaces: libwebkit-1.1-0
 Architecture: linux-any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
diff -Nru wpewebkit-2.42.5/debian/libwpewebkit-1.0-3.lintian-overrides wpewebkit-2.42.5/debian/libwpewebkit-1.0-3.lintian-overrides
--- wpewebkit-2.42.5/debian/libwpewebkit-1.0-3.lintian-overrides	2024-02-05 16:36:25.000000000 +0000
+++ wpewebkit-2.42.5/debian/libwpewebkit-1.0-3.lintian-overrides	2024-02-29 02:43:03.000000000 +0000
@@ -1,2 +1,3 @@
 libwpewebkit-1.0-3: library-not-linked-against-libc [usr/lib/*/wpe-webkit-1.0/injected-bundle/libWPEInjectedBundle.so]
 libwpewebkit-1.0-3: library-not-linked-against-libc [usr/lib/*/wpe-webkit-1.0/libWPEWebInspectorResources.so]
+libwpewebkit-1.0-3: package-name-doesnt-match-sonames libwpewebkit-1.1-0
diff -Nru wpewebkit-2.42.5/debian/rules wpewebkit-2.42.5/debian/rules
--- wpewebkit-2.42.5/debian/rules	2024-02-05 16:36:25.000000000 +0000
+++ wpewebkit-2.42.5/debian/rules	2024-02-29 02:43:03.000000000 +0000
@@ -33,7 +33,7 @@
 else
 	EXTRA_CMAKE_ARGUMENTS += -DUSE_SOUP2=OFF -DENABLE_WPE_1_1_API=ON
 	WK_API_VERSION = 1.1
-	LIBWPEWEBKIT_PKG = libwpewebkit-1.1-0
+	LIBWPEWEBKIT_PKG = libwpewebkit-1.1-0t64
 	SOUPDEV_PKG = libsoup-3.0-dev
 endif
 
@@ -137,7 +137,7 @@
 	libwpewebkit-1.0-dev.install
 
 # This converts debhelper file names and contents to the soup3 versions
-WEBKIT_DH_RENAME = sed -e 's/1\.0-3/1.1-0/g' \
+WEBKIT_DH_RENAME = sed -e 's/1\.0-3/1.1-0t64/g' \
 		       -e 's/1\.0\.so\.3/1.1.so.0/g' \
 		       -e 's/1\.0/1.1/g'
 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-webkit-maintainers/attachments/20240228/57f7b7a2/attachment.sig>