Bastian Blank
2010-Jun-04 15:43 UTC
[Pkg-xen-changes] r771 - in trunk/xen: . debian debian/templates
Author: waldi Date: Fri Jun 4 15:43:47 2010 New Revision: 771 Log: Merge /trunk/xen-3. * debian/changelog: Update. Modified: trunk/xen/ (props changed) trunk/xen/debian/changelog trunk/xen/debian/templates/control.source.in trunk/xen/debian/xen-utils.README.Debian Modified: trunk/xen/debian/changelog =============================================================================--- trunk/xen/debian/changelog Fri Jun 4 15:40:34 2010 (r770) +++ trunk/xen/debian/changelog Fri Jun 4 15:43:47 2010 (r771) @@ -1,3 +1,9 @@ +xen (4.0.0-1~experimental.3) UNRELEASED; urgency=low + + * Merge changes from 3.4.3-2. + + -- Bastian Blank <waldi at debian.org> Fri, 04 Jun 2010 17:42:31 +0200 + xen (4.0.0-1~experimental.2) experimental; urgency=low * Merge changes from 3.4.3-1. @@ -14,6 +20,13 @@ -- Bastian Blank <waldi at debian.org> Thu, 06 May 2010 15:47:38 +0200 +xen-3 (3.4.3-2) UNRELEASED; urgency=low + + * Fix spelling in README. + * Remove unnecessary build-depends. + + -- Bastian Blank <waldi at debian.org> Fri, 28 May 2010 12:21:34 +0200 + xen-3 (3.4.3-1) unstable; urgency=low * New upstream version. Modified: trunk/xen/debian/templates/control.source.in =============================================================================--- trunk/xen/debian/templates/control.source.in Fri Jun 4 15:40:34 2010 (r770) +++ trunk/xen/debian/templates/control.source.in Fri Jun 4 15:43:47 2010 (r771) @@ -9,11 +9,8 @@ gcc-multilib, e2fslibs-dev, iasl, - libgnutls-dev, pkg-config, - libjpeg-dev, + libgcrypt-dev, libncurses5-dev, - libsdl1.2-dev, - libvncserver-dev, uuid-dev, zlib1g-dev Build-Depends-Indep: graphviz, gs-common, texlive-fonts-recommended, texlive-latex-recommended Modified: trunk/xen/debian/xen-utils.README.Debian =============================================================================--- trunk/xen/debian/xen-utils.README.Debian Fri Jun 4 15:40:34 2010 (r770) +++ trunk/xen/debian/xen-utils.README.Debian Fri Jun 4 15:43:47 2010 (r771) @@ -6,9 +6,9 @@ The Debian packages changes the behaviour of some config options. -The options "kernel", "initrd" and "loader" searchs in the Xen private boot +The options "kernel", "initrd" and "loader" searches in the Xen private boot directory (/usr/lib/xen-$version/boot) first. "bootloader" and "device_model" -also searchs the Xen private bin directory (/usr/lib/xen-$version/bin). This +also searches the Xen private bin directory (/usr/lib/xen-$version/bin). This means that the following entries will properly find anything: loader = ''hvmloader'' bootloader = ''pygrub'' @@ -23,7 +23,7 @@ To setup a bridge please follow the instructions in the manpage for bridge-utils-interfaces(5). -You can also change the /etc/xen/xend-config.sxp file and reenable the Xen +You can also change the /etc/xen/xend-config.sxp file and re-enable the Xen included network setup by adding (network-script network-bridge) to the file. But please note that this may or may not work.