Author: waldi Date: Wed Jul 5 18:40:40 2006 New Revision: 204 Modified: trunk/xen-unstable/debian/rules Log: debian/rules: Merge changes from 3.0. Modified: trunk/xen-unstable/debian/rules =============================================================================--- trunk/xen-unstable/debian/rules (original) +++ trunk/xen-unstable/debian/rules Wed Jul 5 18:40:40 2006 @@ -13,8 +13,6 @@ export DH_OPTIONS -unpatch: - setup: $(STAMPS_DIR)/setup $(STAMPS_DIR)/setup: $(BUILD_DIR) $(STAMPS_DIR) setup-docs setup-hypervisor setup-tools dh_testdir @@ -108,6 +106,9 @@ exit 1; \ fi +# This is to make dpatch-edit-patch work +unpatch: clean + maintainerclean: rm -rf $(filter-out .svn debian, $(wildcard * .[^.]*)) @@ -138,7 +139,7 @@ cp $(BUILD_DIR)/build-hypervisor-$*/xen/xen.gz debian/xen-hypervisor-$(MAJOR)-$*/boot/xen-$(MAJOR)-$*.gz #cp $(BUILD_DIR)/build-hypervisor-$*/xen/xen-syms debian/xen-hypervisor-$(MAJOR)-$*/boot/xen-$(MAJOR)-$*.gz -install-tools: DH_OPTIONS = -pxen-utils-$(MAJOR) +install-tools: DH_OPTIONS = -pxen-utils-$(MAJOR) -pxen-ioemu-$(MAJOR) install-tools: dh_testdir dh_testroot @@ -174,7 +175,7 @@ dh_installdocs -s dh_installexamples -s dh_installinit -p xen-utils-$(MAJOR) --name xend -- defaults 20 21 - dh_installinit -p xen-utils-$(MAJOR) --name xendomains -- defaults 21 20 + dh_installinit -p xen-utils-$(MAJOR) --name xendomains --no-restart-on-upgrade -- defaults 21 20 dh_installman -s dh_link -s dh_strip -s