Bastian Blank
2006-Sep-21 20:01 UTC
[Pkg-xen-changes] r321 - in trunk/xen-unstable/debian: . patches
Author: waldi
Date: Thu Sep 21 20:01:16 2006
New Revision: 321
Modified:
trunk/xen-unstable/debian/changelog
trunk/xen-unstable/debian/patches/prefix-utils.dpatch
Log:
* debian/changelog: Set version to 3.0-unstable+hg11561-1.
* debian/patches/prefix-utils.dpatch: Update.
Modified: trunk/xen-unstable/debian/changelog
=============================================================================---
trunk/xen-unstable/debian/changelog (original)
+++ trunk/xen-unstable/debian/changelog Thu Sep 21 20:01:16 2006
@@ -1,8 +1,8 @@
-xen-unstable (3.0-unstable+hg11470-1) UNRELEASED; urgency=low
+xen-unstable (3.0-unstable+hg11561-1) UNRELEASED; urgency=low
* New upstream snapshot.
- -- Bastian Blank <waldi@debian.org> Sun, 17 Sep 2006 15:02:45 +0000
+ -- Bastian Blank <waldi@debian.org> Thu, 21 Sep 2006 19:45:15 +0000
xen-unstable (3.0-unstable+hg11292-2) unstable; urgency=low
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 Thu Sep 21 20:01:16
2006
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad xen-unstable~/Config.mk xen-unstable/Config.mk
---- xen-unstable~/Config.mk 2006-08-30 16:36:46.000000000 +0000
-+++ xen-unstable/Config.mk 2006-08-30 16:50:09.143442947 +0000
+--- xen-unstable~/Config.mk 2006-09-21 19:44:53.000000000 +0000
++++ xen-unstable/Config.mk 2006-09-21 19:45:52.250012573 +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-30 16:36:46.000000000 +0000
-+++ xen-unstable/config/ia64.mk 2006-08-30 16:50:09.143442947 +0000
+--- xen-unstable~/config/ia64.mk 2006-09-21 19:44:53.000000000 +0000
++++ xen-unstable/config/ia64.mk 2006-09-21 19:45:52.250012573 +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-30 16:36:46.000000000 +0000
-+++ xen-unstable/config/powerpc64.mk 2006-08-30 16:50:09.143442947 +0000
+--- xen-unstable~/config/powerpc64.mk 2006-09-21 19:44:53.000000000 +0000
++++ xen-unstable/config/powerpc64.mk 2006-09-21 19:45:52.250012573 +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-30 16:36:46.000000000 +0000
-+++ xen-unstable/config/x86_32.mk 2006-08-30 16:50:09.143442947 +0000
+--- xen-unstable~/config/x86_32.mk 2006-09-21 19:44:53.000000000 +0000
++++ xen-unstable/config/x86_32.mk 2006-09-21 19:45:52.250012573 +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-30 16:36:46.000000000 +0000
-+++ xen-unstable/config/x86_64.mk 2006-08-30 16:50:09.143442947 +0000
+--- xen-unstable~/config/x86_64.mk 2006-09-21 19:44:53.000000000 +0000
++++ xen-unstable/config/x86_64.mk 2006-09-21 19:45:52.250012573 +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-30 16:36:48.000000000 +0000
-+++ xen-unstable/tools/Rules.mk 2006-08-30 16:50:09.143442947 +0000
+--- xen-unstable~/tools/Rules.mk 2006-09-21 19:44:56.000000000 +0000
++++ xen-unstable/tools/Rules.mk 2006-09-21 19:45:52.250012573 +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-30 16:36:51.000000000
+0000
-+++ xen-unstable/tools/blktap/drivers/Makefile 2006-08-30 16:50:09.143442947
+0000
+--- xen-unstable~/tools/blktap/drivers/Makefile 2006-09-21 19:44:58.000000000
+0000
++++ xen-unstable/tools/blktap/drivers/Makefile 2006-09-21 19:45:52.250012573
+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-30 16:36:48.000000000 +0000
-+++ xen-unstable/tools/console/Makefile 2006-08-30 16:50:09.143442947 +0000
+--- xen-unstable~/tools/console/Makefile 2006-09-21 19:44:55.000000000 +0000
++++ xen-unstable/tools/console/Makefile 2006-09-21 19:45:52.250012573 +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-30 16:36:49.000000000 +0000
-+++ xen-unstable/tools/misc/Makefile 2006-08-30 16:50:56.278263688 +0000
+--- xen-unstable~/tools/misc/Makefile 2006-09-21 19:44:57.000000000 +0000
++++ xen-unstable/tools/misc/Makefile 2006-09-21 19:45:52.250012573 +0000
@@ -16,7 +16,7 @@
TARGETS = xenperf xc_shadow
@@ -158,8 +158,8 @@
- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
diff -urNad xen-unstable~/tools/misc/lomount/Makefile
xen-unstable/tools/misc/lomount/Makefile
---- 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
+--- xen-unstable~/tools/misc/lomount/Makefile 2006-09-21 19:44:57.000000000
+0000
++++ xen-unstable/tools/misc/lomount/Makefile 2006-09-21 19:45:52.250012573
+0000
@@ -21,7 +21,7 @@
.PHONY: install
@@ -170,20 +170,20 @@
.PHONY: clean
clean:
diff -urNad xen-unstable~/tools/pygrub/Makefile
xen-unstable/tools/pygrub/Makefile
---- 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
+--- xen-unstable~/tools/pygrub/Makefile 2006-09-21 19:44:56.000000000 +0000
++++ xen-unstable/tools/pygrub/Makefile 2006-09-21 19:46:38.536905323 +0000
@@ -11,7 +11,7 @@
.PHONY: install
ifndef XEN_PYTHON_NATIVE_INSTALL
install: all
- CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)/usr" --prefix=""
+ CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)/usr/$(LIBDIR)"
--install-lib=$(DESTDIR)/usr/$(LIBDIR)/python
--install-scripts=$(DESTDIR)/usr/$(BINDIR)
+ $(INSTALL_DIR) -p $(DESTDIR)/var/lib/xen
else
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-30 16:36:48.000000000 +0000
-+++ xen-unstable/tools/python/Makefile 2006-08-30 16:50:09.143442947 +0000
+--- xen-unstable~/tools/python/Makefile 2006-09-21 19:44:56.000000000 +0000
++++ xen-unstable/tools/python/Makefile 2006-09-21 19:45:52.250012573 +0000
@@ -6,15 +6,15 @@
.PHONY: build
@@ -204,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-30 16:36:48.000000000 +0000
-+++ xen-unstable/tools/python/setup.py 2006-08-30 16:50:09.143442947 +0000
+--- xen-unstable~/tools/python/setup.py 2006-09-21 19:44:56.000000000 +0000
++++ xen-unstable/tools/python/setup.py 2006-09-21 19:45:52.250012573 +0000
@@ -5,6 +5,8 @@
XEN_ROOT = "../.."
@@ -240,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-30 16:36:51.000000000 +0000
-+++ xen-unstable/tools/xcutils/Makefile 2006-08-30 16:50:09.143442947 +0000
+--- xen-unstable~/tools/xcutils/Makefile 2006-09-21 19:44:58.000000000 +0000
++++ xen-unstable/tools/xcutils/Makefile 2006-09-21 19:45:52.250012573 +0000
@@ -15,7 +15,7 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -252,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-30 16:36:48.000000000 +0000
-+++ xen-unstable/tools/xenmon/Makefile 2006-08-30 16:50:09.143442947 +0000
+--- xen-unstable~/tools/xenmon/Makefile 2006-09-21 19:44:56.000000000 +0000
++++ xen-unstable/tools/xenmon/Makefile 2006-09-21 19:45:52.250012573 +0000
@@ -15,8 +15,6 @@
INSTALL_DIR = $(INSTALL) -d -m0755
INSTALL_DATA = $(INSTALL) -m0644
@@ -279,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-30 16:36:51.000000000
+0000
-+++ xen-unstable/tools/xenstat/xentop/Makefile 2006-08-30 16:50:09.143442947
+0000
+--- xen-unstable~/tools/xenstat/xentop/Makefile 2006-09-21 19:44:59.000000000
+0000
++++ xen-unstable/tools/xenstat/xentop/Makefile 2006-09-21 19:45:52.250012573
+0000
@@ -25,7 +25,6 @@
prefix=/usr
mandir=$(prefix)/share/man
@@ -299,8 +299,8 @@
endif
diff -urNad xen-unstable~/tools/xenstore/Makefile
xen-unstable/tools/xenstore/Makefile
---- 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
+--- xen-unstable~/tools/xenstore/Makefile 2006-09-21 19:44:56.000000000 +0000
++++ xen-unstable/tools/xenstore/Makefile 2006-09-21 19:45:52.250012573 +0000
@@ -174,13 +174,12 @@
install: all
$(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored
@@ -321,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-30 16:36:48.000000000 +0000
-+++ xen-unstable/tools/xentrace/Makefile 2006-08-30 16:50:09.143442947 +0000
+--- xen-unstable~/tools/xentrace/Makefile 2006-09-21 19:44:56.000000000 +0000
++++ xen-unstable/tools/xentrace/Makefile 2006-09-21 19:45:52.250012573 +0000
@@ -15,21 +15,20 @@
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))