Source: android-sdk-meta
Version: 28.0.2+9
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib/udev. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch to delegate the exact placement of
the udev files to udev.pc (using pkg-config). This should work today
in unstable and, if necessary, for bookworm. Once udev.pc in
unstable points to /usr/lib your package will benefit automatically
after a binNMU or any other upload.
Later during the trixie cycle I expect this bug class to raise in
priority.
Per the wiki, it is advisable to upload to experimental first, and
wait a few days for the dumat tool to check your package. The same
is advisable when any structural changes are done in the trixie
cycle.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru android-sdk-meta-28.0.2+9/debian/android-sdk-platform-tools-common.install android-sdk-meta-28.0.2+9+nmu1/debian/android-sdk-platform-tools-common.install
--- android-sdk-meta-28.0.2+9/debian/android-sdk-platform-tools-common.install 2023-01-24 07:07:40.000000000 +0100
+++ android-sdk-meta-28.0.2+9+nmu1/debian/android-sdk-platform-tools-common.install 2023-12-07 22:41:14.000000000 +0100
@@ -1,3 +1,3 @@
-51-android.rules lib/udev/rules.d
+51-android.rules ${env:deb_udevdir}/rules.d
debian/android-sdk.metainfo.xml usr/share/metainfo
platform-tools/* usr/lib/android-sdk/platform-tools
diff -Nru android-sdk-meta-28.0.2+9/debian/changelog android-sdk-meta-28.0.2+9+nmu1/debian/changelog
--- android-sdk-meta-28.0.2+9/debian/changelog 2023-01-24 07:07:40.000000000 +0100
+++ android-sdk-meta-28.0.2+9+nmu1/debian/changelog 2023-12-07 22:41:14.000000000 +0100
@@ -1,3 +1,10 @@
+android-sdk-meta (28.0.2+9+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Delegate placement of udev files to udev.pc
+
+ -- Chris Hofstaedtler <z...@debian.org> Thu, 07 Dec 2023 22:41:14 +0100
+
android-sdk-meta (28.0.2+9) unstable; urgency=medium
* Team upload.
diff -Nru android-sdk-meta-28.0.2+9/debian/control android-sdk-meta-28.0.2+9+nmu1/debian/control
--- android-sdk-meta-28.0.2+9/debian/control 2023-01-24 07:07:40.000000000 +0100
+++ android-sdk-meta-28.0.2+9+nmu1/debian/control 2023-12-07 22:41:14.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Android Tools Maintainers <android-tools-de...@lists.alioth.debian.org>
Uploaders: Chirayu Desai <chirayudes...@gmail.com>,
-Build-Depends: debhelper-compat (= 12), dh-exec
+Build-Depends: debhelper-compat (= 13), dh-exec, pkg-config, systemd-dev
Standards-Version: 4.5.0
Vcs-Git: https://salsa.debian.org/android-tools-team/android-sdk-meta.git
Vcs-Browser: https://salsa.debian.org/android-tools-team/android-sdk-meta
diff -Nru android-sdk-meta-28.0.2+9/debian/rules android-sdk-meta-28.0.2+9+nmu1/debian/rules
--- android-sdk-meta-28.0.2+9/debian/rules 2023-01-24 07:07:40.000000000 +0100
+++ android-sdk-meta-28.0.2+9+nmu1/debian/rules 2023-12-07 22:41:14.000000000 +0100
@@ -2,6 +2,8 @@
include /usr/share/dpkg/pkg-info.mk
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
export BUILD_TOOLS_VERSION = 29.0.3
PLATFORM_TOOLS_VERSION = 28.0.2
# this needs to also support updates and ubuntu versions, e.g.:
diff -Nru android-sdk-meta-28.0.2+9/debian/tests/control android-sdk-meta-28.0.2+9+nmu1/debian/tests/control
--- android-sdk-meta-28.0.2+9/debian/tests/control 2023-01-24 07:07:40.000000000 +0100
+++ android-sdk-meta-28.0.2+9+nmu1/debian/tests/control 2023-12-07 22:41:10.000000000 +0100
@@ -2,9 +2,9 @@
Tests: test-deb-revision-parsing
-Test-Command: test -e /lib/udev/rules.d/51-android.rules
+Test-Command: test -e /usr/lib/udev/rules.d/51-android.rules
Architecture: amd64 i386 armel armhf arm64 mipsel mips64el ppc64el
Depends: adb, android-sdk-platform-tools-common
-Test-Command: test -e /lib/udev/rules.d/51-android.rules
+Test-Command: test -e /usr/lib/udev/rules.d/51-android.rules
Depends: android-sdk-platform-tools-common
