X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Ffreeside-debian-releases.sh;h=c774dd868c58a68ab43cbbdf10f4e0c4f544eaea;hb=a3c0a53cf10a8e2e905710776bd10dfc261c2dfd;hp=e832d9176fb0ad142085749d6822fba2f8458404;hpb=7a24977570328ce710e55d13cfd0fe5c5c40e67a;p=freeside.git diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh index e832d9176..c774dd868 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 @@ -37,8 +39,9 @@ else fi # Add the build information to changelog - -dch -b --newversion $GIT_VERSION-$DATE "Auto-Build" +if [ $FS_REPO != "stable" ]; then + dch -b --newversion $GIT_VERSION-$DATE "Auto-Build" +fi # Using pbuilder and pdebuild in chroot instead of building directly : dpkg-buildpackage -b -rfakeroot -uc -us