[Pkg-xen-changes] r553 - in trunk/xen-3/debian: . patches

[Bastian Blank]

Author: waldi
Date: Mon May 12 11:37:38 2008
New Revision: 553

Log:
* debian/changelog: Update version to 3.2.1-1.
* debian/patches/CVE-2008-0928: Remove.
* debian/patches/series: Drop removed patch.
* debian/patches/version.patch: Update.


Removed:
   trunk/xen-3/debian/patches/CVE-2008-0928
Modified:
   trunk/xen-3/debian/changelog
   trunk/xen-3/debian/patches/series
   trunk/xen-3/debian/patches/version.patch

Modified: trunk/xen-3/debian/changelog
==============================================================================
--- trunk/xen-3/debian/changelog	(original)
+++ trunk/xen-3/debian/changelog	Mon May 12 11:37:38 2008
@@ -1,3 +1,9 @@
+xen-3 (3.2.1-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+
+ -- Bastian Blank <waldi at debian.org>  Mon, 12 May 2008 13:03:38 +0200
+
 xen-3 (3.2.0-5) unstable; urgency=low
 
   * Provide correct directory to dh_pycentral.

Modified: trunk/xen-3/debian/patches/series
==============================================================================
--- trunk/xen-3/debian/patches/series	(original)
+++ trunk/xen-3/debian/patches/series	Mon May 12 11:37:38 2008
@@ -14,4 +14,3 @@
 disable-features.diff
 tools-misc-xend-race.diff
 doc-remove-unused.diff
-CVE-2008-0928

Modified: trunk/xen-3/debian/patches/version.patch
==============================================================================
--- trunk/xen-3/debian/patches/version.patch	(original)
+++ trunk/xen-3/debian/patches/version.patch	Mon May 12 11:37:38 2008
@@ -7,8 +7,8 @@
 @DPATCH@
 --- xen-3.orig/xen/Makefile
 +++ xen-3/xen/Makefile
-@@ -92,16 +92,16 @@
- include/xen/compile.h: include/xen/compile.h.in
+@@ -92,17 +92,16 @@
+ include/xen/compile.h: include/xen/compile.h.in .banner
  	@sed -e 's/@@date@@/$(shell LC_ALL=C date)/g' \
  	    -e 's/@@time@@/$(shell LC_ALL=C date +%T)/g' \
 -	    -e 's/@@whoami@@/$(USER)/g' \
@@ -24,7 +24,8 @@
 +	    -e 's/@@system_maintainer_local@@/$(shell cd ../../../..; dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^@>]*\)@.*>,\1,p')/g' \
 +	    -e 's/@@system_version@@/$(shell cd ../../../..; dpkg-parsechangelog | awk '/^Version:/ {print $$2}')/g' \
  	    < include/xen/compile.h.in > $@.new
--	tools/figlet/figlet -d tools/figlet Xen $(XEN_FULLVERSION) >> $@.new
+-	@grep \" .banner >> $@.new
+-	@grep -v \" .banner
  	@mv -f $@.new $@
  
  include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s