Author: waldi
Date: Fri Aug 18 15:35:20 2006
New Revision: 220
Added:
trunk/xen-unstable/debian/rules.defs
Modified:
trunk/xen-unstable/debian/control
trunk/xen-unstable/debian/rules
Log:
Merge changes from xen-3.0.
Modified: trunk/xen-unstable/debian/control
=============================================================================---
trunk/xen-unstable/debian/control (original)
+++ trunk/xen-unstable/debian/control Fri Aug 18 15:35:20 2006
@@ -3,8 +3,9 @@
Priority: extra
Maintainer: Debian Xen Team <pkg-xen-devel@lists.alioth.debian.org>
Uploaders: Julien Danjou <acid@debian.org>, Jeremy T. Bouse
<jbouse@debian.org>, Guido Trotter <ultrotter@debian.org>, Bastian
Blank <waldi@debian.org>
-Build-Depends: tetex-bin, tetex-extra, gs-common, debhelper (>= 4),
libcurl3-dev | libcurl-dev, python-dev, python (>= 2.2), transfig,
libsdl1.2-dev, libvncserver-dev, libjpeg-dev, bzip2, bcc, dpatch, lsb-release
+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
+XS-Python-Version: current
Package: xen-hypervisor-unstable-amd64
Architecture: amd64
@@ -58,6 +59,7 @@
Recommends: bridge-utils, libc6-xen
Provides: xen-utils
Conflicts: xen-utils, xen, libxen-python, libxen2.0, libxen2.0-dev
+XB-Python-Version: ${python:Versions}
Description: XEN administrative tools
The userspace tools to manage a system virtualized through the XEN virtual
machine monitor.
Modified: trunk/xen-unstable/debian/rules
=============================================================================---
trunk/xen-unstable/debian/rules (original)
+++ trunk/xen-unstable/debian/rules Fri Aug 18 15:35:20 2006
@@ -7,9 +7,9 @@
DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
srcver := $(shell dpkg-parsechangelog | awk ''/^Version:/ {print
$$2}'')
VERSION := $(shell echo $(srcver) | sed -e ''s,-[^-]*$$,,'')
-MAJOR := unstable
BUILD_DIR = debian/build
STAMPS_DIR = debian/stamps
+include debian/rules.defs
export DH_OPTIONS
@@ -66,8 +66,14 @@
$(MAKE) -C $(DIR)/xen XEN_TARGET_ARCH=x86_32 XEN_TARGET_X86_PAE=y
touch $@
+ifneq (,$(filter amd64, $(DEB_HOST_ARCH)))
+$(STAMPS_DIR)/build-tools: XEN_TARGET_ARCH=x86_64
+endif
+ifneq (,$(filter i386, $(DEB_HOST_ARCH)))
+$(STAMPS_DIR)/build-tools: XEN_TARGET_ARCH=x86_32
+endif
$(STAMPS_DIR)/build-tools: $(STAMPS_DIR)/setup-tools
- $(MAKE) -C $(DIR)/tools
+ $(MAKE) -C $(DIR)/tools XEN_TARGET_ARCH=$(XEN_TARGET_ARCH)
touch $@
setup-docs:: $(STAMPS_DIR)/setup-docs
@@ -181,6 +187,7 @@
dh_strip -s
dh_compress -s
dh_fixperms -s
+ dh_pycentral -s
dh_python -s
dh_makeshlibs -s
dh_installdeb -s
Added: trunk/xen-unstable/debian/rules.defs
=============================================================================---
(empty file)
+++ trunk/xen-unstable/debian/rules.defs Fri Aug 18 15:35:20 2006
@@ -0,0 +1 @@
+MAJOR := unstable