Bastian Blank
2006-Mar-09 21:46 UTC
[Pkg-xen-changes] r96 - in trunk/xen-3.0/debian: . patches
Author: waldi
Date: 2006-03-09 21:46:05 +0000 (Thu, 09 Mar 2006)
New Revision: 96
Removed:
trunk/xen-3.0/debian/libxen-dev.install
trunk/xen-3.0/debian/libxen-python.install
trunk/xen-3.0/debian/libxen3.0.install
Modified:
trunk/xen-3.0/debian/control
trunk/xen-3.0/debian/patches/00list
trunk/xen-3.0/debian/rules
trunk/xen-3.0/debian/xen-utils-3.0.install
Log:
* debian/control
- Remove libxen3.0, libxen-dev, libxen-python packages.
- Fix dependencies of xen-utils-3.0.
* debian/libxen3.0.install, debian/libxen-dev.install,
debian/libxen-python.install: Remove.
* debian/patches/00list: Add libdir patch.
* debian/rules
- Only build xen-utils-3.0.
- Remove LIBDIR workaround.
* debian/xen-utils-3.0.install: Update to only contain non-ioemu files.
Modified: trunk/xen-3.0/debian/control
==================================================================---
trunk/xen-3.0/debian/control 2006-03-09 21:29:29 UTC (rev 95)
+++ trunk/xen-3.0/debian/control 2006-03-09 21:46:05 UTC (rev 96)
@@ -50,7 +50,7 @@
Package: xen-utils-3.0
Section: misc
Architecture: i386 amd64
-Depends: xen-hypervisor-3.0, python-twisted, python, libxen-python, iproute,
hotplug | udev, ${shlibs:Depends}, ${python:Depends}
+Depends: xen-hypervisor-3.0, python-twisted, iproute, hotplug | udev,
${shlibs:Depends}, ${python:Depends}
Recommends: bridge-utils
Provides: xen-utils
Conflicts: udev (<< 0.059)
@@ -58,23 +58,6 @@
The userspace tools to manage a system virtualized through the XEN virtual
machine monitor.
-Package: libxen3.0
-Section: libs
-Architecture: i386 amd64
-Depends: ${shlibs:Depends}
-Conflicts: xen-docs (<= 1.2), libxen2.0
-Description: control library for XEN, a Virtual Machine Monitor
- Library to control the XEN microkernel. Contains functions for creating,
- starting, stopping, saving, virtual instances.
-
-Package: libxen-dev
-Section: libdevel
-Architecture: i386 amd64
-Depends: libxen3.0 (= ${Source-Version})
-Description: development files for the control library for XEN
- Users wishing to develop their own tools for interfaces to the underlying
- XEN kernel should install this package.
-
Package: xen-docs-3.0
Section: misc
Architecture: all
@@ -83,11 +66,3 @@
includes a description interface(both the api, and a nice explanation of
how XEN works). It also contains the VBD and Xeno howtos.
-Package: libxen-python
-Section: python
-Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${python:Depends}
-Description: python wrapper around libxc, the control library for XEN
- This python library wraps the C library, and provides a nice OO interface
- to the low-level system calls. It also provides some higher-level config
- file parsing.
Deleted: trunk/xen-3.0/debian/libxen-dev.install
==================================================================---
trunk/xen-3.0/debian/libxen-dev.install 2006-03-09 21:29:29 UTC (rev 95)
+++ trunk/xen-3.0/debian/libxen-dev.install 2006-03-09 21:46:05 UTC (rev 96)
@@ -1,7 +0,0 @@
-usr/include/*.h
-usr/include/xen/*.h
-usr/include/xen/io/*.h
-usr/include/xen/linux/*.h
-usr/lib/*.a
-usr/lib/libxenctrl.so
-usr/lib/libxenguest.so
Deleted: trunk/xen-3.0/debian/libxen-python.install
==================================================================---
trunk/xen-3.0/debian/libxen-python.install 2006-03-09 21:29:29 UTC (rev 95)
+++ trunk/xen-3.0/debian/libxen-python.install 2006-03-09 21:46:05 UTC (rev 96)
@@ -1,8 +0,0 @@
-usr/lib/python2.3/site-packages/xen/__init__.py
-usr/lib/python2.3/site-packages/xen/lowlevel
-usr/lib/python2.3/site-packages/xen/web
-usr/lib/python2.3/site-packages/grub
-usr/lib/python2.3/site-packages/xen/xend
-usr/lib/python2.3/site-packages/xen/sv
-usr/lib/python2.3/site-packages/xen/xm
-usr/lib/python2.3/site-packages/xen/util
Deleted: trunk/xen-3.0/debian/libxen3.0.install
==================================================================---
trunk/xen-3.0/debian/libxen3.0.install 2006-03-09 21:29:29 UTC (rev 95)
+++ trunk/xen-3.0/debian/libxen3.0.install 2006-03-09 21:46:05 UTC (rev 96)
@@ -1,5 +0,0 @@
-usr/lib/*.so.3.0
-usr/lib/*.so.3.0.0
-usr/lib/libxenstore.so
-usr/lib/xen/bin
-usr/lib/xen/boot
Modified: trunk/xen-3.0/debian/patches/00list
==================================================================---
trunk/xen-3.0/debian/patches/00list 2006-03-09 21:29:29 UTC (rev 95)
+++ trunk/xen-3.0/debian/patches/00list 2006-03-09 21:46:05 UTC (rev 96)
@@ -1,2 +1,3 @@
10sysconfig
40force-reload
+libdir
Modified: trunk/xen-3.0/debian/rules
==================================================================---
trunk/xen-3.0/debian/rules 2006-03-09 21:29:29 UTC (rev 95)
+++ trunk/xen-3.0/debian/rules 2006-03-09 21:46:05 UTC (rev 96)
@@ -129,13 +129,13 @@
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 = -plibxen3.0 -plibxen3.0-dev -plibxen3.0-python
-pxen-utils-3.0
+install-tools: DH_OPTIONS = -pxen-utils-$(MAJOR)
install-tools:
dh_testdir
dh_testroot
dh_clean
- $(MAKE) -C $(BUILD_DIR)/build-tools/tools install XEN_PYTHON_NATIVE_INSTALL=1
DESTDIR=$(CURDIR)/debian/tmp DISTDIR=$(CURDIR)/debian/tmp LIBDIR=lib
+ $(MAKE) -C $(BUILD_DIR)/build-tools/tools install XEN_PYTHON_NATIVE_INSTALL=1
DESTDIR=$(CURDIR)/debian/tmp DISTDIR=$(CURDIR)/debian/tmp
dh_install --sourcedir=debian/tmp
# Build architecture-independent files here.
@@ -172,7 +172,7 @@
dh_python -s
dh_makeshlibs -s
dh_installdeb -s
- dh_shlibdeps -s -L libxen$(MAJOR)
+ dh_shlibdeps -s
dh_gencontrol -s
dh_md5sums -s
dh_builddeb -s
Modified: trunk/xen-3.0/debian/xen-utils-3.0.install
==================================================================---
trunk/xen-3.0/debian/xen-utils-3.0.install 2006-03-09 21:29:29 UTC (rev 95)
+++ trunk/xen-3.0/debian/xen-utils-3.0.install 2006-03-09 21:46:05 UTC (rev 96)
@@ -1,5 +1,10 @@
etc/udev/*.rules
-etc/xen
+etc/xen/auto
+etc/xen/scripts
+etc/xen/xend*
usr/bin
+usr/lib/python2.3
+usr/lib/xen/bin/xc*
+usr/lib/xen/bin/xen*
+usr/lib/xen/*.so
usr/sbin
-usr/share/xen/qemu/keymaps