debian: use 'testing' or 'unstable' in place of 'git' in version suffix

diff --git a/publish.sh b/publish.sh
index 64f2bf9fc1f7de7db5ab8da68e2004440fc45360..8b6239cec6143c86483751c483ea3fa20998938d 100755 (executable)
--- a/publish.sh
+++ b/publish.sh
@@ -8,10 +8,14 @@ vers=$1
 [ -z "$vers" ] && echo specify version && exit 1
 [ ! -d "release/$vers" ] && echo missing release/$vers && exit 1
 
-if echo $vers | grep -q git ; then
-    component="ceph-unstable"
+if echo $vers | grep -q testing ; then
+    component="ceph-testing"
 else
-    component="ceph-stable"
+    if echo $vers | grep -q unstable ; then
+       component="ceph-unstable"
+    else
+       component="ceph-stable"
+    fi
 fi
 
 echo vers $vers

diff --git a/release.sh b/release.sh
index 5d282b36dad5f317f76e565414f3d1f9d7f12b9b..86a1d66f1d182f4e53575a37262377f3d9907b8e 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -8,7 +8,7 @@ echo vers $vers
 repo=$1
 force=$2
 
-[ -z "$repo" ] && echo stable or unstable && exit 1
+[ -z "$repo" ] && echo stable or testing or unstable && exit 1
 
 if git diff --quiet ; then
     echo repository is clean
@@ -30,11 +30,16 @@ gitver=`grep GIT_VER ceph_ver.h | awk '{print $3}' | cut -c 1-8`
 echo gitver $gitver
 cd ..
 
-if [ "$repo" = "unstable" ]; then
+if [ "$repo" = "testing" ]; then
     versuffix=`date "+%Y%m%d%H%M"`
-    finalvers="${vers}git${versuffix}-$gitver"
+    finalvers="${vers}-testing${versuffix}-$gitver"
 else
-    finalvers="$vers"
+    if [ "$repo" = "unstable" ]; then
+       versuffix=`date "+%Y%m%d%H%M"`
+       finalvers="${vers}-unstable${versuffix}-$gitver"
+    else
+       finalvers="$vers"
+    fi
 fi
 
 echo final vers $finalvers