[Pkg-xen-changes] r238 - in trunk/xen-3.0/debian: patches

[Bastian Blank]

Author: waldi
Date: Sun Aug 20 23:07:26 2006
New Revision: 238

Added:
   trunk/xen-3.0/debian/patches/qemu-config.dpatch   (contents, props changed)
Modified:
   trunk/xen-3.0/debian/patches/00list
   trunk/xen-3.0/debian/rules.real

Log:
Move qemu-ifup into /etc/xen/scripts.

* debian/patches/00list: Add qemu-config.
* debian/patches/qemu-config.dpatch: Add.
* debian/rules.real: Fix location.


Modified: trunk/xen-3.0/debian/patches/00list
==============================================================================
--- trunk/xen-3.0/debian/patches/00list	(original)
+++ trunk/xen-3.0/debian/patches/00list	Sun Aug 20 23:07:26 2006
@@ -3,3 +3,4 @@
 manpages
 version
 default-network
+qemu-config

Added: trunk/xen-3.0/debian/patches/qemu-config.dpatch
==============================================================================
--- (empty file)
+++ trunk/xen-3.0/debian/patches/qemu-config.dpatch	Sun Aug 20 23:07:26 2006
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## qemu-config.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-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"
+ fi
+ 
+ echo "Install prefix    $prefix"

Modified: trunk/xen-3.0/debian/rules.real
==============================================================================
--- trunk/xen-3.0/debian/rules.real	(original)
+++ trunk/xen-3.0/debian/rules.real	Sun Aug 20 23:07:26 2006
@@ -113,7 +113,7 @@
 	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp usr/in/xenstore* usr/bin
 	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp usr/lib/xen-$(VERSION)$(ABINAME) usr/lib
 	# TODO: move to xen-common and /etc/xen/scripts
-	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp etc/xen/qemu-ifup etc/xen
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp etc/xen/scripts/qemu-ifup etc/xen
 	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp usr/lib/xen-ioemu-$(MAJOR) usr/lib
 	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp usr/share/xen-ioemu-$(MAJOR) usr/share
 	dh_pycentral