Bastian Blank
2006-Aug-23 21:07 UTC
[Pkg-xen-changes] r277 - trunk/xen-unstable/debian/patches
Author: waldi
Date: Wed Aug 23 21:07:13 2006
New Revision: 277
Modified:
trunk/xen-unstable/debian/patches/prefix-utils.dpatch
Log:
debian/patches/prefix-utils.dpatch: Install pygrub into correct location.
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 Wed Aug 23 21:07:13
2006
@@ -8,7 +8,7 @@
@DPATCH@
diff -urNad xen-unstable~/Config.mk xen-unstable/Config.mk
--- xen-unstable~/Config.mk 2006-08-22 09:56:42.000000000 +0000
-+++ xen-unstable/Config.mk 2006-08-22 12:34:47.773260049 +0000
++++ xen-unstable/Config.mk 2006-08-23 21:01:36.111549753 +0000
@@ -43,6 +43,10 @@
include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
@@ -22,7 +22,7 @@
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 12:34:47.773260049 +0000
++++ xen-unstable/config/ia64.mk 2006-08-23 21:01:36.111549753 +0000
@@ -1,5 +1,3 @@
CONFIG_IA64 := y
CONFIG_IOEMU := y
@@ -31,7 +31,7 @@
-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 12:34:47.773260049 +0000
++++ xen-unstable/config/powerpc64.mk 2006-08-23 21:01:36.111549753 +0000
@@ -1,4 +1,3 @@
CONFIG_POWERPC := y
@@ -39,7 +39,7 @@
-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 12:34:47.773260049 +0000
++++ xen-unstable/config/x86_32.mk 2006-08-23 21:01:36.111549753 +0000
@@ -6,4 +6,3 @@
CONFIG_MBOOTPACK := y
@@ -47,7 +47,7 @@
-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 12:34:47.773260049 +0000
++++ xen-unstable/config/x86_64.mk 2006-08-23 21:01:36.111549753 +0000
@@ -6,4 +6,3 @@
CONFIG_MBOOTPACK := y
@@ -55,7 +55,7 @@
-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 12:34:47.773260049 +0000
++++ xen-unstable/tools/Rules.mk 2006-08-23 21:01:36.111549753 +0000
@@ -12,6 +12,9 @@
XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore
XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src
@@ -68,7 +68,7 @@
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 12:34:47.773260049
+0000
++++ xen-unstable/tools/blktap/drivers/Makefile 2006-08-23 21:01:36.111549753
+0000
@@ -7,7 +7,7 @@
INSTALL_PROG = $(INSTALL) -m0755
IBIN = blktapctrl tapdisk
@@ -94,7 +94,7 @@
qcow-util: img2qcow qcow2raw qcow-create
diff -urNad xen-unstable~/tools/console/Makefile
xen-unstable/tools/console/Makefile
--- xen-unstable~/tools/console/Makefile 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/console/Makefile 2006-08-22 12:34:47.773260049 +0000
++++ xen-unstable/tools/console/Makefile 2006-08-23 21:01:36.111549753 +0000
@@ -2,8 +2,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -129,7 +129,7 @@
+ $(INSTALL_PROG) xenconsole $(DESTDIR)/$(DIR)
diff -urNad xen-unstable~/tools/misc/Makefile xen-unstable/tools/misc/Makefile
--- xen-unstable~/tools/misc/Makefile 2006-08-22 09:56:46.000000000 +0000
-+++ xen-unstable/tools/misc/Makefile 2006-08-22 12:35:00.871373487 +0000
++++ xen-unstable/tools/misc/Makefile 2006-08-23 21:01:36.111549753 +0000
@@ -16,7 +16,7 @@
TARGETS = xenperf xc_shadow
@@ -160,7 +160,7 @@
+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
diff -urNad xen-unstable~/tools/misc/cpuperf/Makefile
xen-unstable/tools/misc/cpuperf/Makefile
--- xen-unstable~/tools/misc/cpuperf/Makefile 2006-08-22 09:56:46.000000000
+0000
-+++ xen-unstable/tools/misc/cpuperf/Makefile 2006-08-22 12:34:47.773260049
+0000
++++ xen-unstable/tools/misc/cpuperf/Makefile 2006-08-23 21:01:36.111549753
+0000
@@ -37,14 +37,14 @@
$(CC) $(CFLAGS) -o $@ $<
@@ -180,7 +180,7 @@
# End of $RCSfile: Makefile,v $
diff -urNad xen-unstable~/tools/misc/lomount/Makefile
xen-unstable/tools/misc/lomount/Makefile
--- xen-unstable~/tools/misc/lomount/Makefile 2006-08-22 09:56:46.000000000
+0000
-+++ xen-unstable/tools/misc/lomount/Makefile 2006-08-22 12:34:47.773260049
+0000
++++ xen-unstable/tools/misc/lomount/Makefile 2006-08-23 21:01:36.111549753
+0000
@@ -21,7 +21,7 @@
.PHONY: install
@@ -192,19 +192,19 @@
clean:
diff -urNad xen-unstable~/tools/pygrub/Makefile
xen-unstable/tools/pygrub/Makefile
--- xen-unstable~/tools/pygrub/Makefile 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/pygrub/Makefile 2006-08-22 12:34:47.773260049 +0000
++++ xen-unstable/tools/pygrub/Makefile 2006-08-23 21:02:57.694825780 +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
++ CFLAGS="$(CFLAGS)" python setup.py install
--home="$(DESTDIR)/usr/$(LIBDIR)"
--install-lib=$(DESTDIR)/usr/$(LIBDIR)/python
--install-scripts=$(DESTDIR)/usr/$(BINDIR)
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-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/python/Makefile 2006-08-22 12:34:47.773260049 +0000
++++ xen-unstable/tools/python/Makefile 2006-08-23 21:01:36.111549753 +0000
@@ -6,15 +6,15 @@
.PHONY: build
@@ -226,7 +226,7 @@
.PHONY: test
diff -urNad xen-unstable~/tools/python/setup.py
xen-unstable/tools/python/setup.py
--- xen-unstable~/tools/python/setup.py 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/python/setup.py 2006-08-22 12:34:47.773260049 +0000
++++ xen-unstable/tools/python/setup.py 2006-08-23 21:01:36.111549753 +0000
@@ -5,6 +5,8 @@
XEN_ROOT = "../.."
@@ -262,7 +262,7 @@
libraries = libraries,
diff -urNad xen-unstable~/tools/xcutils/Makefile
xen-unstable/tools/xcutils/Makefile
--- xen-unstable~/tools/xcutils/Makefile 2006-08-22 09:56:47.000000000 +0000
-+++ xen-unstable/tools/xcutils/Makefile 2006-08-22 12:34:47.773260049 +0000
++++ xen-unstable/tools/xcutils/Makefile 2006-08-23 21:01:36.111549753 +0000
@@ -15,7 +15,7 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -274,7 +274,7 @@
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 12:34:47.773260049 +0000
++++ xen-unstable/tools/xenmon/Makefile 2006-08-23 21:01:36.111549753 +0000
@@ -15,8 +15,6 @@
INSTALL_DIR = $(INSTALL) -d -m0755
INSTALL_DATA = $(INSTALL) -m0644
@@ -301,7 +301,7 @@
clean:
diff -urNad xen-unstable~/tools/xenstat/xentop/Makefile
xen-unstable/tools/xenstat/xentop/Makefile
--- xen-unstable~/tools/xenstat/xentop/Makefile 2006-08-22 09:56:47.000000000
+0000
-+++ xen-unstable/tools/xenstat/xentop/Makefile 2006-08-22 12:34:47.773260049
+0000
++++ xen-unstable/tools/xenstat/xentop/Makefile 2006-08-23 21:01:36.111549753
+0000
@@ -25,7 +25,6 @@
prefix=/usr
mandir=$(prefix)/share/man
@@ -321,7 +321,7 @@
endif
diff -urNad xen-unstable~/tools/xenstore/Makefile
xen-unstable/tools/xenstore/Makefile
--- xen-unstable~/tools/xenstore/Makefile 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/xenstore/Makefile 2006-08-22 12:34:47.773260049 +0000
++++ xen-unstable/tools/xenstore/Makefile 2006-08-23 21:01:36.111549753 +0000
@@ -174,13 +174,12 @@
install: all
$(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored
@@ -343,7 +343,7 @@
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 12:34:47.773260049 +0000
++++ xen-unstable/tools/xentrace/Makefile 2006-08-23 21:01:36.111549753 +0000
@@ -15,21 +15,20 @@
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))