[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/experimental] 2 commits: patches: Drop debian/Use-upstreams-polkit-rule.patch

[Guido Günther]

Guido Günther pushed to branch debian/experimental at Libvirt Packaging Team / libvirt


Commits:
d273e0d3 by Andrea Bolognani at 2020-08-22T10:10:12+00:00
patches: Drop debian/Use-upstreams-polkit-rule.patch

We're going to achieve the same result without needing to patch
the upstream build system.

Gbp-Dch: Ignore

- - - - -
2a2db7f3 by Andrea Bolognani at 2020-08-22T10:10:13+00:00
rules: Rename upstream polkit rules

While upstream has included this file for a long time, they use
a slightly different name than the one we want to use in Debian
for historical reasons as well as to match the other polkit file
we install. Change its name before dh_install is called to
achieve the desired results.

Gbp-Dch: Ignore

- - - - -


3 changed files:

- − debian/patches/debian/Use-upstreams-polkit-rule.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/patches/debian/Use-upstreams-polkit-rule.patch deleted
=====================================
@@ -1,28 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Fri, 5 Jun 2015 13:13:44 +0200
-Subject: Use upstreams polkit rule
-
-As of 1.2.16 upstream ships a Polkit rule like Debian does.
----
- src/remote/Makefile.inc.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
-index 80f4aad..9642972 100644
---- a/src/remote/Makefile.inc.am
-+++ b/src/remote/Makefile.inc.am
-@@ -362,12 +362,12 @@ install-polkit:
- 		$(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy
- 	$(MKDIR_P) $(DESTDIR)$(polkitrulesdir)
- 	$(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \
--		$(DESTDIR)$(polkitrulesdir)/50-libvirt.rules
-+		$(DESTDIR)$(polkitrulesdir)/60-libvirt.rules
- 
- uninstall-polkit:
- 	rm -f $(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy
- 	rmdir $(DESTDIR)$(polkitactionsdir) || :
--	rm -f $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules
-+	rm -f $(DESTDIR)$(polkitrulesdir)/60-libvirt.rules
- 	rmdir $(DESTDIR)$(polkitrulesdir) || :
- 
- INSTALL_DATA_LOCAL += install-polkit


=====================================
debian/patches/series
=====================================
@@ -4,7 +4,6 @@ debian/Debianize-virtlockd.patch
 debian/Debianize-virtlogd.patch
 Skip-vircgrouptest.patch
 Reduce-udevadm-settle-timeout-to-10-seconds.patch
-debian/Use-upstreams-polkit-rule.patch
 debian/apparmor_profiles_local_include.patch
 Set-defaults-for-zfs-tools.patch
 Pass-GPG_TTY-env-var-to-the-ssh-binary.patch


=====================================
debian/rules
=====================================
@@ -197,6 +197,12 @@ override_dh_auto_install:
 	cp debian/polkit/60-libvirt.pkla \
 	   $(DEB_DESTDIR)/var/lib/polkit-1/localauthority/10-vendor.d/
 
+	# Rename the upstream polkit rule so that it matches the name used
+	# historically in Debian, as well as that of the backwards compat
+	# rules we just installed
+	mv $(DEB_DESTDIR)/usr/share/polkit-1/rules.d/50-libvirt.rules \
+	   $(DEB_DESTDIR)/usr/share/polkit-1/rules.d/60-libvirt.rules
+
 	# Don't ship any la files
 	rm $(DEB_DESTDIR)/usr/lib/*/wireshark/plugins/*/*/*.la
 



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/3145e31237ff728cec1e7695707a67e879058cea...2a2db7f37d6be96e47a508fe00ff4869434cc86a

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/3145e31237ff728cec1e7695707a67e879058cea...2a2db7f37d6be96e47a508fe00ff4869434cc86a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20200822/e03d063d/attachment-0001.html>