Skip to content
Snippets Groups Projects
Commit f76aeaa0 authored by Julien Bonjean's avatar Julien Bonjean
Browse files

[#1317] Fixed KDE client package dependency

parent 3eb384ec
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ Standards-Version: 3.7.3 ...@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
Package: sflphone-client-kde Package: sflphone-client-kde
Priority: optional Priority: optional
Architecture: any 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 Replaces: sflphone
Conflicts: sflphone Conflicts: sflphone
Homepage: http://www.sflphone.org Homepage: http://www.sflphone.org
......
...@@ -8,7 +8,7 @@ Standards-Version: 3.7.3 ...@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
Package: sflphone-client-kde Package: sflphone-client-kde
Priority: optional Priority: optional
Architecture: any 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 Replaces: sflphone
Conflicts: sflphone Conflicts: sflphone
Homepage: http://www.sflphone.org Homepage: http://www.sflphone.org
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info) # Author: Julien Bonjean (julien@bonjean.info)
# #
# Creation Date: 2009-04-20 # 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 ...@@ -360,7 +360,7 @@ if [ ${DO_MAIN_LOOP} ]; then
echo "Leave machine running" echo "Leave machine running"
else else
echo "Shut down machine ${MACHINE}" echo "Shut down machine ${MACHINE}"
${SSH_BASE} 'sudo shutdown -h now' ${SSH_BASE} 'sudo /sbin/shutdown -h now'
echo "Wait ${SHUTDOWN_WAIT} s" echo "Wait ${SHUTDOWN_WAIT} s"
sleep ${SHUTDOWN_WAIT} sleep ${SHUTDOWN_WAIT}
# hard shut down (just to be sure) # hard shut down (just to be sure)
...@@ -409,7 +409,7 @@ if [ ${DO_UPLOAD} ]; then ...@@ -409,7 +409,7 @@ if [ ${DO_UPLOAD} ]; then
echo echo
echo "Prepare packages upload" 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 if [ "$?" -ne "0" ]; then
echo " !! Cannot deploy repository scripts" echo " !! Cannot deploy repository scripts"
...@@ -417,7 +417,8 @@ if [ ${DO_UPLOAD} ]; then ...@@ -417,7 +417,8 @@ if [ ${DO_UPLOAD} ]; then
echo "Upload packages" echo "Upload packages"
echo "Install dists files to repository" 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 if [ "$?" -ne "0" ]; then
echo " !! Cannot upload packages" echo " !! Cannot upload packages"
...@@ -425,7 +426,7 @@ if [ ${DO_UPLOAD} ]; then ...@@ -425,7 +426,7 @@ if [ ${DO_UPLOAD} ]; then
fi fi
echo "Update repository" 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 if [ "$?" -ne "0" ]; then
echo " !! Cannot update repository" echo " !! Cannot update repository"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment