diff --git a/tools/build-system/launch-build-machine.sh b/tools/build-system/launch-build-machine.sh index 5fbdaad17f0d012b9cefbfe6cada750edf5bcf8a..a8833ff44c36bbe748160c37d1e8841591b00170 100755 --- a/tools/build-system/launch-build-machine.sh +++ b/tools/build-system/launch-build-machine.sh @@ -7,7 +7,7 @@ # Author: Julien Bonjean (julien@bonjean.info) # # Creation Date: 2009-04-20 -# Last Modified: 2009-05-19 10:11:53 -0400 +# Last Modified: 2009-05-19 17:49:40 -0400 ##################################################### # @@ -252,7 +252,7 @@ if [ ${DO_PREPARE} ]; then if [ ${RELEASE_MODE} ]; then echo "Switch to master branch for commit" - git checkout master + git checkout -f master fi echo " Doing commit" @@ -271,7 +271,7 @@ if [ ${DO_PREPARE} ]; then if [ ${RELEASE_MODE} ]; then echo "Switch back to release branch" git checkout release - git merge master + # git merge master fi echo "Archiving repository" diff --git a/tools/build-system/remote/build-package-ubuntu.sh b/tools/build-system/remote/build-package-ubuntu.sh index e975f6833e22b863a2c35787bd21422bacd819c4..978ac486001dfae8007f1a7dd8802e8151cd09e1 100755 --- a/tools/build-system/remote/build-package-ubuntu.sh +++ b/tools/build-system/remote/build-package-ubuntu.sh @@ -105,7 +105,8 @@ fi echo "Generate control files" cp ${REPOSITORY_SFLPHONE_COMMON_DIR}/debian/control.$OS_VERSION ${REPOSITORY_SFLPHONE_COMMON_DIR}/debian/control && \ # cp ${REPOSITORY_SFLPHONE_CLIENT_KDE_DIR}/debian/control.$OS_VERSION ${REPOSITORY_SFLPHONE_CLIENT_KDE_DIR}/debian/control && \ - cp ${REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR}/debian/control.$OS_VERSION ${REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR}/debian/control + cp ${REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR}/debian/control.$OS_VERSION ${REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR}/debian/control && \ + find ${REPOSITORY_DIR} -name "control" -exec sed -i "s/VERSION/${FULL_VERSION}/g" {} \; if [ "$?" -ne "0" ]; then echo "!! Cannot generate control files"