[Pkg-xen-changes] r1039 - in trunk/xen/debian: . scripts templates

[Bastian Blank]

Author: waldi
Date: Sun Jun 17 21:53:54 2012
New Revision: 1039

Log:
* debian/changelog: Update.
* debian/templates/xen-utils.postinst.in, debian/templates/xen-utils.prerm.in:
  Remove xen-default alternative always.
* debian/scripts/xen-dir: Don't longer use default version.

Modified:
   trunk/xen/debian/changelog
   trunk/xen/debian/scripts/xen-dir
   trunk/xen/debian/templates/xen-utils.postinst.in
   trunk/xen/debian/templates/xen-utils.prerm.in

Modified: trunk/xen/debian/changelog
==============================================================================
--- trunk/xen/debian/changelog	Fri Jun 15 16:39:40 2012	(r1038)
+++ trunk/xen/debian/changelog	Sun Jun 17 21:53:54 2012	(r1039)
@@ -1,3 +1,9 @@
+xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-3) UNRELEASED; urgency=low
+
+  * Remove /usr/lib/xen-default.
+
+ -- Bastian Blank <waldi at debian.org>  Sun, 17 Jun 2012 23:52:46 +0200
+
 xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-2) unstable; urgency=low
 
   * Fix pointer missmatch in interrupt functions. Fixes build on i386.

Modified: trunk/xen/debian/scripts/xen-dir
==============================================================================
--- trunk/xen/debian/scripts/xen-dir	Fri Jun 15 16:39:40 2012	(r1038)
+++ trunk/xen/debian/scripts/xen-dir	Sun Jun 17 21:53:54 2012	(r1039)
@@ -4,10 +4,7 @@
 
 if [ -d "/usr/lib/xen-$VERSION" ]; then
     echo "/usr/lib/xen-$VERSION"
-elif [ -d "/usr/lib/xen-default" ]; then
-    echo "WARING:  Can't find version $VERSION of xen utils, fallback to default version!" >&2
-    echo "/usr/lib/xen-default"
 else
-    echo "ERROR:  Can't find default version of xen utils, bailing out!" >&2
+    echo "ERROR:  Can't find version $VERSION of xen utils, bailing out!" >&2
     exit 127
 fi

Modified: trunk/xen/debian/templates/xen-utils.postinst.in
==============================================================================
--- trunk/xen/debian/templates/xen-utils.postinst.in	Fri Jun 15 16:39:40 2012	(r1038)
+++ trunk/xen/debian/templates/xen-utils.postinst.in	Sun Jun 17 21:53:54 2012	(r1039)
@@ -4,7 +4,7 @@
 
 case "$1" in
     configure)
-        update-alternatives --install /usr/lib/xen-default xen-default /usr/lib/xen- at version@ 1 || true
+        update-alternatives --remove xen-default /usr/lib/xen- at version@
         if [ -x "/etc/init.d/xend" ]; then
 	    invoke-rc.d xend start || exit $?
         fi

Modified: trunk/xen/debian/templates/xen-utils.prerm.in
==============================================================================
--- trunk/xen/debian/templates/xen-utils.prerm.in	Fri Jun 15 16:39:40 2012	(r1038)
+++ trunk/xen/debian/templates/xen-utils.prerm.in	Sun Jun 17 21:53:54 2012	(r1039)
@@ -3,17 +3,11 @@
 set -e
 
 case "$1" in
-    remove)
+    remove|upgrade)
         update-alternatives --remove xen-default /usr/lib/xen- at version@
         if [ -x "/etc/init.d/xend" ]; then
             invoke-rc.d xend stop || exit $?
         fi
-    ;;
-
-    upgrade)
-        if [ -x "/etc/init.d/xend" ]; then
-            invoke-rc.d xend stop || exit $?
-        fi
     ;;
 
     deconfigure|failed-upgrade)