[Pkg-xen-changes] r1066 - in trunk/xen: . debian debian/bin debian/templates

[Bastian Blank]

Author: waldi
Date: Sun Jul  1 18:33:55 2012
New Revision: 1066

Log:
Merge /branches/wheezy/xen.

Modified:
   trunk/xen/   (props changed)
   trunk/xen/debian/bin/gencontrol.py
   trunk/xen/debian/changelog
   trunk/xen/debian/rules.real
   trunk/xen/debian/templates/control.source.in
   trunk/xen/debian/templates/control.utils.in

Modified: trunk/xen/debian/bin/gencontrol.py
==============================================================================
--- trunk/xen/debian/bin/gencontrol.py	Sun Jul  1 18:31:52 2012	(r1065)
+++ trunk/xen/debian/bin/gencontrol.py	Sun Jul  1 18:33:55 2012	(r1066)
@@ -105,7 +105,7 @@
         cmds_build = ["$(MAKE) -f debian/rules.real build-arch-flavour %s" % makeflags]
         cmds_setup = ["$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags]
         makefile.add("binary-arch_%s_%s_%s" % (arch, featureset, flavour), cmds = cmds_binary_arch)
-        makefile.add("build_%s_%s_%s" % (arch, featureset, flavour), cmds = cmds_build)
+        makefile.add("build-arch_%s_%s_%s" % (arch, featureset, flavour), cmds = cmds_build)
         makefile.add("setup_%s_%s_%s" % (arch, featureset, flavour), cmds = cmds_setup)
 
     def process_changelog(self):

Modified: trunk/xen/debian/changelog
==============================================================================
--- trunk/xen/debian/changelog	Sun Jul  1 18:31:52 2012	(r1065)
+++ trunk/xen/debian/changelog	Sun Jul  1 18:33:55 2012	(r1066)
@@ -8,6 +8,13 @@
 
  -- Bastian Blank <waldi at debian.org>  Sun, 13 May 2012 12:21:10 +0000
 
+xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-4) unstable; urgency=low
+
+  * Add Build-Using info to xen-utils package.
+  * Fix build-arch target.
+
+ -- Bastian Blank <waldi at debian.org>  Sun, 01 Jul 2012 19:52:30 +0200
+
 xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-3) unstable; urgency=low
 
   * Remove /usr/lib/xen-default. It breaks systems if xenstored is not
@@ -33,6 +40,7 @@
       CVE-2012-0218
     - Disable Xen on CPUs affected by AMD Erratum #121. PV guests can
       cause a DoS of the host.
+      CVE-2012-2934
   * Don't fail if standard toolstacks are not available. (closes: #677244)
 
  -- Bastian Blank <waldi at debian.org>  Thu, 14 Jun 2012 17:06:25 +0200

Modified: trunk/xen/debian/rules.real
==============================================================================
--- trunk/xen/debian/rules.real	Sun Jul  1 18:31:52 2012	(r1065)
+++ trunk/xen/debian/rules.real	Sun Jul  1 18:33:55 2012	(r1066)
@@ -226,6 +226,7 @@
 	install -D -m644 debian/xen-utils.README.Debian $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/README.Debian
 	install -D -m644 debian/xen-utils-$(VERSION).lintian-overrides $(PACKAGE_DIR)/usr/share/lintian/overrides/$(PACKAGE_NAME)
 	dh_install --sourcedir=$(DIR) usr/lib/xen-$(VERSION)
+	( echo -n "misc:Built-Using="; dpkg-query -f='$${source:Package} (= $${source:Version}), ' -W ipxe-qemu; echo ) >> debian/$(PACKAGE_NAME).substvars
 	dh_python2 -V$(shell pyversions -rv) /usr/lib/xen-$(VERSION)
 	dh_strip
 	dh_makeshlibs -V

Modified: trunk/xen/debian/templates/control.source.in
==============================================================================
--- trunk/xen/debian/templates/control.source.in	Sun Jul  1 18:31:52 2012	(r1065)
+++ trunk/xen/debian/templates/control.source.in	Sun Jul  1 18:33:55 2012	(r1066)
@@ -3,7 +3,9 @@
 Maintainer: Debian Xen Team <pkg-xen-devel at lists.alioth.debian.org>
 Uploaders: Guido Trotter <ultrotter at debian.org>, Bastian Blank <waldi at debian.org>
 Build-Depends:
- debhelper (>> 7), lsb-release,
+ debhelper (>> 7),
+ dpkg-dev-de (>= 1.16.0~),
+ lsb-release,
  python-dev,
  bcc,
  gcc-multilib,

Modified: trunk/xen/debian/templates/control.utils.in
==============================================================================
--- trunk/xen/debian/templates/control.utils.in	Sun Jul  1 18:31:52 2012	(r1065)
+++ trunk/xen/debian/templates/control.utils.in	Sun Jul  1 18:33:55 2012	(r1066)
@@ -3,6 +3,7 @@
 Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor- at version@, qemu-keymaps, qemu-utils
 Provides: xen-utils
 Suggests: xen-docs- at version@
+Built-Using: ${misc:Built-Using}
 Description: XEN administrative tools
  The userspace tools to manage a system virtualized through the XEN virtual
  machine monitor.