Handle new tag scheme in the packaging script

Change-Id: I8b7474eb82f94ed12c890090801e2afd3ef2e405

package.sh

@@ -30,7 +30,7 @@ if [ "$version_tag" == "" ]; then
     version_tag=$(git describe --tags)
 fi
 
-if [[ "$version_tag" =~ ^([0-9]{4}\.[0-9]+)-([0-9]+\.[0-9])$ ]]; then
+if [[ "$version_tag" =~ ^([0-9]{4}\.[0-9]+)\+([0-9]+\.[0-9])$ ]]; then
 
     # For official release, e.g. 2014.2-1.0
     echo "Packaging official release: $version_tag"
@@ -42,7 +42,7 @@ if [[ "$version_tag" =~ ^([0-9]{4}\.[0-9]+)-([0-9]+\.[0-9])$ ]]; then
 
     deb_version=$upstream_version-$downstream_version
 
-elif [[ "$version_tag" =~ ^([0-9]{4}\.[0-9]+)-([0-9]+\.[0-9])-(rc[0-9]+)$ ]]; then
+elif [[ "$version_tag" =~ ^([0-9]{4}\.[0-9]+)\+([0-9]+\.[0-9])\.(rc[0-9]+)$ ]]; then
     # For RC packages, e.g. 2014.2-1.0-rc1
     echo "Producing RC packages for " $version_tag
     upstream_version=${BASH_REMATCH[1]}
@@ -54,7 +54,7 @@ elif [[ "$version_tag" =~ ^([0-9]{4}\.[0-9]+)-([0-9]+\.[0-9])-(rc[0-9]+)$ ]]; th
 
     deb_version=$upstream_version-$downstream_version~$rc_tag
 
-elif [[ "$version_tag" =~ ^([0-9]{4}\.[0-9]+)-([0-9]+\.[0-9])-(rc[0-9]+.*)$ ]]; then
+elif [[ "$version_tag" =~ ^([0-9]{4}\.[0-9]+)\+([0-9]+\.[0-9])\.(rc[0-9]+.*)$ ]]; then
     # For unstable packages, e.g.2014.2-1.0-rc1-81-gef7115e
     echo Producing unstable packages for tag: $version_tag
     upstream_version=${BASH_REMATCH[1]}