Source: google-android-installers
Version: 1695033340
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Dear Maintainer,

your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].

Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib your package will
benefit automatically after a binNMU or any other upload.

If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.

Later during the trixie cycle I expect this bug class to raise in
priority.

Thank you for considering,
Chris

[1] https://wiki.debian.org/UsrMerge
diff -Nru google-android-installers-1695033340/debian/changelog google-android-installers-1695033340+nmu1/debian/changelog
--- google-android-installers-1695033340/debian/changelog	2023-09-21 09:06:31.000000000 +0200
+++ google-android-installers-1695033340+nmu1/debian/changelog	2023-12-16 20:10:27.000000000 +0100
@@ -1,3 +1,10 @@
+google-android-installers (1695033340+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler <z...@debian.org>  Sat, 16 Dec 2023 20:10:27 +0100
+
 google-android-installers (1695033340) unstable; urgency=medium
 
   * New upstream update
diff -Nru google-android-installers-1695033340/debian/control google-android-installers-1695033340+nmu1/debian/control
--- google-android-installers-1695033340/debian/control	2023-09-21 09:06:31.000000000 +0200
+++ google-android-installers-1695033340+nmu1/debian/control	2023-12-16 20:10:27.000000000 +0100
@@ -5,7 +5,7 @@
 Priority: optional
 Maintainer: Fab Stz <fabstz...@yahoo.fr>
 Uploaders: Roger Shimizu <r...@debian.org>, Mouaad Aallam <mou...@aallam.com>
-Build-Depends: bash-completion, debhelper-compat (=13), po-debconf
+Build-Depends: bash-completion, debhelper-compat (=13), pkgconf, po-debconf, systemd-dev
 Standards-Version: 4.6.1
 Rules-Requires-Root: no
 Homepage: https://developer.android.com/about/index.html
diff -Nru google-android-installers-1695033340/debian/control.in google-android-installers-1695033340+nmu1/debian/control.in
--- google-android-installers-1695033340/debian/control.in	2023-09-21 09:06:31.000000000 +0200
+++ google-android-installers-1695033340+nmu1/debian/control.in	2023-12-16 20:09:25.000000000 +0100
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Fab Stz <fabstz...@yahoo.fr>
 Uploaders: Roger Shimizu <r...@debian.org>, Mouaad Aallam <mou...@aallam.com>
-Build-Depends: bash-completion, debhelper-compat (=13), po-debconf
+Build-Depends: bash-completion, debhelper-compat (=13), pkgconf, po-debconf, systemd-dev
 Standards-Version: 4.6.1
 Rules-Requires-Root: no
 Homepage: https://developer.android.com/about/index.html
diff -Nru google-android-installers-1695033340/debian/platform-tools.install.in google-android-installers-1695033340+nmu1/debian/platform-tools.install.in
--- google-android-installers-1695033340/debian/platform-tools.install.in	2023-09-21 09:06:31.000000000 +0200
+++ google-android-installers-1695033340+nmu1/debian/platform-tools.install.in	2023-12-16 20:10:23.000000000 +0100
@@ -1,4 +1,4 @@
 for-postinst/default/Makefile  usr/share/google-android-platform-tools-installer/
 for-postinst/default/%ZIPFILE%.sha1  usr/share/google-android-platform-tools-installer/
 %PATH_DIRNAME%/%PATH_BASENAME%/package.xml  usr/share/google-android-platform-tools-installer/
-51-android.rules lib/udev/rules.d
+51-android.rules ${env:deb_udevdir}/rules.d
diff -Nru google-android-installers-1695033340/debian/rules google-android-installers-1695033340+nmu1/debian/rules
--- google-android-installers-1695033340/debian/rules	2023-09-21 09:06:31.000000000 +0200
+++ google-android-installers-1695033340+nmu1/debian/rules	2023-12-16 20:09:03.000000000 +0100
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
 
 include /usr/share/dpkg/pkg-info.mk
 

Reply via email to