ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Isaac Connor 2017-06-01 09:36:21 -04:00
parent e47adcf6cc 618d606a88
commit 41f77cc51f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
utils/packpack/startpackpack.sh
View File

@ -118,9 +118,10 @@ installtrusty () {
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'
echo
echo "Output of git describe: $(git describe)"
echo "Output of git describe --debug --long --always: $(git describe --long --always --debug)"
echo "Output of git describe --long --always: $(git describe --long --always)"
# Set VERSION to x.xx.x+x e.g. 1.30.2+15
# the last x is number of commits since release