[Pkg-xen-changes] r430 - in trunk/xen-3/debian: . templates

[Bastian Blank]

Author: waldi
Date: Fri Aug  3 21:40:55 2007
New Revision: 430

Log:
debian/rules.real, debian/templates/control.utils.in: Drop xen-ioemu.


Modified:
   trunk/xen-3/debian/rules.real
   trunk/xen-3/debian/templates/control.utils.in

Modified: trunk/xen-3/debian/rules.real
==============================================================================
--- trunk/xen-3/debian/rules.real	(original)
+++ trunk/xen-3/debian/rules.real	Fri Aug  3 21:40:55 2007
@@ -6,8 +6,7 @@
 
 include debian/rules.defs
 
-binary-arch-arch: install-utils-ioemu_$(ARCH)
-binary-arch-arch: install-utils-utils_$(ARCH)
+binary-arch-arch: install-utils_$(ARCH)
 binary-arch-flavour: install-hypervisor_$(ARCH)_$(FLAVOUR)
 
 binary-indep: install-docs
@@ -96,41 +95,21 @@
 	cp $(DIR)/xen/xen.gz debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)$(ABINAME)-$(FLAVOUR).gz
 	$(MAKE) -f debian/rules.real install-base
 
-install-utils-temp_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/build-utils_$(ARCH)
-install-utils-temp_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
-install-utils-temp_$(ARCH): $(STAMPS_DIR)/build-utils_$(ARCH)
+install-utils_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/build-utils_$(ARCH)
+install-utils_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
+install-utils_$(ARCH): PACKAGE_NAME = xen-utils-$(VERSION)$(ABINAME)
+install-utils_$(ARCH): PACKAGE_DIR = debian/$(PACKAGE_NAME)
+install-utils_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
+install-utils_$(ARCH): $(STAMPS_DIR)/build-utils_$(ARCH)
 	dh_testdir
 	dh_testroot
+	dh_clean -k
 	@rm -rf $(DIR)
 	$(MAKE) -C $(SOURCE_DIR)/tools install DESTDIR=$(CURDIR)/$(DIR) DISTDIR=$(CURDIR)/$(DIR) XEN_COMPILE_ARCH=$(XEN_ARCH) XEN_TARGET_ARCH=$(XEN_ARCH) XEN_VERSION=$(VERSION)$(ABINAME)
-
-install-utils-ioemu_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
-install-utils-ioemu_$(ARCH): PACKAGE_NAME = xen-ioemu-$(VERSION)$(ABINAME)
-install-utils-ioemu_$(ARCH): LIBDIR = usr/lib/xen-$(VERSION)$(ABINAME)
-install-utils-ioemu_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-utils-ioemu_$(ARCH): install-utils-temp_$(ARCH)
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_install --sourcedir=$(DIR) $(LIBDIR)/bin/qemu-dm
-	dh_install --sourcedir=$(DIR) $(LIBDIR)/boot
-	dh_install --sourcedir=$(DIR) usr/share/xen-$(VERSION)$(ABINAME)
-	dh_strip
-	dh_shlibdeps
-	$(MAKE) -f debian/rules.real install-base
-
-install-utils-utils_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
-install-utils-utils_$(ARCH): PACKAGE_NAME = xen-utils-$(VERSION)$(ABINAME)
-install-utils-utils_$(ARCH): PACKAGE_DIR = debian/$(PACKAGE_NAME)
-install-utils-utils_$(ARCH): LIBDIR = usr/lib/xen-$(VERSION)$(ABINAME)
-install-utils-utils_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-utils-utils_$(ARCH): install-utils-temp_$(ARCH)
-	dh_testdir
-	dh_testroot
-	dh_clean -k
 	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) $(LIBDIR)/bin $(LIBDIR)/lib $(LIBDIR) -Xqemu
+	dh_install --sourcedir=$(DIR) usr/lib
+	dh_install --sourcedir=$(DIR) usr/share/xen-$(VERSION)$(ABINAME)
 	dh_pycentral
 	dh_strip
 	dh_shlibdeps

Modified: trunk/xen-3/debian/templates/control.utils.in
==============================================================================
--- trunk/xen-3/debian/templates/control.utils.in	(original)
+++ trunk/xen-3/debian/templates/control.utils.in	Fri Aug  3 21:40:55 2007
@@ -8,16 +8,3 @@
  The userspace tools to manage a system virtualized through the XEN virtual
  machine monitor.
 
-Package: xen-ioemu- at version@@abiname@
-Depends: ${shlibs:Depends}, xen-utils- at version@@abiname@ (= ${Source-Version})
-Description: XEN administrative tools
- The userspace tools to manage a system virtualized through the XEN virtual
- machine monitor.
- .
- This package includes the utilities required to support HVM domains, which
- allows full virtualization of unmodified operating systems, such as
- Microsoft's Windows product line, and standard Linux kernels.
- .
- For this to work, you will need a CPU with hardware virtualization support,
- such as Intel's CPUs with VT, or AMD's CPUs with Pacifica.
-