Ian Campbell
2012-Jul-14 22:22 UTC
[Pkg-xen-changes] r1073 - in branches/wheezy/xen/debian: . templates
Author: ijc-guest
Date: Sat Jul 14 22:22:38 2012
New Revision: 1073
Log:
* xen/debian/rules.real, xen/debian/templates/control.hypervisor.in:
Make xen-hypervisor-$flavour a real package (Closes: 681376)
* debian/changelog: Update.
Modified:
branches/wheezy/xen/debian/changelog
branches/wheezy/xen/debian/rules.real
branches/wheezy/xen/debian/templates/control.hypervisor.in
Modified: branches/wheezy/xen/debian/changelog
=============================================================================---
branches/wheezy/xen/debian/changelog Sat Jul 14 12:21:44 2012 (r1072)
+++ branches/wheezy/xen/debian/changelog Sat Jul 14 22:22:38 2012 (r1073)
@@ -2,6 +2,7 @@
[ Ian Campbell ]
* Set tap device MAC addresses to fe:ff:ff:ff:ff:ff (Closes: #671018)
+ * Make xen-hypervisor-$flavour a real package to aid upgrade (Closes:
#681376)
[ Bastian Blank ]
* Actually build-depend on new enough version of dpkg-dev.
Modified: branches/wheezy/xen/debian/rules.real
=============================================================================---
branches/wheezy/xen/debian/rules.real Sat Jul 14 12:21:44 2012 (r1072)
+++ branches/wheezy/xen/debian/rules.real Sat Jul 14 22:22:38 2012 (r1073)
@@ -23,6 +23,7 @@
binary-arch-arch: install-lib-ocaml-dev_$(ARCH)
binary-arch-arch: install-lib-ocaml_$(ARCH)
binary-arch-flavour: install-hypervisor_$(ARCH)_$(FLAVOUR)
+binary-arch-flavour: install-hypervisor-flavour_$(FLAVOUR)
binary-indep: install-docs
binary-indep: install-utils-common
@@ -140,6 +141,14 @@
cp $(DIR)/xen/xen.gz debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)-$(FLAVOUR).gz
+$(MAKE_SELF) install-base
+install-hypervisor-flavour_$(FLAVOUR): PACKAGE_NAME = xen-hypervisor-$(FLAVOUR)
+install-hypervisor-flavour_$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME)
+install-hypervisor-flavour_$(FLAVOUR):
+ dh_testdir
+ dh_testroot
+ dh_prep
+ +$(MAKE_SELF) install-base
+
install-libxen_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
install-libxen_$(ARCH): DH_OPTIONS = -plibxen-$(VERSION)
install-libxen_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
Modified: branches/wheezy/xen/debian/templates/control.hypervisor.in
=============================================================================---
branches/wheezy/xen/debian/templates/control.hypervisor.in Sat Jul 14 12:21:44
2012 (r1072)
+++ branches/wheezy/xen/debian/templates/control.hypervisor.in Sat Jul 14
22:22:38 2012 (r1073)
@@ -1,6 +1,6 @@
Package: xen-hypervisor- at version@@localversion@
Depends: ${misc:Depends}
-Provides: xen-hypervisor, xen-hypervisor- at version@, xen-hypervisor at
localversion@
+Provides: xen-hypervisor, xen-hypervisor- at version@
Recommends: xen-utils- at version@
Suggests: xen-docs- at version@
Description: Xen Hypervisor on @class@
@@ -14,3 +14,10 @@
specifically crafted to work as the Domain 0, mediating hardware access for
XEN itself.
+Package: xen-hypervisor at localversion@
+Depends: xen-hypervisor- at version@@localversion@, ${misc:Depends}
+Description: Latest Xen Hypervisor on @class@
+ This package depends on the latest version of the Xen hypervisor for @class@
+ .
+ @desc@
+