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

Wed Oct 26 13:27:37 UTC 2011

Author: waldi
Date: Wed Oct 26 13:27:37 2011
New Revision: 914

Log:
* debian/changelog: Update to 4.1.2-1.
* debian/patches: Update patches to match 4.1.2, remove merged patches.

Deleted:
   trunk/xen/debian/patches/upstream-23044:d4ca456c0c25
   trunk/xen/debian/patches/upstream-23104:1976adbf2b80
Modified:
   trunk/xen/debian/changelog
   trunk/xen/debian/patches/series
   trunk/xen/debian/patches/tools-blktap2-prefix.diff
   trunk/xen/debian/patches/tools-flask-abiname.diff
   trunk/xen/debian/patches/tools-include-install.diff
   trunk/xen/debian/patches/tools-libfsimage-abiname.diff
   trunk/xen/debian/patches/tools-libfsimage-prefix.diff
   trunk/xen/debian/patches/tools-libxc-abiname.diff
   trunk/xen/debian/patches/tools-libxl-abiname.diff
   trunk/xen/debian/patches/tools-xenmon-install.diff
   trunk/xen/debian/patches/version.patch

Modified: trunk/xen/debian/changelog
==============================================================================

--- trunk/xen/debian/changelog	Wed Oct 26 12:42:49 2011	(r913)
+++ trunk/xen/debian/changelog	Wed Oct 26 13:27:37 2011	(r914)
@@ -1,3 +1,9 @@
+xen (4.1.2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Bastian Blank <waldi at debian.org>  Wed, 26 Oct 2011 15:01:06 +0200
+
 xen (4.1.1-3) unstable; urgency=low
 
   [ Julien Danjou ]

Modified: trunk/xen/debian/patches/series
==============================================================================
--- trunk/xen/debian/patches/series	Wed Oct 26 12:42:49 2011	(r913)
+++ trunk/xen/debian/patches/series	Wed Oct 26 13:27:37 2011	(r914)
@@ -52,5 +52,3 @@
 tools-python-shebang.diff
 
 tools-xenstore-compatibility.diff
-upstream-23044:d4ca456c0c25
-upstream-23104:1976adbf2b80

Modified: trunk/xen/debian/patches/tools-blktap2-prefix.diff
==============================================================================
--- trunk/xen/debian/patches/tools-blktap2-prefix.diff	Wed Oct 26 12:42:49 2011	(r913)
+++ trunk/xen/debian/patches/tools-blktap2-prefix.diff	Wed Oct 26 13:27:37 2011	(r914)
@@ -74,7 +74,7 @@
 --- a/tools/blktap2/control/Makefile
 +++ b/tools/blktap2/control/Makefile
 @@ -1,10 +1,7 @@
- XEN_ROOT := ../../../
+ XEN_ROOT := $(CURDIR)/../../../
  include $(XEN_ROOT)/tools/Rules.mk
  
 -MAJOR              = 1.0

Modified: trunk/xen/debian/patches/tools-flask-abiname.diff
==============================================================================
--- trunk/xen/debian/patches/tools-flask-abiname.diff	Wed Oct 26 12:42:49 2011	(r913)
+++ trunk/xen/debian/patches/tools-flask-abiname.diff	Wed Oct 26 13:27:37 2011	(r914)
@@ -4,7 +4,7 @@
 -MAJOR    = 1.0
 -MINOR    = 0
 -
- XEN_ROOT = ../../..
+ XEN_ROOT = $(CURDIR)/../../..
  include $(XEN_ROOT)/tools/Rules.mk
  
 @@ -21,7 +18,7 @@

Modified: trunk/xen/debian/patches/tools-include-install.diff
==============================================================================
--- trunk/xen/debian/patches/tools-include-install.diff	Wed Oct 26 12:42:49 2011	(r913)
+++ trunk/xen/debian/patches/tools-include-install.diff	Wed Oct 26 13:27:37 2011	(r914)
@@ -4,9 +4,9 @@
  xen/.dir:
  	@rm -rf xen
  	mkdir -p xen/libelf
--	ln -sf ../$(XEN_ROOT)/xen/include/public/COPYING xen
- 	ln -sf $(addprefix ../,$(wildcard $(XEN_ROOT)/xen/include/public/*.h)) xen
- 	ln -sf $(addprefix ../$(XEN_ROOT)/xen/include/public/,arch-ia64 arch-x86 hvm io xsm) xen
+-	ln -sf $(XEN_ROOT)/xen/include/public/COPYING xen
+ 	ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) xen
+ 	ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-ia64 arch-x86 hvm io xsm) xen
  	ln -sf ../xen-sys/$(XEN_OS) xen/sys
 @@ -30,7 +29,6 @@
  	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/io

Modified: trunk/xen/debian/patches/tools-libfsimage-abiname.diff
==============================================================================
--- trunk/xen/debian/patches/tools-libfsimage-abiname.diff	Wed Oct 26 12:42:49 2011	(r913)
+++ trunk/xen/debian/patches/tools-libfsimage-abiname.diff	Wed Oct 26 13:27:37 2011	(r914)
@@ -1,7 +1,7 @@
 --- a/tools/libfsimage/common/Makefile
 +++ b/tools/libfsimage/common/Makefile
 @@ -1,9 +1,6 @@
- XEN_ROOT = ../../..
+ XEN_ROOT = $(CURDIR)/../../..
  include $(XEN_ROOT)/tools/Rules.mk
  
 -MAJOR = 1.0

Modified: trunk/xen/debian/patches/tools-libfsimage-prefix.diff
==============================================================================
--- trunk/xen/debian/patches/tools-libfsimage-prefix.diff	Wed Oct 26 12:42:49 2011	(r913)
+++ trunk/xen/debian/patches/tools-libfsimage-prefix.diff	Wed Oct 26 13:27:37 2011	(r914)
@@ -1,6 +1,6 @@
 --- a/tools/libfsimage/Rules.mk
 +++ b/tools/libfsimage/Rules.mk
-@@ -5,12 +5,7 @@
+@@ -6,12 +6,7 @@
  
  PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
  
@@ -17,7 +17,7 @@
 --- a/tools/libfsimage/common/Makefile
 +++ b/tools/libfsimage/common/Makefile
 @@ -1,6 +1,8 @@
- XEN_ROOT = ../../..
+ XEN_ROOT = $(CURDIR)/../../..
  include $(XEN_ROOT)/tools/Rules.mk
  
 +CFLAGS += -DFSDIR="\"$(PRIVATE_LIBDIR)/fs\""

Modified: trunk/xen/debian/patches/tools-libxc-abiname.diff
==============================================================================
--- trunk/xen/debian/patches/tools-libxc-abiname.diff	Wed Oct 26 12:42:49 2011	(r913)
+++ trunk/xen/debian/patches/tools-libxc-abiname.diff	Wed Oct 26 13:27:37 2011	(r914)
@@ -1,7 +1,7 @@
 --- a/tools/libxc/Makefile
 +++ b/tools/libxc/Makefile
 @@ -1,9 +1,6 @@
- XEN_ROOT = ../..
+ XEN_ROOT = $(CURDIR)/../..
  include $(XEN_ROOT)/tools/Rules.mk
  
 -MAJOR    = 4.0

Modified: trunk/xen/debian/patches/tools-libxl-abiname.diff
==============================================================================
--- trunk/xen/debian/patches/tools-libxl-abiname.diff	Wed Oct 26 12:42:49 2011	(r913)
+++ trunk/xen/debian/patches/tools-libxl-abiname.diff	Wed Oct 26 13:27:37 2011	(r914)
@@ -1,7 +1,7 @@
 --- a/tools/libxl/Makefile
 +++ b/tools/libxl/Makefile
 @@ -5,12 +5,6 @@
- XEN_ROOT = ../..
+ XEN_ROOT = $(CURDIR)/../..
  include $(XEN_ROOT)/tools/Rules.mk
  
 -MAJOR = 1.0

Modified: trunk/xen/debian/patches/tools-xenmon-install.diff
==============================================================================
--- trunk/xen/debian/patches/tools-xenmon-install.diff	Wed Oct 26 12:42:49 2011	(r913)
+++ trunk/xen/debian/patches/tools-xenmon-install.diff	Wed Oct 26 13:27:37 2011	(r914)
@@ -1,7 +1,7 @@
 --- a/tools/xenmon/Makefile
 +++ b/tools/xenmon/Makefile
 @@ -13,6 +13,10 @@
- XEN_ROOT=../..
+ XEN_ROOT=$(CURDIR)/../..
  include $(XEN_ROOT)/tools/Rules.mk
  
 +DEFAULT_PYTHON_PATH := $(shell $(XEN_ROOT)/tools/python/get-path)

Modified: trunk/xen/debian/patches/version.patch
==============================================================================
--- trunk/xen/debian/patches/version.patch	Wed Oct 26 12:42:49 2011	(r913)
+++ trunk/xen/debian/patches/version.patch	Wed Oct 26 13:27:37 2011	(r914)
@@ -7,7 +7,7 @@
 @DPATCH@
 --- a/xen/Makefile
 +++ b/xen/Makefile
-@@ -85,17 +85,16 @@
+@@ -86,17 +86,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' \
@@ -85,7 +85,7 @@
 -}
 --- a/xen/drivers/char/console.c
 +++ b/xen/drivers/char/console.c
-@@ -573,14 +573,11 @@
+@@ -574,14 +574,11 @@
      serial_set_rx_handler(sercon_handle, serial_rx);
  
      /* HELLO WORLD --- start-of-day banner text. */

