From: Ivan Kohler Date: Sat, 13 Feb 2016 22:56:33 +0000 (-0800) Subject: Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE... X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=c66dfad965440d72276a4adec95cbcfa0f52a498;hp=6a1082fd1d50f0fbd30f74b816176ef886160c84;p=freeside.git Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH --- diff --git a/FS/FS.pm b/FS/FS.pm index d98a7e847..c17cd9302 100644 --- a/FS/FS.pm +++ b/FS/FS.pm @@ -3,7 +3,7 @@ package FS; use strict; use vars qw($VERSION); -$VERSION = '3.91git'; +$VERSION = '3.91~git'; #find missing entries in this file with: # for a in `ls *pm | cut -d. -f1`; do grep 'L' ../FS.pm >/dev/null || echo "missing $a" ; done diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh index 82465266f..e832d9176 100644 --- a/bin/freeside-debian-releases.sh +++ b/bin/freeside-debian-releases.sh @@ -38,7 +38,7 @@ fi # Add the build information to changelog -dch -b --newversion $GIT_VERSION~$DATE "Auto-Build" +dch -b --newversion $GIT_VERSION-$DATE "Auto-Build" # Using pbuilder and pdebuild in chroot instead of building directly : dpkg-buildpackage -b -rfakeroot -uc -us