Author: ultrotter
Date: 2006-02-18 09:56:32 +0000 (Sat, 18 Feb 2006)
New Revision: 18
Added:
trunk/debian/patches/20lib64.dpatch
Modified:
trunk/debian/changelog
trunk/debian/control
trunk/debian/patches/00list
trunk/debian/rules
Log:
- Remove the "| xen-hypervisor-pae" dependency from xen, as
xen-hypervisor-pae provides xen-hypervisor
- Add the amd64 library path patch, as written by me and tested by Raplh
- Remove Ralph''s "move libraries" hook from debian/rules
- Update the changelog a bit, saying what other modifications we''re in
the process of doing
Modified: trunk/debian/changelog
==================================================================---
trunk/debian/changelog 2006-02-18 00:45:56 UTC (rev 17)
+++ trunk/debian/changelog 2006-02-18 09:56:32 UTC (rev 18)
@@ -3,6 +3,8 @@
* New upstream release (closes: #32749, #342249)
* Build depend on transfig (closes: #321157)
* Use gcc rather than gcc-3.4 to compile (closes: #323698)
+ * Split xen-hypervisor and xen-utils
+ * Build both xen-hypervisor and xen-hypervisor-pae packages
* Julien Danjou <acid@debian.org>
- Change maintainer and add uploaders field
* Guido Trotter <ultrotter@debian.org>
Modified: trunk/debian/control
==================================================================---
trunk/debian/control 2006-02-18 00:45:56 UTC (rev 17)
+++ trunk/debian/control 2006-02-18 09:56:32 UTC (rev 18)
@@ -9,7 +9,7 @@
Package: xen
Section: misc
Architecture: i386 amd64
-Depends: xen-utils, xen-hypervisor | xen-hypervisor-pae
+Depends: xen-utils, xen-hypervisor
Description: a Virtual Machine Monitor like VMWare or plex86
XEN is a Virtual Machine Monitor (VMM) originally developed by the
Systems Research Group of the University of Cambridge Computer
Modified: trunk/debian/patches/00list
==================================================================---
trunk/debian/patches/00list 2006-02-18 00:45:56 UTC (rev 17)
+++ trunk/debian/patches/00list 2006-02-18 09:56:32 UTC (rev 18)
@@ -1 +1,2 @@
10sysconfig
+20lib64
Added: trunk/debian/patches/20lib64.dpatch
==================================================================---
trunk/debian/patches/20lib64.dpatch 2006-02-18 00:45:56 UTC (rev 17)
+++ trunk/debian/patches/20lib64.dpatch 2006-02-18 09:56:32 UTC (rev 18)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-lib64.dpatch by <root@xeno.tixteam.net>
+##
+## All lines beginning with `## DP:'' are a description of the patch.
+## DP: Install under lib, rather than lib64, on amd64
+
+@DPATCH@
+diff -urNad xen-3.0.1+hg8743/Config.mk
/tmp/dpep.2asBvw/xen-3.0.1+hg8743/Config.mk
+--- xen-3.0.1+hg8743/Config.mk 2006-02-17 11:07:17.000000000 +0100
++++ /tmp/dpep.2asBvw/xen-3.0.1+hg8743/Config.mk 2006-02-18 10:42:35.000000000
+0100
+@@ -27,11 +27,7 @@
+ INSTALL_DATA = $(INSTALL) -m0644
+ INSTALL_PROG = $(INSTALL) -m0755
+
+-ifeq ($(XEN_TARGET_ARCH),x86_64)
+-LIBDIR = lib64
+-else
+ LIBDIR = lib
+-endif
+
+ ifneq ($(EXTRA_PREFIX),)
+ EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
+
Property changes on: trunk/debian/patches/20lib64.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/debian/rules
==================================================================---
trunk/debian/rules 2006-02-18 00:45:56 UTC (rev 17)
+++ trunk/debian/rules 2006-02-18 09:56:32 UTC (rev 18)
@@ -55,10 +55,6 @@
dh_clean -k
dh_testdir
dh_testroot
- (if [ "$(DEB_BUILD_ARCH)" == "amd64" ]; then \
- cp -a $(CURDIR)/debian/install/usr/lib64/* $(CURDIR)/debian/install/usr/lib/;
\
- rm -rf $(CURDIR)/debian/install/usr/lib64 ;\
- fi)
dh_install -N xen-docs --sourcedir=$(CURDIR)/debian/install --list-missing
dh_install -p xen-docs -X examples --sourcedir=$(CURDIR)/debian/install
dh_installdocs