Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

.travis.yml

@@ -20,6 +20,7 @@ addons:
     - git
     - curl
     - sshfs
+    - sed
 env:
   matrix:
   - OS=el DIST=6

utils/packpack/startpackpack.sh

@@ -46,7 +46,7 @@ commonprep () {
         echo "Checking packpack github repo for changes..."
         git -C packpack pull origin master
     else
-        echo "Cloning pakcpack github repo..."
+        echo "Cloning packpack github repo..."
         git clone https://github.com/packpack/packpack.git packpack
     fi
 
@@ -117,6 +117,11 @@ installtrusty () {
 # This sets the naming convention for the deb packages
 setdebpkgver () {
 
+    # DEBUG
+    git describe --long --always
+    git describe --long --always | sed -n 's/^\([0-9\.]*\)-\([0-9]*\)-\([a-z0-9]*\)/\1/p'
+    git describe --long --always | sed -n 's/^\([0-9\.]*\)-\([0-9]*\)-\([a-z0-9]*\)/\2/p'
+    
     # Set VERSION to x.xx.x+x e.g. 1.30.2+15
     # the last x is number of commits since release
     # Creates zoneminder packages in the format: zoneminder-{version}-{release}