Source: google-compute-engine-oslogin
Version: 20210907.00-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. google-compute-engine-oslogin installs files into /lib; these
should be moved into the respective directories in /usr/
Please find a patch attached. It has been build-tested.
Note: this should not be backported to bookworm. If you intend to
backport, please use dh_movetousr instead.
If your package will change for the t64 transition or otherwise
rename/split/move its binaries (packages) during trixie, please
then upload to experimental and get in touch with the UsrMerge
driver, please see the wiki [1].
Michael
[1] https://wiki.debian.org/UsrMerge
diff -Nru google-compute-engine-oslogin-20210907.00/debian/changelog
google-compute-engine-oslogin-20210907.00/debian/changelog
--- google-compute-engine-oslogin-20210907.00/debian/changelog 2021-09-21
12:19:19.000000000 +0200
+++ google-compute-engine-oslogin-20210907.00/debian/changelog 2024-01-22
21:04:05.000000000 +0100
@@ -1,3 +1,14 @@
+google-compute-engine-oslogin (20210907.00-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install PAM module and systemd files into /usr (DEP17 M2).
+ Use systemd.pc to get the paths for the unit and preset dir.
+ Add a corresponding versioned Build-Depends on debhelper (>= 13.11.6) to
+ ensure we have a recent enough dh_installsystemd.
+ (Closes: #-1)
+
+ -- Michael Biebl <bi...@debian.org> Mon, 22 Jan 2024 21:04:05 +0100
+
google-compute-engine-oslogin (20210907.00-1) unstable; urgency=medium
* Initial release.
diff -Nru google-compute-engine-oslogin-20210907.00/debian/control
google-compute-engine-oslogin-20210907.00/debian/control
--- google-compute-engine-oslogin-20210907.00/debian/control 2021-09-21
12:19:19.000000000 +0200
+++ google-compute-engine-oslogin-20210907.00/debian/control 2024-01-22
21:04:05.000000000 +0100
@@ -6,6 +6,9 @@
Bastian Blank <bastian.bl...@credativ.de>
Build-Depends:
debhelper-compat (= 13),
+ debhelper (>= 13.11.6),
+ systemd-dev,
+ pkgconf,
libcurl4-openssl-dev,
libgtest-dev <!nocheck>,
libjson-c-dev,
diff -Nru google-compute-engine-oslogin-20210907.00/debian/rules
google-compute-engine-oslogin-20210907.00/debian/rules
--- google-compute-engine-oslogin-20210907.00/debian/rules 2021-09-21
12:19:19.000000000 +0200
+++ google-compute-engine-oslogin-20210907.00/debian/rules 2024-01-22
21:04:05.000000000 +0100
@@ -8,7 +8,12 @@
dh $@
override_dh_auto_install:
- dh_auto_install -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
PAMDIR=/lib/$(DEB_HOST_MULTIARCH)/security VERSION=$(DEB_VERSION_UPSTREAM)
+ dh_auto_install -- \
+ LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ PAMDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/security \
+ SYSTEMDDIR=$(shell pkgconf --variable=systemd_system_unit_dir
systemd) \
+ PRESETDIR=$(shell pkgconf --variable=systemd_system_preset_dir
systemd) \
+ VERSION=$(DEB_VERSION_UPSTREAM)
override_dh_auto_test:
$(MAKE) alltests
