Commit 99067b60 authored by Andrea Bolognani's avatar Andrea Bolognani
Browse files

Minimize patches 

Since debhelper runs autoreconf for us at the beginning of the
build, we don't need to patch output files as they're going to
be recreated anyway.

Gbp-Dch: Ignore
parent c9f82beb

debian/patches/debian/Don-t-enable-default-network-on-boot.patch

+1 −16
Original line number Diff line number Diff line
@@ -4,24 +4,9 @@ Subject: Don't enable default network on boot 


to not interfere with existing network configurations

---

 src/Makefile.in             | 3 +--

 src/network/Makefile.inc.am | 3 +--

 2 files changed, 2 insertions(+), 4 deletions(-)

 1 file changed, 1 insertion(+), 2 deletions(-)



diff --git a/src/Makefile.in b/src/Makefile.in

index 9a215e4..ace56ba 100644

--- a/src/Makefile.in

+++ b/src/Makefile.in

@@ -14837,8 +14837,7 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \

 @WITH_NETWORK_TRUE@	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \

 @WITH_NETWORK_TRUE@	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }

 @WITH_NETWORK_TRUE@	( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \

-@WITH_NETWORK_TRUE@	  rm -f default.xml && \

-@WITH_NETWORK_TRUE@	  $(LN_S) ../default.xml default.xml )

+@WITH_NETWORK_TRUE@	  rm -f default.xml )

 @WITH_FIREWALLD_ZONE_TRUE@@WITH_NETWORK_TRUE@	$(MKDIR_P) "$(DESTDIR)$(prefix)/lib/firewalld/zones"

 @WITH_FIREWALLD_ZONE_TRUE@@WITH_NETWORK_TRUE@	$(INSTALL_DATA) $(srcdir)/network/libvirt.zone \

 @WITH_FIREWALLD_ZONE_TRUE@@WITH_NETWORK_TRUE@	  $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml

diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am

index 23cf39b..ca516c3 100644

--- a/src/network/Makefile.inc.am

debian/patches/debian/Use-upstreams-polkit-rule.patch

+1 −21
Original line number Diff line number Diff line
@@ -4,29 +4,9 @@ Subject: Use upstreams polkit rule 


As of 1.2.16 upstream ships a Polkit rule like Debian does.

---

 src/Makefile.in            | 4 ++--

 src/remote/Makefile.inc.am | 4 ++--

 2 files changed, 4 insertions(+), 4 deletions(-)

 1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/src/Makefile.in b/src/Makefile.in

index ace56ba..6721f99 100644

--- a/src/Makefile.in

+++ b/src/Makefile.in

@@ -14886,12 +14886,12 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \

 @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@		$(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy

 @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	$(MKDIR_P) $(DESTDIR)$(polkitrulesdir)

 @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	$(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \

-@WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@		$(DESTDIR)$(polkitrulesdir)/50-libvirt.rules

+@WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@		$(DESTDIR)$(polkitrulesdir)/60-libvirt.rules

 

 @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@uninstall-polkit:

 @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	rm -f $(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy

 @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	rmdir $(DESTDIR)$(polkitactionsdir) || :

-@WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	rm -f $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules

+@WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	rm -f $(DESTDIR)$(polkitrulesdir)/60-libvirt.rules

 @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	rmdir $(DESTDIR)$(polkitrulesdir) || :

 

 .PHONY: \

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am

index 0cf00cb..75b7290 100644

--- a/src/remote/Makefile.inc.am