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

[Steve Langasek]

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)
-------------- 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	2020-11-22 15:26:31.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	2020-11-22 15:26:31.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-02-28 00:57:35.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-28 00:59:27.000000000 +0000
@@ -1,3 +1,10 @@
+android-platform-frameworks-native (1:10.0.0+r36-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062211
+
+ -- Steve Langasek <vorlon at debian.org>  Wed, 28 Feb 2024 00:59:27 +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-28 00:59:27.000000000 +0000
@@ -6,7 +6,7 @@
            Laszlo Boszormenyi (GCS) <gcs at debian.org>,
            Kai-Chung Yan <seamlikok at gmail.com>,
            Chirayu Desai <chirayudesai1 at gmail.com>
-Build-Depends: debhelper-compat (=13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (=13),
                dh-exec
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
@@ -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