From 91ca68b425f7c5a56711fef64edf4c2c43556a02 Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Mon, 25 May 2009 14:49:10 -0400
Subject: [PATCH] [#1456] Added version dependancy handling
Conflicts:
tools/build-system/launch-build-machine.sh
---
tools/build-system/launch-build-machine.sh | 6 +++---
tools/build-system/remote/build-package-ubuntu.sh | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/build-system/launch-build-machine.sh b/tools/build-system/launch-build-machine.sh
index 9144928eb8..b407938c96 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-15 12:23:31 -0400
+# Last Modified: 2009-05-19 17:49:40 -0400
#####################################################
#
@@ -248,7 +248,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"
@@ -264,7 +264,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 e975f6833e..978ac48600 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"
--
GitLab