Index: debian/patches/tools-rpath.diff
===================================================================
--- debian/patches/tools-rpath.diff	(revision 499)
+++ debian/patches/tools-rpath.diff	(working copy)
@@ -1,5 +1,7 @@
---- xen-unstable.orig/tools/Rules.mk
-+++ xen-unstable/tools/Rules.mk
+Index: xen-unstable.hg/tools/Rules.mk
+===================================================================
+--- xen-unstable.hg.orig/tools/Rules.mk	2008-01-25 16:48:20.000000000 +0000
++++ xen-unstable.hg/tools/Rules.mk	2008-01-25 16:54:37.000000000 +0000
 @@ -10,6 +10,9 @@
  XEN_XENSTORE       = $(XEN_ROOT)/tools/xenstore
  XEN_LIBXENSTAT     = $(XEN_ROOT)/tools/xenstat/libxenstat/src
@@ -10,8 +12,10 @@
  X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
  
  CFLAGS += -D__XEN_TOOLS__
---- xen-unstable.orig/tools/python/setup.py
-+++ xen-unstable/tools/python/setup.py
+Index: xen-unstable.hg/tools/python/setup.py
+===================================================================
+--- xen-unstable.hg.orig/tools/python/setup.py	2008-01-25 16:48:21.000000000 +0000
++++ xen-unstable.hg/tools/python/setup.py	2008-01-25 16:54:37.000000000 +0000
 @@ -5,6 +5,7 @@
  XEN_ROOT = "../.."
  
@@ -68,36 +72,3 @@
                 include_dirs       = include_dirs + [ "ptsname" ],
                 library_dirs       = library_dirs,
                 libraries          = libraries,
---- xen-unstable.orig/tools/xentrace/Makefile
-+++ xen-unstable/tools/xentrace/Makefile
-@@ -52,6 +52,6 @@
- 	$(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)
- 
- %: %.c $(HDRS) Makefile
--	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
-+	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl
- xentrace_%: %.c $(HDRS) Makefile
--	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
-+	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl
---- xen-unstable.orig/tools/blktap/drivers/Makefile
-+++ xen-unstable/tools/blktap/drivers/Makefile
-@@ -49,7 +49,7 @@
- qcow-util: img2qcow qcow2raw qcow-create
- 
- img2qcow qcow2raw qcow-create: %: $(BLK-OBJS)
--	$(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(AIOLIBS) $(LIBS)
-+	$(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(LDFLAGS) $(AIOLIBS) $(LIBS)
- 
- install: all
- 	$(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(INST_DIR)
---- xen-unstable.orig/tools/blktap/lib/Makefile
-+++ xen-unstable/tools/blktap/lib/Makefile
-@@ -52,7 +52,7 @@
- 
- libblktap.a: $(OBJS) 
- 	$(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
--	      -L$(XEN_XENSTORE) -l xenstore                                \
-+	      -L$(XEN_XENSTORE) $(LDFLAGS) -l xenstore                                \
- 	      -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
- 	ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
- 	ln -sf libblktap.so.$(MAJOR) libblktap.so
Index: debian/patches/series
===================================================================
--- debian/patches/series	(revision 499)
+++ debian/patches/series	(working copy)
@@ -3,7 +3,6 @@
 tools-prefix.diff
 tools-misc-prefix.diff
 tools-python-prefix.diff
-tools-ldflags.diff
 version.patch
 tools-lib-abiname.diff
 tools-python-xen-xm-relative-path.diff
@@ -11,6 +10,5 @@
 tools-ioemu-config.diff
 tools-pygrub-prefix.diff
 tools-libfsimage-prefix.diff
-disable-features.diff
 tools-misc-xend-race.diff
 doc-remove-unused.diff
Index: debian/patches/tools-ioemu-arch.diff
===================================================================
--- debian/patches/tools-ioemu-arch.diff	(revision 499)
+++ debian/patches/tools-ioemu-arch.diff	(working copy)
@@ -1,66 +1,13 @@
---- xen-3.orig/tools/ioemu/configure
-+++ xen-3/tools/ioemu/configure
-@@ -27,46 +27,18 @@
- make="make"
- install="install"
- strip="strip"
--cpu=`uname -m`
- target_list=""
--case "$cpu" in
--  i386|i486|i586|i686|i86pc|BePC)
-+case "$XEN_TARGET_ARCH" in
-+  x86_32)
-     cpu="i386"
+Index: xen-unstable.hg/tools/ioemu/configure
+===================================================================
+--- xen-unstable.hg.orig/tools/ioemu/configure	2008-01-25 16:55:58.000000000 +0000
++++ xen-unstable.hg/tools/ioemu/configure	2008-01-25 17:07:58.000000000 +0000
+@@ -42,7 +42,7 @@
    ;;
--  armv*b)
--    cpu="armv4b"
--  ;;
--  armv*l)
--    cpu="armv4l"
--  ;;
--  alpha)
--    cpu="alpha"
--  ;;
--  "Power Macintosh"|ppc|ppc64)
--    cpu="powerpc"
--  ;;
--  mips)
--    cpu="mips"
--  ;;
--  s390)
--    cpu="s390"
--  ;;
--  sparc|sun4[muv])
--    cpu="sparc"
--  ;;
--  sparc64)
--    cpu="sparc64"
--  ;;
--  ia64)
--    cpu="ia64"
--  ;;
--  m68k)
--    cpu="m68k"
--  ;;
--  x86_64|amd64)
-+  x86_64)
+   x86_64)
      cpu="x86_64"
-     libdir="lib64"
+-    [ `uname -s` = "Linux" ] && libdir="lib64"
++    libdir="lib64"
    ;;
-+  powerpc)
-+    cpu="powerpc"
-+  ;;
    *)
      cpu="unknown"
-   ;;
---- xen-3.orig/tools/Makefile
-+++ xen-3/tools/Makefile
-@@ -67,7 +67,7 @@
- export IOEMU_DIR ?= ioemu
- ioemu ioemuinstall:
- 	[ -f $(IOEMU_DIR)/config-host.mak ] || \
--	  (cd $(IOEMU_DIR) && sh configure --prefix=/usr)
-+	  (cd $(IOEMU_DIR) && XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) sh configure --prefix=/usr)
- 	$(MAKE) -C $(IOEMU_DIR) $(patsubst ioemu%,%,$@)
- ioemuclean:
- 	$(MAKE) -C $(IOEMU_DIR) distclean
Index: debian/patches/tools-prefix.diff
===================================================================
--- debian/patches/tools-prefix.diff	(revision 499)
+++ debian/patches/tools-prefix.diff	(working copy)
@@ -1,82 +1,7 @@
---- xen-unstable.orig/tools/blktap/drivers/Makefile
-+++ xen-unstable/tools/blktap/drivers/Makefile
-@@ -5,7 +5,7 @@
- 
- IBIN         = blktapctrl tapdisk
- QCOW_UTIL    = img2qcow qcow2raw qcow-create
--INST_DIR     = /usr/sbin
-+INST_DIR     = /usr/$(BINDIR)
- LIBAIO_DIR   = ../../libaio/src
- 
- CFLAGS   += -Werror
-@@ -52,6 +52,7 @@
- 	$(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(AIOLIBS) $(LIBS)
- 
- install: all
-+	$(INSTALL_DIR) $(DESTDIR)$(INST_DIR)
- 	$(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(INST_DIR)
- 
- clean:
---- xen-unstable.orig/tools/console/Makefile
-+++ xen-unstable/tools/console/Makefile
-@@ -2,8 +2,7 @@
- XEN_ROOT=../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--DAEMON_INSTALL_DIR = /usr/sbin
--CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
-+DIR = /usr/$(BINDIR)
- 
- CFLAGS  += -Werror
- 
-@@ -30,7 +29,5 @@
- 
- .PHONY: install
- install: $(BIN)
--	$(INSTALL_DIR) $(DESTDIR)/$(DAEMON_INSTALL_DIR)
--	$(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DAEMON_INSTALL_DIR)
--	$(INSTALL_DIR) $(DESTDIR)/$(CLIENT_INSTALL_DIR)
--	$(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR)
-+	$(INSTALL_DIR) $(DESTDIR)/$(DIR)
-+	$(INSTALL_PROG) xenconsole xenconsoled $(DESTDIR)/$(DIR)
---- xen-unstable.orig/tools/misc/Makefile
-+++ xen-unstable/tools/misc/Makefile
-@@ -13,8 +13,7 @@
- TARGETS-$(CONFIG_X86) += xen-detect
- TARGETS := $(TARGETS-y)
- 
--INSTALL_BIN  = $(TARGETS) xencons
--INSTALL_SBIN = netfix xm xen-bugtool xen-python-path xend xenperf xsview
-+INSTALL_TARGETS = $(TARGETS) xencons netfix xm xend xsview
- 
- .PHONY: all
- all: build
-@@ -26,10 +25,8 @@
- 
- .PHONY: install
- install: build
--	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
--	[ -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_TARGETS) $(DESTDIR)/usr/$(BINDIR)
- 	$(MAKE) -C lomount install
- #       No sense in installing miniterm on the Xen box.
- #	$(MAKE) -C miniterm install
---- xen-unstable.orig/tools/misc/lomount/Makefile
-+++ xen-unstable/tools/misc/lomount/Makefile
-@@ -16,7 +16,7 @@
- 
- .PHONY: install
- install: build
--	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
-+	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/$(BINDIR)
- 
- .PHONY: clean
- clean:
---- xen-unstable.orig/tools/python/Makefile
-+++ xen-unstable/tools/python/Makefile
+Index: xen-unstable.hg/tools/python/Makefile
+===================================================================
+--- xen-unstable.hg.orig/tools/python/Makefile	2008-01-25 17:35:28.000000000 +0000
++++ xen-unstable.hg/tools/python/Makefile	2008-01-25 17:40:35.000000000 +0000
 @@ -24,7 +24,7 @@
  
  .PHONY: build buildpy
@@ -99,103 +24,10 @@
  endif
  
  install-dtd: all
---- xen-unstable.orig/tools/xcutils/Makefile
-+++ xen-unstable/tools/xcutils/Makefile
-@@ -11,7 +11,7 @@
- XEN_ROOT	= ../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
-+PROGRAMS_INSTALL_DIR = /usr/$(BINDIR)
- 
- INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
- 
---- xen-unstable.orig/tools/xenmon/Makefile
-+++ xen-unstable/tools/xenmon/Makefile
-@@ -13,8 +13,6 @@
- XEN_ROOT=../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--sbindir=/usr/sbin
--
- CFLAGS  += -Werror
- CFLAGS  += -I $(XEN_XC)
- CFLAGS  += -I $(XEN_LIBXC)
-@@ -31,10 +29,8 @@
- 
- .PHONY: install
- install: build
--	[ -d $(DESTDIR)$(sbindir) ] || $(INSTALL_DIR) $(DESTDIR)$(sbindir)
--	$(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked
--	$(INSTALL_PROG) xentrace_setmask  $(DESTDIR)$(sbindir)/xentrace_setmask
--	$(INSTALL_PROG) xenmon.py  $(DESTDIR)$(sbindir)/xenmon.py
-+	$(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR)
-+	$(INSTALL_PROG) xenbaked xenmon.py xentrace_setmask $(DESTDIR)/usr/$(BINDIR)
- 
- .PHONY: clean
- clean:
---- xen-unstable.orig/tools/xenstat/xentop/Makefile
-+++ xen-unstable/tools/xenstat/xentop/Makefile
-@@ -21,7 +21,6 @@
- prefix=/usr
- mandir=$(prefix)/share/man
- man1dir=$(mandir)/man1
--sbindir=$(prefix)/sbin
- 
- CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
- LDFLAGS += -L$(XEN_LIBXENSTAT)
-@@ -33,7 +32,7 @@
- 
- .PHONY: install
- install: xentop xentop.1
--	$(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop
-+	$(INSTALL_PROG) -D xentop $(DESTDIR)/usr/$(BINDIR)/xentop
- 	$(INSTALL_DIR) $(DESTDIR)$(man1dir)
- 	$(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1
- 
---- xen-unstable.orig/tools/xenstore/Makefile
-+++ xen-unstable/tools/xenstore/Makefile
-@@ -81,13 +81,9 @@
- install: all
- 	$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
- 	$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
--	$(INSTALL_DIR) $(DESTDIR)/usr/bin
--	$(INSTALL_DIR) $(DESTDIR)/usr/sbin
-+	$(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR)
- 	$(INSTALL_DIR) $(DESTDIR)/usr/include
--	$(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
--	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
--	$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
--	$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
-+	$(INSTALL_PROG) xenstore-control xenstore-ls xenstored $(CLIENTS) $(DESTDIR)/usr/$(BINDIR)
- 	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
- 	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
---- xen-unstable.orig/tools/xentrace/Makefile
-+++ xen-unstable/tools/xentrace/Makefile
-@@ -35,15 +35,11 @@
- 
- .PHONY: install
- install: build
--	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
--	[ -z "$(LIBBIN)" ] || [ -d $(DESTDIR)/usr/$(LIBDIR)/xen/bin ] || \
--		$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
--	[ -d $(DESTDIR)/usr/share/man/man1 ] || \
--		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
--	[ -d $(DESTDIR)/usr/share/man/man8 ] || \
--		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
--	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
--	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
-+	$(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR)
-+	$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
-+	$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
-+	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/$(BINDIR)
-+	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)/usr/$(BINDIR)
- 	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
- 	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8
- 
---- xen-unstable.orig/tools/ioemu/Makefile.target
-+++ xen-unstable/tools/ioemu/Makefile.target
+Index: xen-unstable.hg/tools/ioemu/Makefile.target
+===================================================================
+--- xen-unstable.hg.orig/tools/ioemu/Makefile.target	2008-01-25 17:35:28.000000000 +0000
++++ xen-unstable.hg/tools/ioemu/Makefile.target	2008-01-25 17:40:35.000000000 +0000
 @@ -206,6 +206,7 @@
  ifdef CONFIG_SOLARIS
  LIBS+=-lsocket -lnsl -lresolv
@@ -204,9 +36,11 @@
  
  # profiling code
  ifdef TARGET_GPROF
---- xen-unstable.orig/tools/ioemu/configure
-+++ xen-unstable/tools/ioemu/configure
-@@ -594,9 +594,9 @@
+Index: xen-unstable.hg/tools/ioemu/configure
+===================================================================
+--- xen-unstable.hg.orig/tools/ioemu/configure	2008-01-25 17:35:28.000000000 +0000
++++ xen-unstable.hg/tools/ioemu/configure	2008-01-25 17:40:35.000000000 +0000
+@@ -569,9 +569,9 @@
      prefix="/usr/local"
  fi
  mandir="$prefix/share/man"
@@ -218,8 +52,10 @@
  configdir="/etc/xen"
  fi
  
---- xen-unstable.orig/tools/firmware/Makefile
-+++ xen-unstable/tools/firmware/Makefile
+Index: xen-unstable.hg/tools/firmware/Makefile
+===================================================================
+--- xen-unstable.hg.orig/tools/firmware/Makefile	2008-01-25 17:35:28.000000000 +0000
++++ xen-unstable.hg/tools/firmware/Makefile	2008-01-25 17:40:35.000000000 +0000
 @@ -4,7 +4,7 @@
  # hvmloader is a 32-bit protected mode binary.
  # It belongs in /usr/lib, not /usr/lib64.
@@ -229,14 +65,3 @@
  
  SUBDIRS :=
  SUBDIRS += rombios rombios/32bit
---- xen-unstable.orig/tools/blktap/lib/Makefile
-+++ xen-unstable/tools/blktap/lib/Makefile
-@@ -5,7 +5,7 @@
- MINOR    = 0
- SONAME   = libblktap.so.$(MAJOR)
- 
--BLKTAP_INSTALL_DIR = /usr/sbin
-+BLKTAP_INSTALL_DIR = /usr/$(BINDIR)
- 
- INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
- 
Index: debian/patches/tools-libfsimage-prefix.diff
===================================================================
--- debian/patches/tools-libfsimage-prefix.diff	(revision 499)
+++ debian/patches/tools-libfsimage-prefix.diff	(working copy)
@@ -1,20 +1,7 @@
---- xen-3.orig/tools/libfsimage/Rules.mk
-+++ xen-3/tools/libfsimage/Rules.mk
-@@ -7,11 +7,7 @@
- 
- PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
- 
--FSDIR-$(CONFIG_Linux) = $(LIBDIR)/fs/$(FS)
--FSDIR-$(CONFIG_SunOS)-x86_64 = lib/fs/$(FS)/64
--FSDIR-$(CONFIG_SunOS)-x86_32 = lib/fs/$(FS)/
--FSDIR-$(CONFIG_SunOS) = $(FSDIR-$(CONFIG_SunOS)-$(XEN_TARGET_ARCH))
--FSDIR = $(FSDIR-y)
-+FSDIR = $(LIBDIR)/fs/$(FS)
- 
- FSLIB = fsimage.so
- 
---- xen-3.orig/tools/libfsimage/common/Makefile
-+++ xen-3/tools/libfsimage/common/Makefile
+Index: xen-unstable.hg/tools/libfsimage/common/Makefile
+===================================================================
+--- xen-unstable.hg.orig/tools/libfsimage/common/Makefile	2008-01-25 17:04:58.000000000 +0000
++++ xen-unstable.hg/tools/libfsimage/common/Makefile	2008-01-25 17:08:10.000000000 +0000
 @@ -1,7 +1,7 @@
  XEN_ROOT = ../../..
  include $(XEN_ROOT)/tools/Rules.mk
@@ -24,8 +11,10 @@
  DEPS = .*.d
  
  LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
---- xen-3.orig/tools/libfsimage/common/fsimage_plugin.c
-+++ xen-3/tools/libfsimage/common/fsimage_plugin.c
+Index: xen-unstable.hg/tools/libfsimage/common/fsimage_plugin.c
+===================================================================
+--- xen-unstable.hg.orig/tools/libfsimage/common/fsimage_plugin.c	2008-01-25 16:48:21.000000000 +0000
++++ xen-unstable.hg/tools/libfsimage/common/fsimage_plugin.c	2008-01-25 17:08:10.000000000 +0000
 @@ -131,23 +131,8 @@
  	int err;
  	int ret = -1;
Index: debian/patches/tools-lib-abiname.diff
===================================================================
--- debian/patches/tools-lib-abiname.diff	(revision 499)
+++ debian/patches/tools-lib-abiname.diff	(working copy)
@@ -1,10 +1,12 @@
---- xen-unstable.orig/tools/libxc/Makefile
-+++ xen-unstable/tools/libxc/Makefile
+Index: xen-unstable.hg/tools/libxc/Makefile
+===================================================================
+--- xen-unstable.hg.orig/tools/libxc/Makefile	2008-01-25 17:11:15.000000000 +0000
++++ xen-unstable.hg/tools/libxc/Makefile	2008-01-25 17:33:36.000000000 +0000
 @@ -1,9 +1,6 @@
  XEN_ROOT = ../..
  include $(XEN_ROOT)/tools/Rules.mk
  
--MAJOR    = 3.0
+-MAJOR    = 3.2
 -MINOR    = 0
 -
  CTRL_SRCS-y       :=
@@ -25,24 +27,24 @@
  all: build
 @@ -105,16 +102,10 @@
  install: build
- 	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
- 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
--	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
--	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)/usr/$(LIBDIR)
--	ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so.$(MAJOR)
--	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so
-+	$(INSTALL_DATA) libxenctrl.so $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include
+ 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+-	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+-	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR)
+-	ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR)
+-	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so
++	$(INSTALL_DATA) libxenctrl.so $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) xenctrl.h $(DESTDIR)$(INCLUDEDIR)
  
--	$(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
--	$(INSTALL_DATA) libxenguest.a $(DESTDIR)/usr/$(LIBDIR)
--	ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so.$(MAJOR)
--	ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so
-+	$(INSTALL_DATA) libxenguest.so $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
+-	$(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+-	$(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR)
+-	ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR)
+-	ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so
++	$(INSTALL_DATA) libxenguest.so $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR)
  
  .PHONY: TAGS
-@@ -142,26 +133,16 @@
+@@ -143,26 +134,16 @@
  libxenctrl.a: $(CTRL_LIB_OBJS)
  	$(AR) rc $@ $^
  
@@ -73,8 +75,10 @@
  
  -include $(DEPS)
  
---- xen-unstable.orig/tools/xenstore/Makefile
-+++ xen-unstable/tools/xenstore/Makefile
+Index: xen-unstable.hg/tools/xenstore/Makefile
+===================================================================
+--- xen-unstable.hg.orig/tools/xenstore/Makefile	2008-01-25 17:11:15.000000000 +0000
++++ xen-unstable.hg/tools/xenstore/Makefile	2008-01-25 17:33:36.000000000 +0000
 @@ -2,9 +2,6 @@
  include $(XEN_ROOT)/tools/Rules.mk
  XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
@@ -101,19 +105,21 @@
  
  libxenstore.a: xs.o xs_lib.o
  	$(AR) rcs libxenstore.a $^
-@@ -85,9 +77,7 @@
- 	$(INSTALL_DIR) $(DESTDIR)/usr/include
- 	$(INSTALL_PROG) xenstore-control xenstore-ls xenstored $(CLIENTS) $(DESTDIR)/usr/$(BINDIR)
- 	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
--	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
--	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
--	ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so
-+	$(INSTALL_DATA) libxenstore.so $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
- 	$(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
---- xen-unstable.orig/tools/blktap/lib/Makefile
-+++ xen-unstable/tools/blktap/lib/Makefile
+@@ -89,9 +81,7 @@
+ 	$(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
+ 	$(INSTALL_PROG) xenstore-ls $(DESTDIR)$(BINDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+-	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+-	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR)
+-	ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so
++	$(INSTALL_DATA) libxenstore.so $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) xs.h $(DESTDIR)$(INCLUDEDIR)
+ 	$(INSTALL_DATA) xs_lib.h $(DESTDIR)$(INCLUDEDIR)
+Index: xen-unstable.hg/tools/blktap/lib/Makefile
+===================================================================
+--- xen-unstable.hg.orig/tools/blktap/lib/Makefile	2008-01-25 17:11:15.000000000 +0000
++++ xen-unstable.hg/tools/blktap/lib/Makefile	2008-01-25 17:35:14.000000000 +0000
 @@ -1,9 +1,7 @@
  XEN_ROOT = ../../..
  include $(XEN_ROOT)/tools/Rules.mk
@@ -123,9 +129,9 @@
 -SONAME   = libblktap.so.$(MAJOR)
 +SONAME   = libblktap.so
  
- BLKTAP_INSTALL_DIR = /usr/$(BINDIR)
+ INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
  
-@@ -28,7 +26,7 @@
+@@ -26,7 +24,7 @@
  OBJS     = $(patsubst %.c,%.o,$(SRCS))
  IBINS   :=
  
@@ -134,13 +140,13 @@
  
  .PHONY: all
  all: build
-@@ -43,19 +41,15 @@
- 	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DIR) $(DESTDIR)/usr/include
- 	$(INSTALL_DATA) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
--	ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so.$(MAJOR)
--	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so
- 	$(INSTALL_DATA) blktaplib.h $(DESTDIR)/usr/include
+@@ -41,19 +39,15 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+ 	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)
+-	ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libblktap.so.$(MAJOR)
+-	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libblktap.so
+ 	$(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR)
  
  clean:
  	rm -rf *.a *.so* *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS
@@ -157,8 +163,10 @@
  	$(AR) rc $@ libblktap.so
  
  .PHONY: TAGS all build clean install libblktap
---- xen-unstable.orig/tools/libfsimage/common/Makefile
-+++ xen-unstable/tools/libfsimage/common/Makefile
+Index: xen-unstable.hg/tools/libfsimage/common/Makefile
+===================================================================
+--- xen-unstable.hg.orig/tools/libfsimage/common/Makefile	2008-01-25 17:11:15.000000000 +0000
++++ xen-unstable.hg/tools/libfsimage/common/Makefile	2008-01-25 17:35:08.000000000 +0000
 @@ -1,9 +1,6 @@
  XEN_ROOT = ../../..
  include $(XEN_ROOT)/tools/Rules.mk
@@ -180,18 +188,18 @@
  all: $(LIB)
 @@ -24,9 +21,7 @@
  install: all
- 	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
- 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
--	$(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
--	ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libfsimage.so.$(MAJOR)
--	ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libfsimage.so
-+	$(INSTALL_PROG) libfsimage.so $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DATA) fsimage.h $(DESTDIR)/usr/include
- 	$(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)/usr/include
- 	$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)/usr/include
+ 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+-	$(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+-	ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR)
+-	ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so
++	$(INSTALL_PROG) libfsimage.so $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR)
+ 	$(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR)
+ 	$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR)
 @@ -34,13 +29,8 @@
  clean distclean:
- 	rm -f $(PIC_OBJS) $(LIB)
+ 	rm -f $(PIC_OBJS) $(LIB) $(DEPS)
  
 -libfsimage.so: libfsimage.so.$(MAJOR)
 -	ln -sf $< $@
@@ -205,8 +213,10 @@
  
  -include $(DEPS)
  
---- xen-unstable.orig/tools/flask/libflask/Makefile
-+++ xen-unstable/tools/flask/libflask/Makefile
+Index: xen-unstable.hg/tools/flask/libflask/Makefile
+===================================================================
+--- xen-unstable.hg.orig/tools/flask/libflask/Makefile	2008-01-25 17:11:15.000000000 +0000
++++ xen-unstable.hg/tools/flask/libflask/Makefile	2008-01-25 17:33:36.000000000 +0000
 @@ -1,6 +1,3 @@
 -MAJOR    = 1.0
 -MINOR    = 0
@@ -225,14 +235,14 @@
  all: build
 @@ -35,10 +32,8 @@
  install: build
- 	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
- 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
--	$(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-+	$(INSTALL_PROG) libflask.so $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DATA) libflask.a $(DESTDIR)/usr/$(LIBDIR)
--	ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libflask.so.$(MAJOR)
--	ln -sf libflask.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libflask.so
- 	$(INSTALL_DATA) include/flask.h $(DESTDIR)/usr/include
+ 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+-	$(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
++	$(INSTALL_PROG) libflask.so $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) libflask.a $(DESTDIR)$(LIBDIR)
+-	ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libflask.so.$(MAJOR)
+-	ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libflask.so
+ 	$(INSTALL_DATA) include/flask.h $(DESTDIR)$(INCLUDEDIR)
  
  .PHONY: TAGS
 @@ -54,12 +49,7 @@
Index: debian/patches/config-prefix.diff
===================================================================
--- debian/patches/config-prefix.diff	(revision 499)
+++ debian/patches/config-prefix.diff	(working copy)
@@ -1,6 +1,8 @@
---- xen-unstable.orig/Config.mk
-+++ xen-unstable/Config.mk
-@@ -30,6 +30,10 @@
+Index: xen-unstable.hg/Config.mk
+===================================================================
+--- xen-unstable.hg.orig/Config.mk	2008-01-25 16:48:20.000000000 +0000
++++ xen-unstable.hg/Config.mk	2008-01-25 16:53:03.000000000 +0000
+@@ -31,6 +31,10 @@
  include $(XEN_ROOT)/config/$(XEN_OS).mk
  include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
  
@@ -11,38 +13,3 @@
  ifneq ($(EXTRA_PREFIX),)
  EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
  EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
---- xen-unstable.orig/config/ia64.mk
-+++ xen-unstable/config/ia64.mk
-@@ -4,5 +4,3 @@
- CONFIG_IOEMU := y
- CONFIG_XCUTILS := y
- CONFIG_XENCOMM := y
--
--LIBDIR := lib
---- xen-unstable.orig/config/powerpc64.mk
-+++ xen-unstable/config/powerpc64.mk
-@@ -4,4 +4,3 @@
- CONFIG_XENCOMM := y
- 
- CFLAGS += -DELFSIZE=64
--LIBDIR := lib
---- xen-unstable.orig/config/x86_32.mk
-+++ xen-unstable/config/x86_32.mk
-@@ -8,7 +8,6 @@
- CONFIG_IOEMU := y
- 
- CFLAGS += -m32 -march=i686
--LIBDIR := lib
- 
- # Use only if calling $(LD) directly.
- LDFLAGS_DIRECT_OpenBSD = _obsd
---- xen-unstable.orig/config/x86_64.mk
-+++ xen-unstable/config/x86_64.mk
-@@ -9,7 +9,6 @@
- CONFIG_IOEMU := y
- 
- CFLAGS += -m64
--LIBDIR = $(LIB64DIR)
- 
- # Use only if calling $(LD) directly.
- ifeq ($(XEN_OS),OpenBSD)
Index: debian/changelog
===================================================================
--- debian/changelog	(revision 499)
+++ debian/changelog	(working copy)
@@ -1,3 +1,9 @@
+xen-unstable (3.2-unstable+hg16890-0) unstable; urgency=low
+
+  * adjust patches
+
+ -- Ian Jackson <iwj@mariner.uk.xensource.com>  Fri, 25 Jan 2008 17:21:25 +0000
+
 xen-unstable (3.2-unstable+hg16439-1) UNRELEASED; urgency=low
 
   * New upstream snapshot.