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

[Bastian Blank]

Author: waldi
Date: 2006-03-22 18:35:05 +0000 (Wed, 22 Mar 2006)
New Revision: 140

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:
Merge /trunk/xen-unstable.


Modified: trunk/xen-3.0/debian/control
===================================================================
--- trunk/xen-3.0/debian/control	2006-03-22 18:33:56 UTC (rev 139)
+++ trunk/xen-3.0/debian/control	2006-03-22 18:35:05 UTC (rev 140)
@@ -3,8 +3,8 @@
 Priority: extra
 Maintainer: Debian Xen Team <pkg-xen-devel at lists.alioth.debian.org>
 Uploaders: Julien Danjou <acid at debian.org>, Jeremy T. Bouse <jbouse at debian.org>, Guido Trotter <ultrotter at debian.org>, Bastian Blank <waldi at 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
 Standards-Version: 3.6.2.2
-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
 
 Package: xen-hypervisor-3.0-amd64
 Architecture: amd64
@@ -20,7 +20,6 @@
  to build it can be found in the xen-docs package.
 
 Package: xen-hypervisor-3.0-i386
-Section: misc
 Architecture: i386
 Provides: xen-hypervisor, xen-hypervisor-3.0, xen-hypervisor-i386
 Description: The Xen Hypervisor for i386
@@ -34,7 +33,6 @@
  to build it can be found in the xen-docs package.
 
 Package: xen-hypervisor-3.0-i386-pae
-Section: misc
 Architecture: i386
 Provides: xen-hypervisor, xen-hypervisor-3.0, xen-hypervisor-i386-pae
 Description: The Xen Hypervisor for i386 (pae enabled version)
@@ -48,19 +46,16 @@
  to build it can be found in the xen-docs package.
 
 Package: xen-utils-3.0
-Section: misc
-Architecture: i386 amd64
-Depends: xen-hypervisor-3.0, python-twisted, iproute, udev (>> 0.060), ${shlibs:Depends}, ${python:Depends}
+Architecture: amd64 i386
+Depends: ${shlibs:Depends}, ${python:Depends}, xen-hypervisor-3.0, iproute, udev (>> 0.060)
 Recommends: bridge-utils
 Provides: xen-utils
-Conflicts: xen, libxen-python, libxen2.0, libxen2.0-dev
-Replaces: xen, libxen-python, libxen2.0, libxen2.0-dev
+Conflicts: xen-utils, xen, libxen-python, libxen2.0, libxen2.0-dev
 Description: XEN administrative tools
  The userspace tools to manage a system virtualized through the XEN virtual
  machine monitor.
 
 Package: xen-docs-3.0
-Section: misc
 Architecture: all
 Description: documentation for XEN, a Virtual Machine Monitor
  This package contains all the large documentation files for XEN.  This

Modified: trunk/xen-3.0/debian/patches/00list
===================================================================
--- trunk/xen-3.0/debian/patches/00list	2006-03-22 18:33:56 UTC (rev 139)
+++ trunk/xen-3.0/debian/patches/00list	2006-03-22 18:35:05 UTC (rev 140)
@@ -1,6 +1,4 @@
-10sysconfig
 libdir
 manpages
 version
 compile_date
-init.d

Modified: trunk/xen-3.0/debian/rules
===================================================================
--- trunk/xen-3.0/debian/rules	2006-03-22 18:33:56 UTC (rev 139)
+++ trunk/xen-3.0/debian/rules	2006-03-22 18:35:05 UTC (rev 140)
@@ -155,7 +155,7 @@
 	dh_installexamples -i
 	dh_link -i
 	dh_strip -i
-	dh_compress -i
+	dh_compress -i -X.pdf
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_shlibdeps -i
@@ -170,8 +170,8 @@
 	dh_installchangelogs -s
 	dh_installdocs -s
 	dh_installexamples -s
-	dh_installinit -p xen-utils-$(MAJOR) --name xend -- 21 20
-	dh_installinit -p xen-utils-$(MAJOR) --name xendomains -- 20 21
+	dh_installinit -p xen-utils-$(MAJOR) --name xend -- defaults 20 21
+	dh_installinit -p xen-utils-$(MAJOR) --name xendomains -- defaults 21 20
 	dh_installman -s
 	dh_link -s
 	dh_strip -s

Modified: trunk/xen-3.0/debian/xen-utils-3.0.install
===================================================================
--- trunk/xen-3.0/debian/xen-utils-3.0.install	2006-03-22 18:33:56 UTC (rev 139)
+++ trunk/xen-3.0/debian/xen-utils-3.0.install	2006-03-22 18:35:05 UTC (rev 140)
@@ -2,28 +2,16 @@
 etc/xen/auto
 etc/xen/scripts
 etc/xen/xend*
-etc/init.d/xend
-etc/init.d/xendomains
-etc/default/xendomains
+usr/bin/xenstore*
 usr/lib/python2.3
 usr/lib/xen/bin/xc*
 usr/lib/xen/bin/xen*
 usr/lib/xen/*.so
-usr/bin/xenstore*
-usr/bin/setsize
-usr/bin/tbctl
-usr/bin/xenperf
-usr/bin/xencons
-usr/bin/xc_shadow
-usr/bin/xentrace*
 usr/sbin/xenconsoled
 usr/sbin/xend
 usr/sbin/xenstored
 usr/sbin/xentop
 usr/sbin/xm
-usr/sbin/xenbaked
-usr/sbin/xen-bugtool
-usr/sbin/xenmon.py
 usr/share/man/man5
-usr/share/man/man8
-usr/share/xen/qemu
+usr/share/man/man8/xentop.8
+usr/share/man/man8/xm.8