[Android-tools-devel] Bug#1062211: android-platform-frameworks-native: NMU diff for 64-bit time_t transition

[Steve Langasek]

Hello,

An oversight with regards to the provides: handling support in debhelper
means the package in experimental does not correctly declare compatibility
on 64-bit archs with the prior ABI.  Please find an updated patch attached.

-- 
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 android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1.docs android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1.docs
--- android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1.docs	2020-11-22 15:26:31.000000000 +0000
+++ android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1.docs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-NOTICE
diff -Nru android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1.install android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1.install
--- android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1.install	2020-11-22 15:26:31.000000000 +0000
+++ android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#!/usr/bin/dh-exec
-
-debian/out/libETC1.so.0   usr/lib/${DEB_HOST_MULTIARCH}/android
\ No newline at end of file
diff -Nru android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1t64.docs android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1t64.docs
--- android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1t64.docs	1970-01-01 00:00:00.000000000 +0000
+++ android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1t64.docs	2024-01-31 18:44:12.000000000 +0000
@@ -0,0 +1 @@
+NOTICE
diff -Nru android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1t64.install android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1t64.install
--- android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1t64.install	1970-01-01 00:00:00.000000000 +0000
+++ android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1t64.install	2024-01-31 18:44:12.000000000 +0000
@@ -0,0 +1,3 @@
+#!/usr/bin/dh-exec
+
+debian/out/libETC1.so.0   usr/lib/${DEB_HOST_MULTIARCH}/android
\ No newline at end of file
diff -Nru android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1t64.lintian-overrides android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1t64.lintian-overrides
--- android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ android-platform-frameworks-native-10.0.0+r36/debian/android-libetc1t64.lintian-overrides	2024-01-31 18:44:12.000000000 +0000
@@ -0,0 +1 @@
+android-libetc1t64: package-name-doesnt-match-sonames android-libetc1
diff -Nru android-platform-frameworks-native-10.0.0+r36/debian/changelog android-platform-frameworks-native-10.0.0+r36/debian/changelog
--- android-platform-frameworks-native-10.0.0+r36/debian/changelog	2020-11-22 15:40:12.000000000 +0000
+++ android-platform-frameworks-native-10.0.0+r36/debian/changelog	2024-02-24 05:21:27.000000000 +0000
@@ -1,3 +1,16 @@
+android-platform-frameworks-native (1:10.0.0+r36-1.1~exp2) experimental; urgency=medium
+
+  * Set X-Time64-Compat explicitly for debhelper provides
+
+ -- Steve Langasek <vorlon at debian.org>  Sat, 24 Feb 2024 05:21:27 +0000
+
+android-platform-frameworks-native (1:10.0.0+r36-1.1~exp1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek <vorlon at debian.org>  Wed, 31 Jan 2024 18:44:12 +0000
+
 android-platform-frameworks-native (1:10.0.0+r36-1) unstable; urgency=medium
 
   [ Roger Shimizu ]
diff -Nru android-platform-frameworks-native-10.0.0+r36/debian/control android-platform-frameworks-native-10.0.0+r36/debian/control
--- android-platform-frameworks-native-10.0.0+r36/debian/control	2020-11-22 15:40:12.000000000 +0000
+++ android-platform-frameworks-native-10.0.0+r36/debian/control	2024-02-24 05:21:10.000000000 +0000
@@ -24,7 +24,11 @@
  This package contains headers in include/android in platform/frameworks/native
  Consists of all the header files ranging from asset_manager.h to window.h.
 
-Package: android-libetc1
+Package: android-libetc1t64
+X-Time64-Compat: android-libetc1
+Provides: ${t64:Provides}
+Replaces: android-libetc1
+Breaks: android-libetc1 (<< ${source:Version})
 Section: libs
 Architecture: amd64 i386 armel armhf arm64 mips mipsel mips64el
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -36,7 +40,7 @@
 Package: android-libetc1-dev
 Section: libdevel
 Architecture: amd64 i386 armel armhf arm64 mips mipsel mips64el
-Depends: android-libetc1 (= ${binary:Version}), ${misc:Depends},  ${shlibs:Depends}
+Depends: android-libetc1t64 (= ${binary:Version}), ${misc:Depends},  ${shlibs:Depends}
 Description: ETC1 compression library - Development files
  Ericsson Texture Compression (ETC) is a lossy texture compression technique
  developed in collaboration with Ericsson Research in early 2005. libETC1
-------------- 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/android-tools-devel/attachments/20240223/87f1fdb7/attachment.sig>