[Pkg-xen-changes] r786 - in trunk/xen-common/debian: . scripts

[Bastian Blank]

Author: waldi
Date: Mon Jun 21 15:02:31 2010
New Revision: 786

Log:
* debian/changelog: Update.
* debian/scripts/xen-version: Support ABI.

Modified:
   trunk/xen-common/debian/changelog
   trunk/xen-common/debian/scripts/xen-version

Modified: trunk/xen-common/debian/changelog
==============================================================================
--- trunk/xen-common/debian/changelog	Mon Jun 21 14:40:12 2010	(r785)
+++ trunk/xen-common/debian/changelog	Mon Jun 21 15:02:31 2010	(r786)
@@ -3,6 +3,7 @@
   * New upstream version.
   * Move README from versioned packages.
   * Add note about own README to xend config.
+  * Again support versions with ABI used up to Lenny. (closes: #584804)
 
  -- Bastian Blank <waldi at debian.org>  Mon, 21 Jun 2010 15:46:15 +0200
 

Modified: trunk/xen-common/debian/scripts/xen-version
==============================================================================
--- trunk/xen-common/debian/scripts/xen-version	Mon Jun 21 14:40:12 2010	(r785)
+++ trunk/xen-common/debian/scripts/xen-version	Mon Jun 21 15:02:31 2010	(r786)
@@ -19,8 +19,13 @@
 if [ -e "/sys/hypervisor/type" ]; then
     if [ "$(cat /sys/hypervisor/type)" = xen ]; then
         DIR=/sys/hypervisor/version
-        if [ "$(cat $DIR/extra)" = "-unstable" ]; then
+	VERSION_EXTRA="$(cat $DIR/extra)"
+        if [ "$VERSION_EXTRA" = "-unstable" ]; then
+            # Old xen-unstable
             VERSION=unstable
+        elif [ "$VERSION_EXTRA" != "${VERSION_EXTRA#-}" ]; then
+            # ABI for Lenny and smaller
+            VERSION="$(cat $DIR/major).$(cat $DIR/minor)$VERSION_EXTRA"
         else
             VERSION="$(cat $DIR/major).$(cat $DIR/minor)"
         fi