From f76aeaa070077a704ef65e280ed913749a156d93 Mon Sep 17 00:00:00 2001
From: Julien Bonjean <julien@bonjean.info>
Date: Wed, 10 Jun 2009 14:11:43 -0400
Subject: [PATCH] [#1317] Fixed KDE client package dependency
---
.../debian-sflphone-client-kde/control.intrepid | 2 +-
.../ubuntu/debian-sflphone-client-kde/control.jaunty | 2 +-
tools/build-system/launch-build-machine.sh | 11 ++++++-----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/control.intrepid b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/control.intrepid
index d844e823f3..ba8c47ad9a 100644
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/control.intrepid
+++ b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/control.intrepid
@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
Package: sflphone-client-kde
Priority: optional
Architecture: any
-Depends: sflphone-common (>=0.9.5), libcommoncpp2-1.6-0, kdepimlibs5 (>=4.1.4), libqt4-dbus (>=4.4.3), libqt4-svg (>=4.4.3), libqtgui4 (>=4.4.3)
+Depends: sflphone-common (=VERSION), libcommoncpp2-1.6-0, kdepimlibs5 (>=4.1.4), libqt4-dbus (>=4.4.3), libqt4-svg (>=4.4.3), libqtgui4 (>=4.4.3)
Replaces: sflphone
Conflicts: sflphone
Homepage: http://www.sflphone.org
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/control.jaunty b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/control.jaunty
index d844e823f3..ba8c47ad9a 100644
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/control.jaunty
+++ b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/control.jaunty
@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
Package: sflphone-client-kde
Priority: optional
Architecture: any
-Depends: sflphone-common (>=0.9.5), libcommoncpp2-1.6-0, kdepimlibs5 (>=4.1.4), libqt4-dbus (>=4.4.3), libqt4-svg (>=4.4.3), libqtgui4 (>=4.4.3)
+Depends: sflphone-common (=VERSION), libcommoncpp2-1.6-0, kdepimlibs5 (>=4.1.4), libqt4-dbus (>=4.4.3), libqt4-svg (>=4.4.3), libqtgui4 (>=4.4.3)
Replaces: sflphone
Conflicts: sflphone
Homepage: http://www.sflphone.org
diff --git a/tools/build-system/launch-build-machine.sh b/tools/build-system/launch-build-machine.sh
index ee587e30ea..e72fbc2f0f 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-06-02 09:19:56 -0400
+# Last Modified: 2009-06-09 17:51:40 -0400
#####################################################
#
@@ -360,7 +360,7 @@ if [ ${DO_MAIN_LOOP} ]; then
echo "Leave machine running"
else
echo "Shut down machine ${MACHINE}"
- ${SSH_BASE} 'sudo shutdown -h now'
+ ${SSH_BASE} 'sudo /sbin/shutdown -h now'
echo "Wait ${SHUTDOWN_WAIT} s"
sleep ${SHUTDOWN_WAIT}
# hard shut down (just to be sure)
@@ -409,7 +409,7 @@ if [ ${DO_UPLOAD} ]; then
echo
echo "Prepare packages upload"
- scp ${SSH_OPTIONS} ${PACKAGING_SCRIPTS_DIR}/update-repository.sh ${SSH_REPOSITORY_HOST}:
+ scp ${SSH_OPTIONS} ${PACKAGING_SCRIPTS_DIR}/update-repository.sh ${SSH_REPOSITORY_HOST}:debian/
if [ "$?" -ne "0" ]; then
echo " !! Cannot deploy repository scripts"
@@ -417,7 +417,8 @@ if [ ${DO_UPLOAD} ]; then
echo "Upload packages"
echo "Install dists files to repository"
- scp -r ${SSH_OPTIONS} ${PACKAGING_RESULT_DIR}/deb/dists ${SSH_REPOSITORY_HOST}:
+ scp -r ${SSH_OPTIONS} ${PACKAGING_RESULT_DIR}/rpm/* ${SSH_REPOSITORY_HOST}:rpm/
+ scp -r ${SSH_OPTIONS} ${PACKAGING_RESULT_DIR}/deb/dists ${SSH_REPOSITORY_HOST}:debian/
if [ "$?" -ne "0" ]; then
echo " !! Cannot upload packages"
@@ -425,7 +426,7 @@ if [ ${DO_UPLOAD} ]; then
fi
echo "Update repository"
- ssh ${SSH_OPTIONS} ${SSH_REPOSITORY_HOST} "./update-repository.sh"
+ ssh ${SSH_OPTIONS} ${SSH_REPOSITORY_HOST} "cd debian && ./update-repository.sh"
if [ "$?" -ne "0" ]; then
echo " !! Cannot update repository"
--
GitLab