Hi Guido Am 21.10.23 um 21:19 schrieb Michael Biebl:
Am 21.10.23 um 20:50 schrieb Michael Biebl:Ok, will do.Given the package is under the "debian" group, I will mark that as a team upload and include a couple of other packaging updates, like moving the D-Bus policy file to /usr, bumping the compat level and so on.I hope this is ok with you? If you want to review the changes, I can push them to a MR first. Please let me know, what you prefer.Seeing that the git repository and the package in the archive have diverged, I will not directly push to the git repo and will make a traditional NMU with the minimal changes as outlined in the debdiff.
Uploaded as network-manager-iodine_1.2.0-3.3 The final debdiff is attached
diff -Nru network-manager-iodine-1.2.0/debian/changelog network-manager-iodine-1.2.0/debian/changelog --- network-manager-iodine-1.2.0/debian/changelog 2022-12-30 11:19:28.000000000 +0100 +++ network-manager-iodine-1.2.0/debian/changelog 2023-10-21 12:36:31.000000000 +0200 @@ -1,3 +1,12 @@ +network-manager-iodine (1.2.0-3.3) unstable; urgency=medium + + * Non-maintainer upload. + * Install helper binaries into /usr/libexec (Closes: #1054305) + * Bump debhelper-compat to 13 so libexecdir is set properly. + * Remove libtool .la files to not make dh_missing fail with compat 13. + + -- Michael Biebl <bi...@debian.org> Sat, 21 Oct 2023 12:36:31 +0200 + network-manager-iodine (1.2.0-3.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru network-manager-iodine-1.2.0/debian/compat network-manager-iodine-1.2.0/debian/compat --- network-manager-iodine-1.2.0/debian/compat 2021-11-17 18:27:43.000000000 +0100 +++ network-manager-iodine-1.2.0/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -9 diff -Nru network-manager-iodine-1.2.0/debian/control network-manager-iodine-1.2.0/debian/control --- network-manager-iodine-1.2.0/debian/control 2021-11-17 18:33:01.000000000 +0100 +++ network-manager-iodine-1.2.0/debian/control 2023-10-21 12:36:31.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Guido Günther <a...@sigxcpu.org> Build-Depends: - debhelper (>= 9), + debhelper-compat (= 13), dpkg-dev (>= 1.16.1~), libnm-dev (>= 1.1), libnma-dev (>= 1.1), diff -Nru network-manager-iodine-1.2.0/debian/network-manager-iodine-gnome.install network-manager-iodine-1.2.0/debian/network-manager-iodine-gnome.install --- network-manager-iodine-1.2.0/debian/network-manager-iodine-gnome.install 2021-11-17 18:27:43.000000000 +0100 +++ network-manager-iodine-1.2.0/debian/network-manager-iodine-gnome.install 2023-10-21 12:36:31.000000000 +0200 @@ -1,3 +1,3 @@ +usr/libexec/nm-iodine-auth-dialog usr/lib/*/NetworkManager/*.so* -usr/lib/NetworkManager/nm-iodine-auth-dialog usr/share/gnome-vpn-properties diff -Nru network-manager-iodine-1.2.0/debian/network-manager-iodine.install network-manager-iodine-1.2.0/debian/network-manager-iodine.install --- network-manager-iodine-1.2.0/debian/network-manager-iodine.install 2021-11-17 18:28:33.000000000 +0100 +++ network-manager-iodine-1.2.0/debian/network-manager-iodine.install 2023-10-21 12:36:31.000000000 +0200 @@ -1,5 +1,5 @@ etc -usr/lib/NetworkManager/nm-iodine-service +usr/libexec/nm-iodine-service usr/lib/NetworkManager/VPN/nm-iodine-service.name usr/share/metainfo/ usr/share/locale/ diff -Nru network-manager-iodine-1.2.0/debian/rules network-manager-iodine-1.2.0/debian/rules --- network-manager-iodine-1.2.0/debian/rules 2021-11-17 18:36:06.000000000 +0100 +++ network-manager-iodine-1.2.0/debian/rules 2023-10-21 12:36:31.000000000 +0200 @@ -10,10 +10,12 @@ override_dh_auto_configure: [ -f ./configure ] || ./autogen.sh dh_auto_configure -- \ - --libexecdir=/usr/lib/NetworkManager \ --disable-static \ --without-libnm-glib \ --enable-more-warnings=yes override_dh_makeshlibs: dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/NetworkManager/ + +execute_before_dh_install: + find debian/tmp -name '*.la' -print -delete
OpenPGP_signature.asc
Description: OpenPGP digital signature