Bastian Blank
2006-Sep-04 06:38 UTC
[Pkg-xen-changes] r289 - in trunk/xen-unstable/debian: . patches
Author: waldi
Date: Sat Sep 2 16:25:25 2006
New Revision: 289
Modified:
trunk/xen-unstable/debian/changelog
trunk/xen-unstable/debian/patches/prefix-python.dpatch
trunk/xen-unstable/debian/patches/prefix-utils.dpatch
Log:
* debian/changelog: Set version to 3.0-unstable+hg11292-1.
* debian/patches/prefix-utils.dpatch, debian/patches/prefix-python.dpatch:
Update.
Modified: trunk/xen-unstable/debian/changelog
=============================================================================---
trunk/xen-unstable/debian/changelog (original)
+++ trunk/xen-unstable/debian/changelog Sat Sep 2 16:25:25 2006
@@ -1,3 +1,9 @@
+xen-unstable (3.0-unstable+hg11292-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot. This release should provide a stable dom0 abi.
+
+ -- Bastian Blank <waldi@debian.org> Wed, 30 Aug 2006 16:37:29 +0000
+
xen-unstable (3.0-unstable+hg11218-1) unstable; urgency=low
* Initial release.
Modified: trunk/xen-unstable/debian/patches/prefix-python.dpatch
=============================================================================---
trunk/xen-unstable/debian/patches/prefix-python.dpatch (original)
+++ trunk/xen-unstable/debian/patches/prefix-python.dpatch Sat Sep 2 16:25:25
2006
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad xen-unstable~/tools/misc/xend xen-unstable/tools/misc/xend
---- xen-unstable~/tools/misc/xend 2006-08-22 09:56:46.000000000 +0000
-+++ xen-unstable/tools/misc/xend 2006-08-22 12:18:23.600149518 +0000
+--- xen-unstable~/tools/misc/xend 2006-08-30 16:36:49.000000000 +0000
++++ xen-unstable/tools/misc/xend 2006-08-30 16:51:51.945564148 +0000
@@ -35,16 +35,7 @@
AUXBIN = ''xen/util/auxbin.py''
@@ -33,7 +33,7 @@
- cmd = "xenstored --pid-file /var/run/xenstore.pid"
+ cmd = sys.path[0] + "/xenstored --pid-file
/var/run/xenstore.pid"
if XENSTORED_TRACE:
- cmd += " -T /var/log/xenstored-trace.log"
+ cmd += " -T /var/log/xen/xenstored-trace.log"
s,o = commands.getstatusoutput(cmd)
def start_consoled():
@@ -49,8 +49,8 @@
def main():
try:
diff -urNad xen-unstable~/tools/misc/xm xen-unstable/tools/misc/xm
---- xen-unstable~/tools/misc/xm 2006-08-22 09:56:46.000000000 +0000
-+++ xen-unstable/tools/misc/xm 2006-08-22 12:18:23.600149518 +0000
+--- xen-unstable~/tools/misc/xm 2006-08-30 16:36:49.000000000 +0000
++++ xen-unstable/tools/misc/xm 2006-08-30 16:51:16.445200251 +0000
@@ -1,10 +1,7 @@
#!/usr/bin/env python
# -*- mode: python; -*-
@@ -64,8 +64,8 @@
main.main(sys.argv)
diff -urNad xen-unstable~/tools/python/xen/util/auxbin.py
xen-unstable/tools/python/xen/util/auxbin.py
---- xen-unstable~/tools/python/xen/util/auxbin.py 2006-08-22 09:56:45.000000000
+0000
-+++ xen-unstable/tools/python/xen/util/auxbin.py 2006-08-22 12:18:23.600149518
+0000
+--- xen-unstable~/tools/python/xen/util/auxbin.py 2006-08-30 16:36:48.000000000
+0000
++++ xen-unstable/tools/python/xen/util/auxbin.py 2006-08-30 16:51:16.445200251
+0000
@@ -16,17 +16,9 @@
#===========================================================================
@@ -101,8 +101,8 @@
- return LIB_32
+ return os.path.join(path(), ''../lib'')
diff -urNad xen-unstable~/tools/python/xen/xm/console.py
xen-unstable/tools/python/xen/xm/console.py
---- xen-unstable~/tools/python/xen/xm/console.py 2006-08-22 09:56:45.000000000
+0000
-+++ xen-unstable/tools/python/xen/xm/console.py 2006-08-22 12:19:12.039201599
+0000
+--- xen-unstable~/tools/python/xen/xm/console.py 2006-08-30 16:36:48.000000000
+0000
++++ xen-unstable/tools/python/xen/xm/console.py 2006-08-30 16:51:16.445200251
+0000
@@ -23,4 +23,4 @@
Modified: trunk/xen-unstable/debian/patches/prefix-utils.dpatch
=============================================================================---
trunk/xen-unstable/debian/patches/prefix-utils.dpatch (original)
+++ trunk/xen-unstable/debian/patches/prefix-utils.dpatch Sat Sep 2 16:25:25
2006
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad xen-unstable~/Config.mk xen-unstable/Config.mk
---- xen-unstable~/Config.mk 2006-08-22 09:56:42.000000000 +0000
-+++ xen-unstable/Config.mk 2006-08-23 21:01:36.111549753 +0000
+--- xen-unstable~/Config.mk 2006-08-30 16:36:46.000000000 +0000
++++ xen-unstable/Config.mk 2006-08-30 16:50:09.143442947 +0000
@@ -43,6 +43,10 @@
include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
@@ -21,8 +21,8 @@
EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
diff -urNad xen-unstable~/config/ia64.mk xen-unstable/config/ia64.mk
---- xen-unstable~/config/ia64.mk 2006-08-22 09:56:42.000000000 +0000
-+++ xen-unstable/config/ia64.mk 2006-08-23 21:01:36.111549753 +0000
+--- xen-unstable~/config/ia64.mk 2006-08-30 16:36:46.000000000 +0000
++++ xen-unstable/config/ia64.mk 2006-08-30 16:50:09.143442947 +0000
@@ -1,5 +1,3 @@
CONFIG_IA64 := y
CONFIG_IOEMU := y
@@ -30,32 +30,32 @@
-
-LIBDIR := lib
diff -urNad xen-unstable~/config/powerpc64.mk xen-unstable/config/powerpc64.mk
---- xen-unstable~/config/powerpc64.mk 2006-08-22 09:56:42.000000000 +0000
-+++ xen-unstable/config/powerpc64.mk 2006-08-23 21:01:36.111549753 +0000
+--- xen-unstable~/config/powerpc64.mk 2006-08-30 16:36:46.000000000 +0000
++++ xen-unstable/config/powerpc64.mk 2006-08-30 16:50:09.143442947 +0000
@@ -1,4 +1,3 @@
CONFIG_POWERPC := y
CFLAGS += -DELFSIZE=64
-LIBDIR := lib
diff -urNad xen-unstable~/config/x86_32.mk xen-unstable/config/x86_32.mk
---- xen-unstable~/config/x86_32.mk 2006-08-22 09:56:42.000000000 +0000
-+++ xen-unstable/config/x86_32.mk 2006-08-23 21:01:36.111549753 +0000
+--- xen-unstable~/config/x86_32.mk 2006-08-30 16:36:46.000000000 +0000
++++ xen-unstable/config/x86_32.mk 2006-08-30 16:50:09.143442947 +0000
@@ -6,4 +6,3 @@
CONFIG_MBOOTPACK := y
CFLAGS += -m32 -march=i686
-LIBDIR := lib
diff -urNad xen-unstable~/config/x86_64.mk xen-unstable/config/x86_64.mk
---- xen-unstable~/config/x86_64.mk 2006-08-22 09:56:42.000000000 +0000
-+++ xen-unstable/config/x86_64.mk 2006-08-23 21:01:36.111549753 +0000
+--- xen-unstable~/config/x86_64.mk 2006-08-30 16:36:46.000000000 +0000
++++ xen-unstable/config/x86_64.mk 2006-08-30 16:50:09.143442947 +0000
@@ -6,4 +6,3 @@
CONFIG_MBOOTPACK := y
CFLAGS += -m64
-LIBDIR = lib64
diff -urNad xen-unstable~/tools/Rules.mk xen-unstable/tools/Rules.mk
---- xen-unstable~/tools/Rules.mk 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/Rules.mk 2006-08-23 21:01:36.111549753 +0000
+--- xen-unstable~/tools/Rules.mk 2006-08-30 16:36:48.000000000 +0000
++++ xen-unstable/tools/Rules.mk 2006-08-30 16:50:09.143442947 +0000
@@ -12,6 +12,9 @@
XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore
XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src
@@ -67,8 +67,8 @@
CFLAGS += -D__XEN_TOOLS__
diff -urNad xen-unstable~/tools/blktap/drivers/Makefile
xen-unstable/tools/blktap/drivers/Makefile
---- xen-unstable~/tools/blktap/drivers/Makefile 2006-08-22 09:56:47.000000000
+0000
-+++ xen-unstable/tools/blktap/drivers/Makefile 2006-08-23 21:01:36.111549753
+0000
+--- xen-unstable~/tools/blktap/drivers/Makefile 2006-08-30 16:36:51.000000000
+0000
++++ xen-unstable/tools/blktap/drivers/Makefile 2006-08-30 16:50:09.143442947
+0000
@@ -7,7 +7,7 @@
INSTALL_PROG = $(INSTALL) -m0755
IBIN = blktapctrl tapdisk
@@ -93,8 +93,8 @@
.PHONY: qcow-util
qcow-util: img2qcow qcow2raw qcow-create
diff -urNad xen-unstable~/tools/console/Makefile
xen-unstable/tools/console/Makefile
---- xen-unstable~/tools/console/Makefile 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/console/Makefile 2006-08-23 21:01:36.111549753 +0000
+--- xen-unstable~/tools/console/Makefile 2006-08-30 16:36:48.000000000 +0000
++++ xen-unstable/tools/console/Makefile 2006-08-30 16:50:09.143442947 +0000
@@ -2,8 +2,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -128,8 +128,8 @@
+ $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DIR)
+ $(INSTALL_PROG) xenconsole $(DESTDIR)/$(DIR)
diff -urNad xen-unstable~/tools/misc/Makefile xen-unstable/tools/misc/Makefile
---- xen-unstable~/tools/misc/Makefile 2006-08-22 09:56:46.000000000 +0000
-+++ xen-unstable/tools/misc/Makefile 2006-08-23 21:01:36.111549753 +0000
+--- xen-unstable~/tools/misc/Makefile 2006-08-30 16:36:49.000000000 +0000
++++ xen-unstable/tools/misc/Makefile 2006-08-30 16:50:56.278263688 +0000
@@ -16,7 +16,7 @@
TARGETS = xenperf xc_shadow
@@ -139,7 +139,7 @@
.PHONY: all
all: build
-@@ -32,10 +32,8 @@
+@@ -31,10 +31,7 @@
.PHONY: install
install: build
@@ -147,40 +147,19 @@
- [ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin
- $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin
- $(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin
-+ $(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR)
+ $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/$(BINDIR)
- $(MAKE) -C cpuperf install
$(MAKE) -C lomount install
# No sense in installing miniterm on the Xen box.
-@@ -55,4 +53,4 @@
+ # $(MAKE) -C miniterm install
+@@ -52,4 +49,4 @@
$(CC) -c $(CFLAGS) -o $@ $<
$(TARGETS): %: %.o Makefile
- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
-diff -urNad xen-unstable~/tools/misc/cpuperf/Makefile
xen-unstable/tools/misc/cpuperf/Makefile
---- xen-unstable~/tools/misc/cpuperf/Makefile 2006-08-22 09:56:46.000000000
+0000
-+++ xen-unstable/tools/misc/cpuperf/Makefile 2006-08-23 21:01:36.111549753
+0000
-@@ -37,14 +37,14 @@
- $(CC) $(CFLAGS) -o $@ $<
-
- cpuperf-xen: cpuperf.c $(HDRS) Makefile
-- $(CC) $(CFLAGS) -I $(XEN_LIBXC) -L$(XEN_LIBXC) -lxenctrl -DXENO -o $@ $<
-+ $(CC) $(CFLAGS) -I $(XEN_LIBXC) $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl -DXENO -o
$@ $<
-
- cpuperf-perfcntr: cpuperf.c $(HDRS) Makefile
- $(CC) $(CFLAGS) -DPERFCNTR -o $@ $<
-
- .PHONY: install
- install: all
-- $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin
-+ $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/$(BINDIR)
-
-
- # End of $RCSfile: Makefile,v $
diff -urNad xen-unstable~/tools/misc/lomount/Makefile
xen-unstable/tools/misc/lomount/Makefile
---- xen-unstable~/tools/misc/lomount/Makefile 2006-08-22 09:56:46.000000000
+0000
-+++ xen-unstable/tools/misc/lomount/Makefile 2006-08-23 21:01:36.111549753
+0000
+--- xen-unstable~/tools/misc/lomount/Makefile 2006-08-30 16:36:49.000000000
+0000
++++ xen-unstable/tools/misc/lomount/Makefile 2006-08-30 16:50:09.143442947
+0000
@@ -21,7 +21,7 @@
.PHONY: install
@@ -191,8 +170,8 @@
.PHONY: clean
clean:
diff -urNad xen-unstable~/tools/pygrub/Makefile
xen-unstable/tools/pygrub/Makefile
---- xen-unstable~/tools/pygrub/Makefile 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/pygrub/Makefile 2006-08-23 21:02:57.694825780 +0000
+--- xen-unstable~/tools/pygrub/Makefile 2006-08-30 16:36:48.000000000 +0000
++++ xen-unstable/tools/pygrub/Makefile 2006-08-30 16:50:09.143442947 +0000
@@ -11,7 +11,7 @@
.PHONY: install
ifndef XEN_PYTHON_NATIVE_INSTALL
@@ -203,8 +182,8 @@
install: all
CFLAGS="$(CFLAGS)" python setup.py install
--root="$(DESTDIR)"
diff -urNad xen-unstable~/tools/python/Makefile
xen-unstable/tools/python/Makefile
---- xen-unstable~/tools/python/Makefile 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/python/Makefile 2006-08-23 21:01:36.111549753 +0000
+--- xen-unstable~/tools/python/Makefile 2006-08-30 16:36:48.000000000 +0000
++++ xen-unstable/tools/python/Makefile 2006-08-30 16:50:09.143442947 +0000
@@ -6,15 +6,15 @@
.PHONY: build
@@ -225,8 +204,8 @@
.PHONY: test
diff -urNad xen-unstable~/tools/python/setup.py
xen-unstable/tools/python/setup.py
---- xen-unstable~/tools/python/setup.py 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/python/setup.py 2006-08-23 21:01:36.111549753 +0000
+--- xen-unstable~/tools/python/setup.py 2006-08-30 16:36:48.000000000 +0000
++++ xen-unstable/tools/python/setup.py 2006-08-30 16:50:09.143442947 +0000
@@ -5,6 +5,8 @@
XEN_ROOT = "../.."
@@ -261,8 +240,8 @@
library_dirs = library_dirs,
libraries = libraries,
diff -urNad xen-unstable~/tools/xcutils/Makefile
xen-unstable/tools/xcutils/Makefile
---- xen-unstable~/tools/xcutils/Makefile 2006-08-22 09:56:47.000000000 +0000
-+++ xen-unstable/tools/xcutils/Makefile 2006-08-23 21:01:36.111549753 +0000
+--- xen-unstable~/tools/xcutils/Makefile 2006-08-30 16:36:51.000000000 +0000
++++ xen-unstable/tools/xcutils/Makefile 2006-08-30 16:50:09.143442947 +0000
@@ -15,7 +15,7 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -273,8 +252,8 @@
INCLUDES += -I $(XEN_LIBXC)
diff -urNad xen-unstable~/tools/xenmon/Makefile
xen-unstable/tools/xenmon/Makefile
---- xen-unstable~/tools/xenmon/Makefile 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/xenmon/Makefile 2006-08-23 21:01:36.111549753 +0000
+--- xen-unstable~/tools/xenmon/Makefile 2006-08-30 16:36:48.000000000 +0000
++++ xen-unstable/tools/xenmon/Makefile 2006-08-30 16:50:09.143442947 +0000
@@ -15,8 +15,6 @@
INSTALL_DIR = $(INSTALL) -d -m0755
INSTALL_DATA = $(INSTALL) -m0644
@@ -300,8 +279,8 @@
.PHONY: clean
clean:
diff -urNad xen-unstable~/tools/xenstat/xentop/Makefile
xen-unstable/tools/xenstat/xentop/Makefile
---- xen-unstable~/tools/xenstat/xentop/Makefile 2006-08-22 09:56:47.000000000
+0000
-+++ xen-unstable/tools/xenstat/xentop/Makefile 2006-08-23 21:01:36.111549753
+0000
+--- xen-unstable~/tools/xenstat/xentop/Makefile 2006-08-30 16:36:51.000000000
+0000
++++ xen-unstable/tools/xenstat/xentop/Makefile 2006-08-30 16:50:09.143442947
+0000
@@ -25,7 +25,6 @@
prefix=/usr
mandir=$(prefix)/share/man
@@ -320,8 +299,8 @@
endif
diff -urNad xen-unstable~/tools/xenstore/Makefile
xen-unstable/tools/xenstore/Makefile
---- xen-unstable~/tools/xenstore/Makefile 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/xenstore/Makefile 2006-08-23 21:01:36.111549753 +0000
+--- xen-unstable~/tools/xenstore/Makefile 2006-08-30 16:36:48.000000000 +0000
++++ xen-unstable/tools/xenstore/Makefile 2006-08-30 16:50:09.143442947 +0000
@@ -174,13 +174,12 @@
install: all
$(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored
@@ -342,8 +321,8 @@
$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
ln -sf libxenstore.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
diff -urNad xen-unstable~/tools/xentrace/Makefile
xen-unstable/tools/xentrace/Makefile
---- xen-unstable~/tools/xentrace/Makefile 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/xentrace/Makefile 2006-08-23 21:01:36.111549753 +0000
+--- xen-unstable~/tools/xentrace/Makefile 2006-08-30 16:36:48.000000000 +0000
++++ xen-unstable/tools/xentrace/Makefile 2006-08-30 16:50:09.143442947 +0000
@@ -15,21 +15,20 @@
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))