Author: waldi Date: Sat Jan 26 22:18:57 2008 New Revision: 507 Log: * debian/changelog: Update. * debian/rules.real: Clean environment for build. Modified: trunk/xen-3/debian/changelog trunk/xen-3/debian/rules.real Modified: trunk/xen-3/debian/changelog =============================================================================--- trunk/xen-3/debian/changelog (original) +++ trunk/xen-3/debian/changelog Sat Jan 26 22:18:57 2008 @@ -1,3 +1,9 @@ +xen-3 (3.2.0-3) UNRELEASED; urgency=low + + * Clean environment for build. + + -- Bastian Blank <waldi at debian.org> Sat, 26 Jan 2008 22:18:23 +0000 + xen-3 (3.2.0-2) unstable; urgency=low * Fix broken patch. (closes: #462522) Modified: trunk/xen-3/debian/rules.real =============================================================================--- trunk/xen-3/debian/rules.real (original) +++ trunk/xen-3/debian/rules.real Sat Jan 26 22:18:57 2008 @@ -4,9 +4,17 @@ export DH_OPTIONS +setup_env := env -u ABINAME -u ARCH -u FLAVOUR -u VERSION -u MAKEFLAGS + +MAKE_CLEAN = $(setup_env) $(MAKE) +MAKE_SELF = $(MAKE) -f debian/rules.real + include debian/rules.defs -binary-arch-arch: install-lib-dev_$(ARCH) install-utils_$(ARCH) +binary-arch-arch: install-lib-dev_$(ARCH) +binary-arch-arch: install-libxenstore_$(ARCH) +binary-arch-arch: install-utils_$(ARCH) +binary-arch-arch: install-xenstore-utils_$(ARCH) binary-arch-flavour: install-hypervisor_$(ARCH)_$(FLAVOUR) binary-indep: install-docs @@ -50,12 +58,12 @@ $(STAMPS_DIR)/build-docs: DIR=$(BUILD_DIR)/build-docs $(STAMPS_DIR)/build-docs: $(STAMPS_DIR)/setup-docs - $(MAKE) -C $(DIR)/docs + $(MAKE_CLEAN) -C $(DIR)/docs touch $@ $(STAMPS_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR): DIR=$(BUILD_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR) $(STAMPS_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR): $(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR) - $(MAKE) -C $(DIR)/xen \ + $(MAKE_CLEAN) -C $(DIR)/xen \ $(CONFIG) \ XEN_COMPILE_ARCH=$(XEN_ARCH) \ XEN_TARGET_ARCH=$(XEN_ARCH) @@ -70,7 +78,7 @@ $(STAMPS_DIR)/build-utils_$(ARCH): DIR=$(BUILD_DIR)/build-utils_$(ARCH) $(STAMPS_DIR)/build-utils_$(ARCH): $(STAMPS_DIR)/setup-utils_$(ARCH) - $(MAKE) -C $(DIR)/tools $(CONFIG) + $(MAKE_CLEAN) -C $(DIR)/tools $(CONFIG) touch $@ install-base: @@ -90,9 +98,9 @@ dh_testdir dh_testroot dh_clean -k - $(MAKE) -C $(DIR)/docs install DESTDIR=$(CURDIR)/debian/tmp + $(MAKE_CLEAN) -C $(DIR)/docs install DESTDIR=$(CURDIR)/debian/tmp dh_install --sourcedir=debian/tmp usr/share/doc/xen/pdf/* usr/share/doc/$(PACKAGE_NAME) - $(MAKE) -f debian/rules.real install-base + $(MAKE_SELF) install-base install-hypervisor_$(ARCH)_$(FLAVOUR): DIR=$(BUILD_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR) install-hypervisor_$(ARCH)_$(FLAVOUR): PACKAGE_NAME = xen-hypervisor-$(VERSION)$(ABINAME)-$(FLAVOUR) @@ -103,7 +111,7 @@ dh_clean -k dh_installdirs boot cp $(DIR)/xen/xen.gz debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)$(ABINAME)-$(FLAVOUR).gz - $(MAKE) -f debian/rules.real install-base + $(MAKE_SELF) install-base install-lib-dev_$(ARCH): DIR = $(BUILD_DIR)/build-utils_$(ARCH) install-lib-dev_$(ARCH): PACKAGE_NAME = libxen-dev @@ -114,7 +122,7 @@ dh_clean -k dh_install --sourcedir=$(DIR) dh_strip - $(MAKE) -f debian/rules.real install-base + $(MAKE_SELF) install-base install-utils_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/build-utils_$(ARCH) install-utils_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH) @@ -126,7 +134,7 @@ dh_testroot dh_clean -k @rm -rf $(DIR) - $(MAKE) -C $(SOURCE_DIR)/tools install DESTDIR=$(CURDIR)/$(DIR) DISTDIR=$(CURDIR)/$(DIR) $(CONFIG) + $(MAKE_CLEAN) -C $(SOURCE_DIR)/tools install DESTDIR=$(CURDIR)/$(DIR) DISTDIR=$(CURDIR)/$(DIR) $(CONFIG) install -D -m644 debian/xen-utils.NEWS $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/NEWS install -D -m644 debian/xen-utils.README.Debian $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/README.Debian dh_install --sourcedir=$(DIR) usr/lib @@ -134,6 +142,6 @@ dh_pycentral dh_strip dh_shlibdeps - $(MAKE) -f debian/rules.real install-base + $(MAKE_SELF) install-base # vim: filetype=make