projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
expose invoice_lines() to invoice_html template for legacy mailbug use, RT#71087
[freeside.git]
/
bin
/
freeside-debian-releases.sh
diff --git
a/bin/freeside-debian-releases.sh
b/bin/freeside-debian-releases.sh
index
8246526
..
c774dd8
100755
(executable)
--- 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
# 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
#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
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
# Using pbuilder and pdebuild in chroot instead of building directly : dpkg-buildpackage -b -rfakeroot -uc -us