X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Ffreeside-debian-releases.sh;h=7b95bb61b6be46a082adb84b8cf52b33bdbc5c6e;hb=3e47da3b954d463c36d4d446a37e0b7c67b3c16f;hp=82465266f3905b54181572f0e8dc67ef3deaed79;hpb=917ff4fd80bac4f492d30ab251d626095f4dd939;p=freeside.git diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh index 82465266f..7b95bb61b 100755 --- a/bin/freeside-debian-releases.sh +++ b/bin/freeside-debian-releases.sh @@ -27,18 +27,14 @@ rm -fr $DIR/freeside/debian/freeside-ng-selfservice.conffiles # Pull any changes cd $DIR/freeside -STATUS=`git pull` - -#Assign the proper config files for freeside-ng-selfservice -if [ $DISTRO = "wheezy" ]; then - ln -s $DIR/freeside/debian/freeside-ng-selfservice.deb7 $DIR/freeside/debian/freeside-ng-selfservice.conffiles -else - ln -s $DIR/freeside/debian/freeside-ng-selfservice.deb8 $DIR/freeside/debian/freeside-ng-selfservice.conffiles -fi +git checkout -- debian/changelog +git pull +#STATUS=`git pull` # 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