[Pkg-xen-changes] r100 - branches/20060307-fern/scripts

[Guido Trotter]

Author: ultrotter
Date: 2006-03-10 10:45:28 +0000 (Fri, 10 Mar 2006)
New Revision: 100

Modified:
   branches/20060307-fern/scripts/hg2dist.sh
Log:
Merge hg2dist changes


Modified: branches/20060307-fern/scripts/hg2dist.sh
===================================================================
--- branches/20060307-fern/scripts/hg2dist.sh	2006-03-10 10:40:59 UTC (rev 99)
+++ branches/20060307-fern/scripts/hg2dist.sh	2006-03-10 10:45:28 UTC (rev 100)
@@ -19,13 +19,14 @@
 RELEASE_LG=$( (cd $HGDIR; $HG log | grep -B 1 "tag:.*RELEASE" | head -2) | sed -e 's/ //g')
 REL_CHG=$( echo $RELEASE_LG | cut -d: -f2 )
 REL_VER=$( echo $RELEASE_LG | cut -d- -f2 )
+REL_MAJ=$( echo $REL_VER | sed -r -e 's/([0-9]+\.[0-9]+)\.[0-9]+/\1/' )
 
 if [ $REL_CHG = $CHANGESET ]; then
-	DESTDIR="xen-${REL_VER}"
-	DESTTAR="xen_${REL_VER}.orig.tar.gz"
+	DESTDIR="xen-${REL_MAJ}-${REL_VER}"
+	DESTTAR="xen-${REL_MAJ}_${REL_VER}.orig.tar.gz"
 else
-	DESTDIR="xen-${REL_VER}+hg${CHANGESET}"
-	DESTTAR="xen_${REL_VER}+hg${CHANGESET}.orig.tar.gz"
+	DESTDIR="xen-${REL_MAJ}-${REL_VER}+hg${CHANGESET}"
+	DESTTAR="xen-${REL_MAJ}_${REL_VER}+hg${CHANGESET}.orig.tar.gz"
 fi