X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Ffreeside-debian-releases.sh;h=03a163a7918bf8998ac037f6fb7a6ef69b096750;hp=82465266f3905b54181572f0e8dc67ef3deaed79;hb=ff27c3f36240aee48ed50153dd5d8fe3ac3f2443;hpb=9aee669886202be7035e6c6049fc71bc99dd3013 diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh index 82465266f..03a163a79 100755 --- a/bin/freeside-debian-releases.sh +++ b/bin/freeside-debian-releases.sh @@ -27,7 +27,9 @@ rm -fr $DIR/freeside/debian/freeside-ng-selfservice.conffiles # Pull any changes cd $DIR/freeside -STATUS=`git pull` +git checkout -- debian/changelog +git pull +#STATUS=`git pull` #Assign the proper config files for freeside-ng-selfservice if [ $DISTRO = "wheezy" ]; then @@ -38,7 +40,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