[Pkg-xen-changes] r262 - in trunk/xen-unstable/debian: arch bin patches scripts templates

Bastian Blank waldi at costa.debian.org
Tue Aug 22 11:09:26 UTC 2006 

Author: waldi
Date: Tue Aug 22 11:09:22 2006
New Revision: 262

Added:
   trunk/xen-unstable/debian/arch/
      - copied from r227, /trunk/xen-3.0/debian/arch/
   trunk/xen-unstable/debian/bin/
      - copied from r257, /trunk/xen-3.0/debian/bin/
   trunk/xen-unstable/debian/patches/libs.dpatch
      - copied, changed from r257, /trunk/xen-3.0/debian/patches/libs.dpatch
   trunk/xen-unstable/debian/patches/prefix-ioemu.dpatch
      - copied, changed from r257, /trunk/xen-3.0/debian/patches/prefix-ioemu.dpatch
   trunk/xen-unstable/debian/patches/prefix-utils.dpatch
      - copied, changed from r257, /trunk/xen-3.0/debian/patches/prefix-utils.dpatch
   trunk/xen-unstable/debian/patches/qemu-arch.dpatch   (contents, props changed)
   trunk/xen-unstable/debian/patches/qemu-config.dpatch
      - copied, changed from r257, /trunk/xen-3.0/debian/patches/qemu-config.dpatch
   trunk/xen-unstable/debian/rules.real
      - copied unchanged from r261, /trunk/xen-3.0/debian/rules.real
   trunk/xen-unstable/debian/templates/
      - copied from r257, /trunk/xen-3.0/debian/templates/
   trunk/xen-unstable/debian/xen-utils.NEWS
      - copied unchanged from r257, /trunk/xen-3.0/debian/xen-utils.NEWS
   trunk/xen-unstable/debian/xen-utils.README.Debian
      - copied unchanged from r257, /trunk/xen-3.0/debian/xen-utils.README.Debian
Removed:
   trunk/xen-unstable/debian/patches/default-network.dpatch
   trunk/xen-unstable/debian/patches/libdir.dpatch
   trunk/xen-unstable/debian/patches/manpages.dpatch
   trunk/xen-unstable/debian/scripts/
   trunk/xen-unstable/debian/xen-docs-unstable.install
   trunk/xen-unstable/debian/xen-ioemu-unstable.install
   trunk/xen-unstable/debian/xen-utils-unstable.install
   trunk/xen-unstable/debian/xen-utils-unstable.postinst
   trunk/xen-unstable/debian/xen-utils-unstable.postrm
   trunk/xen-unstable/debian/xen-utils-unstable.xend.init
   trunk/xen-unstable/debian/xen-utils-unstable.xendomains.default
   trunk/xen-unstable/debian/xen-utils-unstable.xendomains.init
Modified:
   trunk/xen-unstable/debian/changelog
   trunk/xen-unstable/debian/control
   trunk/xen-unstable/debian/patches/00list
   trunk/xen-unstable/debian/patches/version.dpatch
   trunk/xen-unstable/debian/rules
   trunk/xen-unstable/debian/rules.defs

Log:
Update build environment.


Modified: trunk/xen-unstable/debian/changelog
==============================================================================
--- trunk/xen-unstable/debian/changelog	(original)
+++ trunk/xen-unstable/debian/changelog	Tue Aug 22 11:09:22 2006
@@ -1,4 +1,4 @@
-xen-unstable (hg11134-1) UNRELEASED; urgency=low
+xen-unstable (3.0-unstable+hg11218-1) UNRELEASED; urgency=low
 
   * Initial release.
 

Modified: trunk/xen-unstable/debian/control
==============================================================================
--- trunk/xen-unstable/debian/control	(original)
+++ trunk/xen-unstable/debian/control	Tue Aug 22 11:09:22 2006
@@ -3,70 +3,30 @@
 Priority: extra
 Maintainer: Debian Xen Team <pkg-xen-devel at lists.alioth.debian.org>
 Uploaders: Julien Danjou <acid at debian.org>, Jeremy T. Bouse <jbouse at debian.org>, Guido Trotter <ultrotter at debian.org>, Bastian Blank <waldi at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), libcurl3-dev | libcurl-dev, python-dev, python (>= 2.2), transfig, libsdl1.2-dev, libvncserver-dev, libjpeg-dev, bzip2, bcc, dpatch, lsb-release, python-central (>= 0.5), tetex-bin, tetex-extra, gs-common
 Standards-Version: 3.7.2.0
+Build-Depends: debhelper (>= 5.0.37.2), libcurl3-dev | libcurl-dev, python-dev, python (>= 2.2), transfig, libsdl1.2-dev, libvncserver-dev, libjpeg-dev, bzip2, bcc, dpatch, lsb-release, python-central (>= 0.5), tetex-bin, tetex-extra, gs-common, linux-support-2.6.17-2
 XS-Python-Version: current
 
-Package: xen-hypervisor-unstable-amd64
-Architecture: amd64
-Provides: xen-hypervisor, xen-hypervisor-unstable, xen-hypervisor-amd64
-Description: The Xen Hypervisor for amd64
- The hypervisor is the "core" for XEN itself. It gets booted by the boot loader
- and controls cpu and memory, sharing them between your administrative domain
- (Domain 0) and the virtual guest systems.
- .
- In order to boot a XEN system along with this package you also need a kernel
- specifically crafted to work as the Domain 0, mediating hardware access for
- XEN itself. An example config file for this kernel and documentation on how
- to build it can be found in the xen-docs package.
-
-Package: xen-hypervisor-unstable-i386
-Architecture: i386
-Provides: xen-hypervisor, xen-hypervisor-unstable, xen-hypervisor-i386
-Description: The Xen Hypervisor for i386
- The hypervisor is the "core" for XEN itself. It gets booted by the boot loader
- and controls cpu and memory, sharing them between your administrative domain
- (Domain 0) and the virtual guest systems.
- .
- In order to boot a XEN system along with this package you also need a kernel
- specifically crafted to work as the Domain 0, mediating hardware access for
- XEN itself. An example config file for this kernel and documentation on how
- to build it can be found in the xen-docs package.
- .
- This version of the hypervisor is built with support for systems with up to
- 4GB of memory. If you have more please install the -pae version instead.
-
-Package: xen-hypervisor-unstable-i386-pae
-Architecture: i386
-Provides: xen-hypervisor, xen-hypervisor-unstable, xen-hypervisor-i386-pae
-Description: The Xen Hypervisor for i386 (pae enabled version)
- The hypervisor is the "core" for XEN itself. It gets booted by the boot loader
- and controls cpu and memory, sharing them between your administrative domain
- (Domain 0) and the virtual guest systems.
- .
- In order to boot a XEN system along with this package you also need a kernel
- specifically crafted to work as the Domain 0, mediating hardware access for
- XEN itself. An example config file for this kernel and documentation on how
- to build it can be found in the xen-docs package.
- .
- This version of the hypervisor is built with PAE enabled, in order to support
- systems with more than 4GB of memory. If you have less than that you should
- probably choose the non -pae version.
+Package: xen-docs-3.0-unstable
+Architecture: all
+Description: documentation for XEN, a Virtual Machine Monitor
+ This package contains all the large documentation files for XEN.  This
+ includes a description interface(both the api, and a nice explanation of
+ how XEN works).  It also contains the VBD and Xeno howtos.
 
-Package: xen-utils-unstable
+Package: xen-utils-3.0-unstable-1
 Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${python:Depends}, xen-hypervisor-unstable, iproute, udev (>> 0.060)
-Recommends: bridge-utils, libc6-xen
 Provides: xen-utils
-Conflicts: xen-utils, xen, libxen-python, libxen2.0, libxen2.0-dev
-XB-Python-Version: ${python:Versions}
+Depends: ${shlibs:Depends}, ${python:Depends}, xen-utils-common, iproute, udev (>> 0.060)
+Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor-3.0-unstable
 Description: XEN administrative tools
  The userspace tools to manage a system virtualized through the XEN virtual
  machine monitor.
+XB-Python-Version: ${python:Versions}
 
-Package: xen-ioemu-unstable
+Package: xen-ioemu-3.0-unstable
 Architecture: amd64 i386
-Depends: ${shlibs:Depends}, xen-utils-unstable (= ${Source-Version})
+Depends: ${shlibs:Depends}, xen-utils-3.0-unstable-1 (= ${Source-Version})
 Description: XEN administrative tools
  The userspace tools to manage a system virtualized through the XEN virtual
  machine monitor.
@@ -75,13 +35,56 @@
  allows full virtualization of unmodified operating systems, such as
  Microsoft's Windows product line, and standard Linux kernels.
  .
- For this to work, you will need a CPU with hardware virtualization support,
- such as Intel's CPUs with VT, or AMD's CPUs with Pacifica.
+ For this to work, you will need a CPU with hardware virtualization
+ support, such as Intel's CPUs with VT, or AMD's CPUs with Pacifica.
 
-Package: xen-docs-unstable
-Architecture: all
-Description: documentation for XEN, a Virtual Machine Monitor
- This package contains all the large documentation files for XEN.  This
- includes a description interface(both the api, and a nice explanation of
- how XEN works).  It also contains the VBD and Xeno howtos.
+Package: xen-hypervisor-3.0-unstable-1-amd64
+Architecture: amd64
+Provides: xen-hypervisor, xen-hypervisor-unstable, xen-hypervisor-3.0-unstable-1, xen-hypervisor-amd64
+Depends: xen-utils-3.0-unstable-1
+Description: The Xen Hypervisor on AMD64
+ The hypervisor is the "core" for XEN itself.  It gets booted by the boot
+ loader and controls cpu and memory, sharing them between your
+ administrative domain (Domain 0) and the virtual guest systems.
+ .
+ In order to boot a XEN system along with this package you also need a
+ kernel specifically crafted to work as the Domain 0, mediating hardware
+ access for XEN itself.  An example config file for this kernel and
+ documentation on how to build it can be found in the xen-docs package.
+
+Package: xen-hypervisor-3.0-unstable-1-i386
+Architecture: i386
+Provides: xen-hypervisor, xen-hypervisor-unstable, xen-hypervisor-3.0-unstable-1, xen-hypervisor-i386
+Depends: xen-utils-3.0-unstable-1
+Description: The Xen Hypervisor on i386-class
+ The hypervisor is the "core" for XEN itself.  It gets booted by the boot
+ loader and controls cpu and memory, sharing them between your
+ administrative domain (Domain 0) and the virtual guest systems.
+ .
+ In order to boot a XEN system along with this package you also need a
+ kernel specifically crafted to work as the Domain 0, mediating hardware
+ access for XEN itself.  An example config file for this kernel and
+ documentation on how to build it can be found in the xen-docs package.
+ .
+ This version of the hypervisor is built with support for systems with up
+ to 4GB of memory.  If you have more please install the -pae version
+ instead.
+
+Package: xen-hypervisor-3.0-unstable-1-i386-pae
+Architecture: i386
+Provides: xen-hypervisor, xen-hypervisor-unstable, xen-hypervisor-3.0-unstable-1, xen-hypervisor-i386-pae
+Depends: xen-utils-3.0-unstable-1
+Description: The Xen Hypervisor on i386-pae-class
+ The hypervisor is the "core" for XEN itself.  It gets booted by the boot
+ loader and controls cpu and memory, sharing them between your
+ administrative domain (Domain 0) and the virtual guest systems.
+ .
+ In order to boot a XEN system along with this package you also need a
+ kernel specifically crafted to work as the Domain 0, mediating hardware
+ access for XEN itself.  An example config file for this kernel and
+ documentation on how to build it can be found in the xen-docs package.
+ .
+ This version of the hypervisor is built with PAE enabled, in order to
+ support systems with more than 4GB of memory.  If you have less than that
+ you should probably choose the non -pae version.
 

Modified: trunk/xen-unstable/debian/patches/00list
==============================================================================
--- trunk/xen-unstable/debian/patches/00list	(original)
+++ trunk/xen-unstable/debian/patches/00list	Tue Aug 22 11:09:22 2006
@@ -1,4 +1,6 @@
-libdir
-manpages
+prefix-utils
+prefix-ioemu
 version
-default-network
+qemu-config
+libs
+qemu-arch

Copied: trunk/xen-unstable/debian/patches/libs.dpatch (from r257, /trunk/xen-3.0/debian/patches/libs.dpatch)
==============================================================================
--- /trunk/xen-3.0/debian/patches/libs.dpatch	(original)
+++ trunk/xen-unstable/debian/patches/libs.dpatch	Tue Aug 22 11:09:22 2006
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad xen-3.0~/tools/libxc/Makefile xen-3.0/tools/libxc/Makefile
---- xen-3.0~/tools/libxc/Makefile	2006-08-21 05:12:27.000000000 +0000
-+++ xen-3.0/tools/libxc/Makefile	2006-08-21 06:40:50.652754733 +0000
+diff -urNad xen-unstable~/tools/libxc/Makefile xen-unstable/tools/libxc/Makefile
+--- xen-unstable~/tools/libxc/Makefile	2006-08-22 09:56:46.000000000 +0000
++++ xen-unstable/tools/libxc/Makefile	2006-08-22 10:24:54.509973069 +0000
 @@ -4,9 +4,6 @@
  INSTALL_DATA	= $(INSTALL) -m0644
  INSTALL_DIR	= $(INSTALL) -d -m0755
@@ -18,9 +18,9 @@
  XEN_ROOT = ../..
  include $(XEN_ROOT)/tools/Rules.mk
  
-@@ -61,11 +58,9 @@
- LIB_BUILD_OBJS := $(patsubst %.c,%.o,$(BUILD_SRCS))
- PIC_BUILD_OBJS := $(patsubst %.c,%.opic,$(BUILD_SRCS))
+@@ -55,11 +52,9 @@
+ GUEST_LIB_OBJS := $(patsubst %.c,%.o,$(GUEST_SRCS-y))
+ GUEST_PIC_OBJS := $(patsubst %.c,%.opic,$(GUEST_SRCS-y))
  
 -LIB := libxenctrl.a
 -LIB += libxenctrl.so libxenctrl.so.$(MAJOR) libxenctrl.so.$(MAJOR).$(MINOR)
@@ -32,7 +32,7 @@
  
  .PHONY: all
  all: build
-@@ -87,16 +82,10 @@
+@@ -81,16 +76,10 @@
  install: build
  	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
  	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
@@ -40,19 +40,19 @@
 -	$(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_PROG) libxenctrl.so $(DESTDIR)/usr/$(LIBDIR)
++	$(INSTALL_DATA) libxenctrl.so $(DESTDIR)/usr/$(LIBDIR)
  	$(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include
  
 -	$(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_PROG) libxenguest.so $(DESTDIR)/usr/$(LIBDIR)
++	$(INSTALL_DATA) libxenguest.so $(DESTDIR)/usr/$(LIBDIR)
  	$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
  
  .PHONY: TAGS
-@@ -122,25 +111,15 @@
- libxenctrl.a: $(LIB_OBJS)
+@@ -118,26 +107,16 @@
+ libxenctrl.a: $(CTRL_LIB_OBJS)
  	$(AR) rc $@ $^
  
 -libxenctrl.so: libxenctrl.so.$(MAJOR)
@@ -60,14 +60,14 @@
 -libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR)
 -	ln -sf $< $@
 -
--libxenctrl.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
+-libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
 -	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenctrl.so.$(MAJOR) -shared -o $@ $^
-+libxenctrl.so: $(PIC_OBJS)
++libxenctrl.so: $(CTRL_PIC_OBJS)
 +	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^
  
  # libxenguest
  
- libxenguest.a: $(LIB_BUILD_OBJS)
+ libxenguest.a: $(GUEST_LIB_OBJS)
  	$(AR) rc $@ $^
  
 -libxenguest.so: libxenguest.so.$(MAJOR)
@@ -75,9 +75,50 @@
 -libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
 -	ln -sf $< $@
 -
--libxenguest.so.$(MAJOR).$(MINOR): $(PIC_BUILD_OBJS) libxenctrl.so
+-libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
 -	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenguest.so.$(MAJOR) -shared -o $@ $^ -lz -lxenctrl
-+libxenguest.so: $(PIC_BUILD_OBJS) libxenctrl.so
++libxenguest.so: $(GUEST_PIC_OBJS) libxenctrl.so
 +	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lz -lxenctrl
  
  -include $(DEPS)
+ 
+diff -urNad xen-unstable~/tools/xenstore/Makefile xen-unstable/tools/xenstore/Makefile
+--- xen-unstable~/tools/xenstore/Makefile	2006-08-22 10:23:24.313310008 +0000
++++ xen-unstable/tools/xenstore/Makefile	2006-08-22 10:24:42.839218147 +0000
+@@ -2,9 +2,6 @@
+ include $(XEN_ROOT)/tools/Rules.mk
+ XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
+ 
+-MAJOR = 3.0
+-MINOR = 0
+-
+ INSTALL         = install
+ INSTALL_DATA	= $(INSTALL) -m0644
+ INSTALL_PROG    = $(INSTALL) -m0755
+@@ -89,13 +86,8 @@
+ talloc_test.o: talloc.c
+ 	$(COMPILE.c) -o $@ $<
+ 
+-libxenstore.so: libxenstore.so.$(MAJOR)
+-	ln -sf $< $@
+-libxenstore.so.$(MAJOR): libxenstore.so.$(MAJOR).$(MINOR)
+-	ln -sf $< $@
+-
+-libxenstore.so.$(MAJOR).$(MINOR): xs.opic xs_lib.opic
+-	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenstore.so.$(MAJOR) -shared -o $@ $^ -lpthread
++libxenstore.so: xs.opic xs_lib.opic
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lpthread
+ 
+ libxenstore.a: xs.o xs_lib.o
+ 	$(AR) rcs libxenstore.a $^
+@@ -182,9 +174,7 @@
+ 	$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/$(BINDIR)
+ 	$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/$(BINDIR)
+ 	$(INSTALL_DIR) -p $(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

Copied: trunk/xen-unstable/debian/patches/prefix-ioemu.dpatch (from r257, /trunk/xen-3.0/debian/patches/prefix-ioemu.dpatch)
==============================================================================
--- /trunk/xen-3.0/debian/patches/prefix-ioemu.dpatch	(original)
+++ trunk/xen-unstable/debian/patches/prefix-ioemu.dpatch	Tue Aug 22 11:09:22 2006
@@ -6,9 +6,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad xen-3.0~/tools/firmware/Makefile xen-3.0/tools/firmware/Makefile
---- xen-3.0~/tools/firmware/Makefile	2006-08-18 16:42:49.000000000 +0000
-+++ xen-3.0/tools/firmware/Makefile	2006-08-20 22:24:11.696970534 +0000
+diff -urNad xen-unstable~/tools/firmware/Makefile xen-unstable/tools/firmware/Makefile
+--- xen-unstable~/tools/firmware/Makefile	2006-08-22 09:56:47.000000000 +0000
++++ xen-unstable/tools/firmware/Makefile	2006-08-22 10:47:23.727247679 +0000
 @@ -4,7 +4,7 @@
  # hvmloader is a 32-bit protected mode binary.
  # It belongs in /usr/lib, not /usr/lib64.
@@ -18,36 +18,18 @@
  
  SUBDIRS :=
  SUBDIRS += rombios
-diff -urNad xen-3.0~/tools/ioemu/configure xen-3.0/tools/ioemu/configure
---- xen-3.0~/tools/ioemu/configure	2006-08-18 16:42:49.000000000 +0000
-+++ xen-3.0/tools/ioemu/configure	2006-08-20 22:23:53.005370924 +0000
-@@ -361,7 +361,7 @@
-     prefix="usr/local"
+diff -urNad xen-unstable~/tools/ioemu/configure xen-unstable/tools/ioemu/configure
+--- xen-unstable~/tools/ioemu/configure	2006-08-22 09:56:47.000000000 +0000
++++ xen-unstable/tools/ioemu/configure	2006-08-22 10:48:40.197691138 +0000
+@@ -514,9 +514,9 @@
+     prefix="/usr/local"
+ fi
+ mandir="$prefix/share/man"
+-datadir="$prefix/share/xen/qemu"
++datadir="$prefix/share/xen-ioemu-$XEN_VERSION_IOEMU/qemu"
+ docdir="$prefix/share/doc/qemu"
+-bindir="$prefix/$libdir/xen/bin"
++bindir="$prefix/lib/xen-ioemu-$XEN_VERSION_IOEMU/bin"
+ configdir="/etc/xen"
  fi
- mandir="$installroot/$prefix/share/man"
--datadir="$installroot/$prefix/share/xen/qemu"
-+datadir="$installroot/$prefix/share/xen-ioemu-$XEN_VERSION_IOEMU/qemu"
- docdir="$installroot/$prefix/share/doc/qemu"
- bindir="$installroot/$prefix/bin"
- configdir="$installroot/etc/xen"
-diff -urNad xen-3.0~/tools/ioemu/target-i386-dm/Makefile xen-3.0/tools/ioemu/target-i386-dm/Makefile
---- xen-3.0~/tools/ioemu/target-i386-dm/Makefile	2006-08-18 16:42:48.000000000 +0000
-+++ xen-3.0/tools/ioemu/target-i386-dm/Makefile	2006-08-20 22:23:53.005370924 +0000
-@@ -4,7 +4,7 @@
- XEN_ROOT=../../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--INSTALL_DIR := $(DESTDIR)/usr/$(LIBDIR)/xen/bin
-+INSTALL_DIR := $(DESTDIR)/usr/lib/xen-ioemu-$(XEN_VERSION_IOEMU)/bin
- TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH)
- VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio
- DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH)
-@@ -195,7 +195,7 @@
- #########################################################
  
- DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
--LIBS+=-lm -L../../libxc -lxenctrl -lxenguest -L../../xenstore -lxenstore
-+LIBS+=-lm $(RPATH_ARG) -L../../libxc -lxenctrl -lxenguest -L../../xenstore -lxenstore
- ifndef CONFIG_USER_ONLY
- LIBS+=-lz
- endif

Copied: trunk/xen-unstable/debian/patches/prefix-utils.dpatch (from r257, /trunk/xen-3.0/debian/patches/prefix-utils.dpatch)
==============================================================================
--- /trunk/xen-3.0/debian/patches/prefix-utils.dpatch	(original)
+++ trunk/xen-unstable/debian/patches/prefix-utils.dpatch	Tue Aug 22 11:09:22 2006
@@ -6,29 +6,58 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad xen-3.0~/Config.mk xen-3.0/Config.mk
---- xen-3.0~/Config.mk	2006-08-18 16:42:43.000000000 +0000
-+++ xen-3.0/Config.mk	2006-08-20 22:15:59.045465667 +0000
-@@ -47,11 +47,10 @@
- CFLAGS  += -m64
- endif
+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-22 10:28:30.708189063 +0000
+@@ -43,6 +43,11 @@
+ 
+ include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
  
--ifeq ($(XEN_TARGET_ARCH),x86_64)
--LIBDIR = lib64
--else
--LIBDIR = lib
--endif
 +PREFIX = lib/xen-$(XEN_VERSION_TOOLS)
 +BINDIR = $(PREFIX)/bin
 +LIBDIR = $(PREFIX)/lib
 +SBINDIR = $(PREFIX)/sbin
- 
++
  ifneq ($(EXTRA_PREFIX),)
  EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
-diff -urNad xen-3.0~/tools/Rules.mk xen-3.0/tools/Rules.mk
---- xen-3.0~/tools/Rules.mk	2006-08-18 16:42:45.000000000 +0000
-+++ xen-3.0/tools/Rules.mk	2006-08-20 22:15:59.045465667 +0000
-@@ -10,6 +10,9 @@
+ 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-22 10:28:30.708189063 +0000
+@@ -1,5 +1,3 @@
+ CONFIG_IA64 := y
+ CONFIG_IOEMU := y
+ CONFIG_XCUTILS := y
+-
+-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-22 10:28:30.708189063 +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-22 10:28:30.708189063 +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-22 10:28:30.708189063 +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-22 10:28:30.708189063 +0000
+@@ -12,6 +12,9 @@
  XEN_XENSTORE       = $(XEN_ROOT)/tools/xenstore
  XEN_LIBXENSTAT     = $(XEN_ROOT)/tools/xenstat/libxenstat/src
  
@@ -37,10 +66,22 @@
 +
  X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
  
- CFLAGS += -D__XEN_INTERFACE_VERSION__=0x00030101
-diff -urNad xen-3.0~/tools/console/Makefile xen-3.0/tools/console/Makefile
---- xen-3.0~/tools/console/Makefile	2006-08-18 16:42:45.000000000 +0000
-+++ xen-3.0/tools/console/Makefile	2006-08-20 22:15:59.045465667 +0000
+ 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-22 10:28:56.532976815 +0000
+@@ -7,7 +7,7 @@
+ INSTALL_PROG = $(INSTALL) -m0755
+ IBIN         = blktapctrl tapdisk
+ QCOW_UTIL    = img2qcow qcow2raw qcow-create
+-INSTALL_DIR  = /usr/sbin
++INSTALL_DIR  = /usr/$(SBINDIR)
+ LIBAIO_DIR   = ../../libaio/src
+ 
+ CFLAGS   += -fPIC
+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-22 10:28:30.708189063 +0000
 @@ -2,8 +2,8 @@
  XEN_ROOT=../..
  include $(XEN_ROOT)/tools/Rules.mk
@@ -66,9 +107,9 @@
  	      -lxenctrl -lxenstore
  
  .PHONY: install
-diff -urNad xen-3.0~/tools/misc/Makefile xen-3.0/tools/misc/Makefile
---- xen-3.0~/tools/misc/Makefile	2006-08-18 16:42:48.000000000 +0000
-+++ xen-3.0/tools/misc/Makefile	2006-08-20 22:15:59.045465667 +0000
+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-22 10:28:30.708189063 +0000
 @@ -32,10 +32,10 @@
  
  .PHONY: install
@@ -90,9 +131,9 @@
  $(TARGETS): %: %.o Makefile
 -	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
 +	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
-diff -urNad xen-3.0~/tools/misc/cpuperf/Makefile xen-3.0/tools/misc/cpuperf/Makefile
---- xen-3.0~/tools/misc/cpuperf/Makefile	2006-08-18 16:42:48.000000000 +0000
-+++ xen-3.0/tools/misc/cpuperf/Makefile	2006-08-20 22:15:59.045465667 +0000
+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-22 10:28:30.708189063 +0000
 @@ -37,14 +37,14 @@
  	$(CC) $(CFLAGS) -o $@ $<
  
@@ -110,9 +151,9 @@
  
  
  # End of $RCSfile: Makefile,v $
-diff -urNad xen-3.0~/tools/misc/lomount/Makefile xen-3.0/tools/misc/lomount/Makefile
---- xen-3.0~/tools/misc/lomount/Makefile	2006-08-18 16:42:48.000000000 +0000
-+++ xen-3.0/tools/misc/lomount/Makefile	2006-08-20 22:15:59.045465667 +0000
+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-22 10:28:30.708189063 +0000
 @@ -21,7 +21,7 @@
  
  .PHONY: install
@@ -122,9 +163,9 @@
  
  .PHONY: clean
  clean:
-diff -urNad xen-3.0~/tools/pygrub/Makefile xen-3.0/tools/pygrub/Makefile
---- xen-3.0~/tools/pygrub/Makefile	2006-08-18 16:42:46.000000000 +0000
-+++ xen-3.0/tools/pygrub/Makefile	2006-08-20 22:15:59.045465667 +0000
+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-22 10:28:30.708189063 +0000
 @@ -11,7 +11,7 @@
  .PHONY: install
  ifndef XEN_PYTHON_NATIVE_INSTALL
@@ -134,9 +175,9 @@
  else
  install: all
  	CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)"
-diff -urNad xen-3.0~/tools/python/Makefile xen-3.0/tools/python/Makefile
---- xen-3.0~/tools/python/Makefile	2006-08-18 16:42:46.000000000 +0000
-+++ xen-3.0/tools/python/Makefile	2006-08-20 22:15:59.045465667 +0000
+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-22 10:28:30.708189063 +0000
 @@ -6,15 +6,15 @@
  
  .PHONY: build
@@ -156,9 +197,9 @@
  endif
  
  .PHONY: test
-diff -urNad xen-3.0~/tools/python/setup.py xen-3.0/tools/python/setup.py
---- xen-3.0~/tools/python/setup.py	2006-08-18 16:42:46.000000000 +0000
-+++ xen-3.0/tools/python/setup.py	2006-08-20 22:15:59.045465667 +0000
+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-22 10:28:30.708189063 +0000
 @@ -5,6 +5,8 @@
  XEN_ROOT = "../.."
  
@@ -184,9 +225,9 @@
                 include_dirs       = include_dirs + [ "xen/lowlevel/xs" ],
                 library_dirs       = library_dirs,
                 libraries          = libraries,
-diff -urNad xen-3.0~/tools/xcutils/Makefile xen-3.0/tools/xcutils/Makefile
---- xen-3.0~/tools/xcutils/Makefile	2006-08-18 16:42:49.000000000 +0000
-+++ xen-3.0/tools/xcutils/Makefile	2006-08-20 22:15:59.045465667 +0000
+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-22 10:28:30.708189063 +0000
 @@ -15,7 +15,7 @@
  XEN_ROOT	= ../..
  include $(XEN_ROOT)/tools/Rules.mk
@@ -196,9 +237,9 @@
  
  INCLUDES += -I $(XEN_LIBXC)
  
-diff -urNad xen-3.0~/tools/xenmon/Makefile xen-3.0/tools/xenmon/Makefile
---- xen-3.0~/tools/xenmon/Makefile	2006-08-18 16:42:47.000000000 +0000
-+++ xen-3.0/tools/xenmon/Makefile	2006-08-20 22:15:59.045465667 +0000
+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-22 10:28:30.708189063 +0000
 @@ -15,8 +15,6 @@
  INSTALL_DIR     = $(INSTALL) -d -m0755
  INSTALL_DATA    = $(INSTALL) -m0644
@@ -211,21 +252,21 @@
 @@ -36,10 +34,10 @@
  
  .PHONY: install
- install: xenbaked setmask
+ install: build
 -	[ -d $(DESTDIR)$(sbindir) ] || $(INSTALL_DIR) $(DESTDIR)$(sbindir)
 -	$(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked
--	$(INSTALL_PROG) setmask  $(DESTDIR)$(sbindir)/setmask
+-	$(INSTALL_PROG) xentrace_setmask  $(DESTDIR)$(sbindir)/xentrace_setmask
 -	$(INSTALL_PROG) xenmon.py  $(DESTDIR)$(sbindir)/xenmon.py
 +	$(INSTALL_DIR) $(DESTDIR)/usr/$(SBINDIR)
 +	$(INSTALL_PROG) xenbaked $(DESTDIR)/usr/$(SBINDIR)/xenbaked
-+	$(INSTALL_PROG) setmask $(DESTDIR)/usr/$(SBINDIR)/setmask
-+	$(INSTALL_PROG) xenmon.py $(DESTDIR)/usr/$(SBINDIR)/xenmon.py
++	$(INSTALL_PROG) xentrace_setmask  $(DESTDIR)/usr/$(SBINDIR)/xentrace_setmask
++	$(INSTALL_PROG) xenmon.py  $(DESTDIR)/usr/$(SBINDIR)/xenmon.py
  
  .PHONY: clean
  clean:
-diff -urNad xen-3.0~/tools/xenstat/xentop/Makefile xen-3.0/tools/xenstat/xentop/Makefile
---- xen-3.0~/tools/xenstat/xentop/Makefile	2006-08-18 16:42:49.000000000 +0000
-+++ xen-3.0/tools/xenstat/xentop/Makefile	2006-08-20 22:15:59.045465667 +0000
+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-22 10:28:30.708189063 +0000
 @@ -25,7 +25,7 @@
  prefix=/usr
  mandir=$(prefix)/share/man
@@ -235,10 +276,10 @@
  
  CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
  LDFLAGS += -L$(XEN_LIBXENSTAT)
-diff -urNad xen-3.0~/tools/xenstore/Makefile xen-3.0/tools/xenstore/Makefile
---- xen-3.0~/tools/xenstore/Makefile	2006-08-18 16:42:45.000000000 +0000
-+++ xen-3.0/tools/xenstore/Makefile	2006-08-20 22:15:59.045465667 +0000
-@@ -157,14 +157,14 @@
+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-22 10:28:30.708189063 +0000
+@@ -174,13 +174,13 @@
  install: all
  	$(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored
  	$(INSTALL_DIR) -p $(DESTDIR)/var/lib/xenstored
@@ -251,22 +292,20 @@
 -	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
 -	$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
 -	$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
--	$(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
 +	$(INSTALL_PROG) xenstored $(DESTDIR)/usr/$(SBINDIR)
 +	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/$(BINDIR)
 +	$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/$(BINDIR)
 +	$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/$(BINDIR)
-+	$(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)/
- 	$(INSTALL_DATA) libxenstore.so $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
- 	$(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
-diff -urNad xen-3.0~/tools/xentrace/Makefile xen-3.0/tools/xentrace/Makefile
---- xen-3.0~/tools/xentrace/Makefile	2006-08-18 16:42:46.000000000 +0000
-+++ xen-3.0/tools/xentrace/Makefile	2006-08-20 22:15:59.045465667 +0000
-@@ -15,17 +15,16 @@
+ 	$(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
+ 	$(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-22 10:28:30.708189063 +0000
+@@ -15,21 +15,20 @@
  OBJS     = $(patsubst %.c,%.o,$(wildcard *.c))
  
- BIN      = xentrace tbctl setsize
+ BIN      = xentrace xentrace_setsize
 -LIBBIN   = 
  SCRIPTS  = xentrace_format
  MAN1     = $(wildcard *.1)
@@ -282,8 +321,13 @@
 +BIN  += xenctx
  endif
  
+ ifeq ($(XEN_TARGET_ARCH),ia64)
+-LIBBIN  += xenctx
++BIN  += xenctx
+ endif
+ 
  .PHONY: all
-@@ -36,21 +35,16 @@
+@@ -40,21 +39,16 @@
  
  .PHONY: install
  install: build
@@ -309,5 +353,4 @@
 +	$(RM) *.a *.so *.o *.rpm $(BIN)
  
  %: %.c $(HDRS) Makefile
--	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
-+	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
+ 	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl

Added: trunk/xen-unstable/debian/patches/qemu-arch.dpatch
==============================================================================
--- (empty file)
+++ trunk/xen-unstable/debian/patches/qemu-arch.dpatch	Tue Aug 22 11:09:22 2006
@@ -0,0 +1,63 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## arch.dpatch by Bastian Blank <waldi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad xen-unstable~/tools/ioemu/configure xen-unstable/tools/ioemu/configure
+--- xen-unstable~/tools/ioemu/configure	2006-08-18 15:35:45.000000000 +0000
++++ xen-unstable/tools/ioemu/configure	2006-08-18 16:19:34.759859866 +0000
+@@ -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"
+   ;;
+-  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)
+     cpu="x86_64"
+     libdir="lib64"
+   ;;
++  powerpc)
++    cpu="powerpc"
++  ;;
+   *)
+     cpu="unknown"
+   ;;

Copied: trunk/xen-unstable/debian/patches/qemu-config.dpatch (from r257, /trunk/xen-3.0/debian/patches/qemu-config.dpatch)
==============================================================================
--- /trunk/xen-3.0/debian/patches/qemu-config.dpatch	(original)
+++ trunk/xen-unstable/debian/patches/qemu-config.dpatch	Tue Aug 22 11:09:22 2006
@@ -5,15 +5,15 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad xen-3.0~/tools/ioemu/configure xen-3.0/tools/ioemu/configure
---- xen-3.0~/tools/ioemu/configure	2006-08-20 22:53:18.791876889 +0000
-+++ xen-3.0/tools/ioemu/configure	2006-08-20 22:53:37.036073313 +0000
-@@ -364,7 +364,7 @@
- datadir="$installroot/$prefix/share/xen-ioemu-$XEN_VERSION_IOEMU/qemu"
- docdir="$installroot/$prefix/share/doc/qemu"
- bindir="$installroot/$prefix/bin"
--configdir="$installroot/etc/xen"
-+configdir="$installroot/etc/xen/scripts"
+diff -urNad xen-unstable~/tools/ioemu/configure xen-unstable/tools/ioemu/configure
+--- xen-unstable~/tools/ioemu/configure	2006-08-22 10:48:53.799578169 +0000
++++ xen-unstable/tools/ioemu/configure	2006-08-22 10:49:09.024735669 +0000
+@@ -517,7 +517,7 @@
+ datadir="$prefix/share/xen-ioemu-$XEN_VERSION_IOEMU/qemu"
+ docdir="$prefix/share/doc/qemu"
+ bindir="$prefix/lib/xen-ioemu-$XEN_VERSION_IOEMU/bin"
+-configdir="/etc/xen"
++configdir="/etc/xen/scripts"
  fi
  
  echo "Install prefix    $prefix"

Modified: trunk/xen-unstable/debian/patches/version.dpatch
==============================================================================
--- trunk/xen-unstable/debian/patches/version.dpatch	(original)
+++ trunk/xen-unstable/debian/patches/version.dpatch	Tue Aug 22 11:09:22 2006
@@ -5,63 +5,165 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad xen-3.0~/xen/Makefile xen-3.0/xen/Makefile
---- xen-3.0~/xen/Makefile	2006-02-23 22:07:49.000000000 +0100
-+++ xen-3.0/xen/Makefile	2006-03-10 23:44:24.978464943 +0100
-@@ -96,6 +96,9 @@
+diff -urNad xen-unstable~/xen/Makefile xen-unstable/xen/Makefile
+--- xen-unstable~/xen/Makefile	2006-08-18 15:35:47.000000000 +0000
++++ xen-unstable/xen/Makefile	2006-08-18 16:22:45.830247330 +0000
+@@ -92,18 +92,18 @@
+ # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
+ include/xen/compile.h: LANG=C
+ include/xen/compile.h: include/xen/compile.h.in
+-	@sed -e 's/@@date@@/$(shell date)/g' \
+-	    -e 's/@@time@@/$(shell date +%T)/g' \
+-	    -e 's/@@whoami@@/$(shell whoami)/g' \
+-	    -e 's/@@domain@@/$(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown]))/g' \
+-	    -e 's/@@hostname@@/$(shell hostname)/g' \
++	@sed -e 's/@@date@@/$(shell LC_ALL=C date)/g' \
++	    -e 's/@@time@@/$(shell LC_ALL=C date +%T)/g' \
+ 	    -e 's|@@compiler@@|$(shell $(CC) $(CFLAGS) -v 2>&1 | tail -n 1 | sed -e "s;|;/;")|g' \
+ 	    -e 's/@@version@@/$(XEN_VERSION)/g' \
  	    -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \
  	    -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
  	    -e 's!@@changeset@@!$(shell ((hg parents || head -n 7 ../ChangeLog || echo date: unavailable) | awk '{FS="changeset:[ ]+"}/^changeset/{CS=$$2};{FS="date:[ ]+"}/^date/{D=$$2}; END {print D, CS}') 2>/dev/null)!g' \
 +	    -e 's/@@system_distribution@@/$(shell lsb_release -is)/g' \
-+	    -e 's/@@system_maintainer@@/$(shell cd ../../../..; dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p')/g' \
++	    -e 's/@@system_maintainer_domain@@/$(shell cd ../../../..; dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<[^@>]*@\([^>]*\)>,\1,p')/g' \
++	    -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
- 	@cat include/xen/banner.h >> $@.new
+-	tools/figlet/figlet -d tools/figlet Xen $(XEN_FULLVERSION) >> $@.new
  	@mv -f $@.new $@
-diff -urNad xen-3.0~/xen/common/kernel.c xen-3.0/xen/common/kernel.c
---- xen-3.0~/xen/common/kernel.c	2006-02-23 22:07:50.000000000 +0100
-+++ xen-3.0/xen/common/kernel.c	2006-03-10 23:44:02.932515123 +0100
-@@ -104,7 +104,7 @@
+ 
+ include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
+diff -urNad xen-unstable~/xen/arch/powerpc/boot_of.c xen-unstable/xen/arch/powerpc/boot_of.c
+--- xen-unstable~/xen/arch/powerpc/boot_of.c	2006-08-18 15:35:46.000000000 +0000
++++ xen-unstable/xen/arch/powerpc/boot_of.c	2006-08-18 16:22:24.124066693 +0000
+@@ -988,9 +988,10 @@
+     of_getprop(bof_chosen, "stdout", &of_out, sizeof (of_out));
+ 
+     of_printf("%s\n", "---------------------------------------------------");
+-    of_printf("OF: Xen/PPC version %d.%d%s (%s@%s) (%s) %s\n",
++    of_printf("OF: Xen/PPC version %d.%d%s (%s %s) (%s@%s) (%s) %s\n",
+               xen_major_version(), xen_minor_version(), xen_extra_version(),
+-              xen_compile_by(), xen_compile_domain(),
++              xen_compile_system_distribution(), xen_compile_system_version(),
++              xen_compile_system_maintainer_local(), xen_compile_system_maintainer_domain(),
+               xen_compiler(), xen_compile_date());
+ 
+     of_printf("%s args: 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx\n"
+diff -urNad xen-unstable~/xen/common/kernel.c xen-unstable/xen/common/kernel.c
+--- xen-unstable~/xen/common/kernel.c	2006-08-18 15:35:47.000000000 +0000
++++ xen-unstable/xen/common/kernel.c	2006-08-18 16:22:24.124066693 +0000
+@@ -141,8 +141,8 @@
      {
          struct xen_compile_info info;
-         safe_strcpy(info.compiler,       XEN_COMPILER);
--        safe_strcpy(info.compile_by,     XEN_COMPILE_BY);
-+        safe_strcpy(info.compile_by,     XEN_COMPILE_SYSTEM_MAINTAINER);
-         safe_strcpy(info.compile_domain, XEN_COMPILE_DOMAIN);
-         safe_strcpy(info.compile_date,   XEN_COMPILE_DATE);
-         if ( copy_to_user(arg, &info, sizeof(info)) )
-diff -urNad xen-3.0~/xen/drivers/char/console.c xen-3.0/xen/drivers/char/console.c
---- xen-3.0~/xen/drivers/char/console.c	2006-02-23 22:07:50.000000000 +0100
-+++ xen-3.0/xen/drivers/char/console.c	2006-03-10 23:44:02.933514984 +0100
-@@ -463,15 +463,11 @@
+         safe_strcpy(info.compiler,       xen_compiler());
+-        safe_strcpy(info.compile_by,     xen_compile_by());
+-        safe_strcpy(info.compile_domain, xen_compile_domain());
++        safe_strcpy(info.compile_by,     xen_compile_system_maintainer_local());
++        safe_strcpy(info.compile_domain, xen_compile_system_maintainer_domain());
+         safe_strcpy(info.compile_date,   xen_compile_date());
+         if ( copy_to_guest(arg, &info, 1) )
+             return -EFAULT;
+diff -urNad xen-unstable~/xen/common/version.c xen-unstable/xen/common/version.c
+--- xen-unstable~/xen/common/version.c	2006-08-18 15:35:47.000000000 +0000
++++ xen-unstable/xen/common/version.c	2006-08-18 16:22:24.124066693 +0000
+@@ -10,19 +10,24 @@
+     return XEN_COMPILE_TIME;
+ }
+ 
+-const char *xen_compile_by(void)
++const char *xen_compile_system_distribution(void)
+ {
+-    return XEN_COMPILE_BY;
++    return XEN_COMPILE_SYSTEM_DISTRIBUTION;
+ }
+ 
+-const char *xen_compile_domain(void)
++const char *xen_compile_system_maintainer_local(void)
+ {
+-    return XEN_COMPILE_DOMAIN;
++    return XEN_COMPILE_SYSTEM_MAINTAINER_LOCAL;
+ }
+ 
+-const char *xen_compile_host(void)
++const char *xen_compile_system_maintainer_domain(void)
+ {
+-    return XEN_COMPILE_HOST;
++    return XEN_COMPILE_SYSTEM_MAINTAINER_DOMAIN;
++}
++
++const char *xen_compile_system_version(void)
++{
++    return XEN_COMPILE_SYSTEM_VERSION;
+ }
  
+ const char *xen_compiler(void)
+@@ -50,7 +55,3 @@
+     return XEN_CHANGESET;
+ }
+ 
+-const char *xen_banner(void)
+-{
+-    return XEN_BANNER;
+-}
+diff -urNad xen-unstable~/xen/drivers/char/console.c xen-unstable/xen/drivers/char/console.c
+--- xen-unstable~/xen/drivers/char/console.c	2006-08-18 15:35:45.000000000 +0000
++++ xen-unstable/xen/drivers/char/console.c	2006-08-18 16:22:24.124066693 +0000
+@@ -463,12 +463,10 @@
      serial_set_rx_handler(sercon_handle, serial_rx);
  
--    /* HELLO WORLD --- start-of-day banner text. */
--    printk(XEN_BANNER);
+     /* HELLO WORLD --- start-of-day banner text. */
+-    printk(xen_banner());
 -    printk(" http://www.cl.cam.ac.uk/netos/xen\n");
 -    printk(" University of Cambridge Computer Laboratory\n\n");
 -    printk(" Xen version %d.%d%s (%s@%s) (%s) %s\n",
-+    printk(" Xen version %d.%d%s (%s %s) (%s) (%s) %s\n",
-            XEN_VERSION, XEN_SUBVERSION, XEN_EXTRAVERSION,
--           XEN_COMPILE_BY, XEN_COMPILE_DOMAIN,
-+           XEN_COMPILE_SYSTEM_DISTRIBUTION, XEN_COMPILE_SYSTEM_VERSION,
-+           XEN_COMPILE_SYSTEM_MAINTAINER,
-            XEN_COMPILER, XEN_COMPILE_DATE);
--    printk(" Latest ChangeSet: %s\n\n", XEN_CHANGESET);
++    printk(" Xen version %d.%d%s (%s %s) (%s@%s) (%s) %s\n",
+            xen_major_version(), xen_minor_version(), xen_extra_version(),
+-           xen_compile_by(), xen_compile_domain(),
++           xen_compile_system_distribution(), xen_compile_system_version(),
++           xen_compile_system_maintainer_local(), xen_compile_system_maintainer_domain(),
+            xen_compiler(), xen_compile_date());
+     printk(" Latest ChangeSet: %s\n\n", xen_changeset());
      set_printk_prefix("(XEN) ");
- 
-     if ( opt_sync_console )
-diff -urNad xen-3.0~/xen/include/xen/compile.h.in xen-3.0/xen/include/xen/compile.h.in
---- xen-3.0~/xen/include/xen/compile.h.in	2006-02-23 22:07:51.000000000 +0100
-+++ xen-3.0/xen/include/xen/compile.h.in	2006-03-10 23:44:02.933514984 +0100
-@@ -3,6 +3,9 @@
- #define XEN_COMPILE_BY		"@@whoami@@"
- #define XEN_COMPILE_DOMAIN	"@@domain@@"
- #define XEN_COMPILE_HOST	"@@hostname@@"
-+#define XEN_COMPILE_SYSTEM_DISTRIBUTION "@@system_distribution@@"
-+#define XEN_COMPILE_SYSTEM_VERSION      "@@system_version@@"
-+#define XEN_COMPILE_SYSTEM_MAINTAINER   "@@system_maintainer@@"
+diff -urNad xen-unstable~/xen/include/xen/compile.h.in xen-unstable/xen/include/xen/compile.h.in
+--- xen-unstable~/xen/include/xen/compile.h.in	2006-08-18 15:35:50.000000000 +0000
++++ xen-unstable/xen/include/xen/compile.h.in	2006-08-18 16:22:54.278450533 +0000
+@@ -1,8 +1,9 @@
+ #define XEN_COMPILE_DATE	"@@date@@"
+ #define XEN_COMPILE_TIME	"@@time@@"
+-#define XEN_COMPILE_BY		"@@whoami@@"
+-#define XEN_COMPILE_DOMAIN	"@@domain@@"
+-#define XEN_COMPILE_HOST	"@@hostname@@"
++#define XEN_COMPILE_SYSTEM_DISTRIBUTION		"@@system_distribution@@"
++#define XEN_COMPILE_SYSTEM_MAINTAINER_DOMAIN	"@@system_maintainer_domain@@"
++#define XEN_COMPILE_SYSTEM_MAINTAINER_LOCAL	"@@system_maintainer_local@@"
++#define XEN_COMPILE_SYSTEM_VERSION		"@@system_version@@"
  #define XEN_COMPILER		"@@compiler@@"
  
  #define XEN_VERSION		@@version@@
+@@ -10,4 +11,3 @@
+ #define XEN_EXTRAVERSION	"@@extraversion@@"
+ 
+ #define XEN_CHANGESET		"@@changeset@@"
+-#define XEN_BANNER		\
+diff -urNad xen-unstable~/xen/include/xen/version.h xen-unstable/xen/include/xen/version.h
+--- xen-unstable~/xen/include/xen/version.h	2006-08-18 15:35:49.000000000 +0000
++++ xen-unstable/xen/include/xen/version.h	2006-08-18 16:22:24.124066693 +0000
+@@ -3,14 +3,14 @@
+ 
+ const char *xen_compile_date(void);
+ const char *xen_compile_time(void);
+-const char *xen_compile_by(void);
+-const char *xen_compile_domain(void);
+-const char *xen_compile_host(void);
++const char *xen_compile_system_distribution(void);
++const char *xen_compile_system_maintainer_domain(void);
++const char *xen_compile_system_maintainer_local(void);
++const char *xen_compile_system_version(void);
+ const char *xen_compiler(void);
+ unsigned int xen_major_version(void);
+ unsigned int xen_minor_version(void);
+ const char *xen_extra_version(void);
+ const char *xen_changeset(void);
+-const char *xen_banner(void);
+ 
+ #endif /* __XEN_VERSION_H__ */

Modified: trunk/xen-unstable/debian/rules
==============================================================================
--- trunk/xen-unstable/debian/rules	(original)
+++ trunk/xen-unstable/debian/rules	Tue Aug 22 11:09:22 2006
@@ -3,198 +3,30 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_HOST_ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-srcver   := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-VERSION  := $(shell echo $(srcver) | sed -e 's,-[^-]*$$,,')
-BUILD_DIR = debian/build
-STAMPS_DIR = debian/stamps
 include debian/rules.defs
+include /usr/src/linux-support-$(KERNELVERSION)/modules/rules.include
 
-export DH_OPTIONS
+VERSION := $(shell dpkg-parsechangelog | perl -ne '/^Version:\s+(\S+)-[^-]+$$/ && print $$1;')
 
-setup: $(STAMPS_DIR)/setup
-$(STAMPS_DIR)/setup: $(BUILD_DIR) $(STAMPS_DIR) setup-docs setup-hypervisor setup-tools
-	dh_testdir
-	touch $@
-
-srcfiles := $(filter-out debian, $(wildcard * .[^.]*))
-$(STAMPS_DIR)/setup-patch:
-	@rm -rf $(BUILD_DIR)/source
-	mkdir $(BUILD_DIR)/source
-	cp -a $(srcfiles) $(BUILD_DIR)/source
-	dpatch -d $(BUILD_DIR)/source apply-all
-	touch $@
-
-$(STAMPS_DIR)/setup-docs: $(STAMPS_DIR)/setup-patch
-	@rm -rf $(BUILD_DIR)/build-docs
-	cp -a $(BUILD_DIR)/source/ $(BUILD_DIR)/build-docs
-	touch $@
-
-$(STAMPS_DIR)/setup-hypervisor-%: $(STAMPS_DIR)/setup-patch
-	@rm -rf $(BUILD_DIR)/build-hypervisor-$*
-	cp -a $(BUILD_DIR)/source/ $(BUILD_DIR)/build-hypervisor-$*
-	touch $@
-
-$(STAMPS_DIR)/setup-tools: $(STAMPS_DIR)/setup-patch
-	@rm -rf $(BUILD_DIR)/build-tools
-	cp -a $(BUILD_DIR)/source/ $(BUILD_DIR)/build-tools
-	touch $@
+GENCONTROL = debian/bin/gencontrol.py $(KERNELVERSION)
 
-build: $(STAMPS_DIR)/build
-$(STAMPS_DIR)/build: $(BUILD_DIR) $(STAMPS_DIR) $(STAMPS_DIR)/setup build-docs build-hypervisor build-tools
+setup: $(STAMPS_DIR)/setup-base
+$(STAMPS_DIR)/setup-base: debian/control $(BUILD_DIR) $(STAMPS_DIR)
 	dh_testdir
+	$(MAKE) -f debian/rules.gen setup-$(DEB_HOST_ARCH)
 	touch $@
 
-build-indep:
+$(BUILD_STAMP): $(STAMPS_DIR)/setup-base
 
-$(STAMPS_DIR)/build-%: DIR=$(BUILD_DIR)/$(@F)
+DIR_ORIG = ../orig/xen-$(MAJOR)-$(VERSION)
 
-$(STAMPS_DIR)/build-docs: $(STAMPS_DIR)/setup-docs
-	$(MAKE) -C $(DIR)/docs
-	touch $@
-
-$(STAMPS_DIR)/build-hypervisor-amd64: $(STAMPS_DIR)/setup-hypervisor-amd64
-	$(MAKE) -C $(DIR)/xen XEN_TARGET_ARCH=x86_64
-	touch $@
-
-$(STAMPS_DIR)/build-hypervisor-i386: $(STAMPS_DIR)/setup-hypervisor-i386
-	$(MAKE) -C $(DIR)/xen XEN_TARGET_ARCH=x86_32
-	touch $@
-
-$(STAMPS_DIR)/build-hypervisor-i386-pae: $(STAMPS_DIR)/setup-hypervisor-i386-pae
-	$(MAKE) -C $(DIR)/xen XEN_TARGET_ARCH=x86_32 XEN_TARGET_X86_PAE=y
-	touch $@
-
-$(STAMPS_DIR)/build-tools: $(STAMPS_DIR)/setup-tools
-	$(MAKE) -C $(DIR)/tools XEN_COMPILE_ARCH=$(XEN_ARCH) XEN_TARGET_ARCH=$(XEN_ARCH)
-	touch $@
-
-setup-docs:: $(STAMPS_DIR)/setup-docs
-build-docs:: $(STAMPS_DIR)/build-docs
-ifneq (,$(filter amd64, $(DEB_HOST_ARCH)))
-build-hypervisor:: $(STAMPS_DIR)/build-hypervisor-amd64
-install-hypervisor:: install-hypervisor-amd64
-setup-hypervisor:: $(STAMPS_DIR)/setup-hypervisor-amd64
-endif
-ifneq (,$(filter i386, $(DEB_HOST_ARCH)))
-build-hypervisor:: $(STAMPS_DIR)/build-hypervisor-i386
-install-hypervisor:: install-hypervisor-i386
-setup-hypervisor:: $(STAMPS_DIR)/setup-hypervisor-i386
-build-hypervisor:: $(STAMPS_DIR)/build-hypervisor-i386-pae
-install-hypervisor:: install-hypervisor-i386-pae
-setup-hypervisor:: $(STAMPS_DIR)/setup-hypervisor-i386-pae
-endif
-ifneq (,$(filter amd64 i386 ia64, $(DEB_HOST_ARCH)))
-ifneq (,$(filter amd64, $(DEB_HOST_ARCH)))
-build-tools install-tools-check: XEN_ARCH=x86_64
-endif
-ifneq (,$(filter i386, $(DEB_HOST_ARCH)))
-build-tools install-tools-check: XEN_ARCH=x86_32
-endif
-build-tools:: $(STAMPS_DIR)/build-tools
-install-tools-check:: install-tools
-setup-tools:: $(STAMPS_DIR)/setup-tools
-endif
-
-$(BUILD_DIR) $(STAMPS_DIR):
-	@[ -d $@ ] || mkdir $@
-
-orig: ../orig/xen-$(MAJOR)-$(VERSION)
-	rsync --delete --exclude debian --exclude .svn --link-dest=../orig/xen-$(MAJOR)-$(VERSION)/ -av ../orig/xen-$(MAJOR)-$(VERSION)/ .
-
-../orig/xen-$(MAJOR)-$(VERSION):
-	if [ -f "../xen-$(MAJOR)_$(VERSION).orig.tar.gz" ]; then \
-	        mkdir -p ../orig; \
-	        tar -C ../orig -xzf ../xen-$(MAJOR)_$(VERSION).orig.tar.gz; \
-	else \
-	        echo "Can't find orig tarball." >&2; \
-	        exit 1; \
-	fi
+orig: $(DIR_ORIG)
+	rsync --delete --exclude debian --exclude .svn --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
 
 # This is to make dpatch-edit-patch work
-unpatch: clean
+unpatch: clean                                 
 
 maintainerclean:
+	rm -f debian/control* debian/rules.gen debian/xen-utils-*
 	rm -rf $(filter-out .svn debian, $(wildcard * .[^.]*))
 
-clean:
-	dh_testdir
-	rm -rf $(BUILD_DIR) $(STAMPS_DIR)
-	dh_clean
-
-install-arch: install-hypervisor install-tools-check
-
-install-indep: install-docs
-
-install-docs: DH_OPTIONS = -pxen-docs-$(MAJOR)
-install-docs:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	$(MAKE) -C $(BUILD_DIR)/build-docs/docs install DESTDIR=$(CURDIR)/debian/tmp
-	dh_install --sourcedir=debian/tmp
-
-install-hypervisor-%:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -pxen-hypervisor-$(MAJOR)-$*
-
-	mkdir debian/xen-hypervisor-$(MAJOR)-$*/boot -p
-	cp $(BUILD_DIR)/build-hypervisor-$*/xen/xen.gz debian/xen-hypervisor-$(MAJOR)-$*/boot/xen-$(MAJOR)-$*.gz
-	#cp $(BUILD_DIR)/build-hypervisor-$*/xen/xen-syms debian/xen-hypervisor-$(MAJOR)-$*/boot/xen-$(MAJOR)-$*.gz
-
-install-tools: DH_OPTIONS = -pxen-utils-$(MAJOR) -pxen-ioemu-$(MAJOR)
-install-tools:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	$(MAKE) -C $(BUILD_DIR)/build-docs/docs install DESTDIR=$(CURDIR)/debian/tmp
-	$(MAKE) -C $(BUILD_DIR)/build-tools/tools install XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=$(CURDIR)/debian/tmp DISTDIR=$(CURDIR)/debian/tmp XEN_COMPILE_ARCH=$(XEN_ARCH) XEN_TARGET_ARCH=$(XEN_ARCH)
-	cp debian/scripts/network-dummy $(CURDIR)/debian/tmp/etc/xen/scripts
-	dh_install --sourcedir=debian/tmp
-
-# Build architecture-independent files here.
-binary-indep: install-indep
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_link -i
-	dh_strip -i
-	dh_compress -i -X.pdf
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_shlibdeps -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: install-arch
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -s
-	dh_installdocs -s
-	dh_installexamples -s
-	dh_installinit -p xen-utils-$(MAJOR) --name xend -- defaults 20 21
-	dh_installinit -p xen-utils-$(MAJOR) --name xendomains --no-restart-on-upgrade -- defaults 21 20
-	dh_installman -s
-	dh_link -s
-	dh_strip -s
-	dh_compress -s
-	dh_fixperms -s
-	dh_pycentral -s
-	dh_python -s
-	dh_makeshlibs -s
-	dh_installdeb -s
-	dh_shlibdeps -s
-	dh_gencontrol -s
-	dh_md5sums -s
-	dh_builddeb -s
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

Modified: trunk/xen-unstable/debian/rules.defs
==============================================================================
--- trunk/xen-unstable/debian/rules.defs	(original)
+++ trunk/xen-unstable/debian/rules.defs	Tue Aug 22 11:09:22 2006
@@ -1 +1,2 @@
-MAJOR    := unstable
+KERNELVERSION := 2.6.17-2
+MAJOR := unstable

More information about the Pkg-xen-changes mailing list