diff --git a/tools/build-system/distributions/build-packages.sh b/tools/build-system/distributions/build-packages.sh
new file mode 100755
index 0000000000000000000000000000000000000000..a8f2d049d1c1e9f004cbf50c2ed3b0311cf5946e
--- /dev/null
+++ b/tools/build-system/distributions/build-packages.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#####################################################
+# File Name: build-packages.sh
+#
+# Purpose :
+#
+# Author: Julien Bonjean (julien@bonjean.info) 
+#
+# Creation Date: 2009-05-29
+# Last Modified: 2009-05-29 15:18:56 -0400
+#####################################################
+
+. ./globals
+
+if [ "$?" -ne 0 ]; then
+	echo "!! Cannot source global file"
+	exit -1
+fi
+
+cd ${PACKAGING_DIR}
+
+if [ ! ${PACKAGING_DIR} ];then
+	echo "!! Cannot go to working directory"
+	exit -1
+fi
+
+# check if version is ok
+if [ ! ${VERSION} ]; then
+        echo "!! Cannot detect current version"
+        exit -1
+fi
+
+# open log file
+exec 3<>${LOG_FILE}
+
+# redirect outputs (stdout & stderr)
+exec 1>&3
+exec 2>&3
+
+echo "SFLPhone version is ${VERSION}"
+
+# check user
+if [ "${WHOAMI}" != "${USER}" ]; then
+        echo "!! Please use user ${USER} to run this script"
+        exit -1;
+fi
+
+if [ ${RELEASE_MODE} ]; then
+        echo "Release mode : ${RELEASE_MODE}"
+else
+        echo "Snapshot mode"
+fi
+
+# decompress repository
+echo "Untar repository"
+cd ${BUILD_DIR} && tar xf ${REPOSITORY_ARCHIVE}
+
+if [ "$?" -ne "0" ]; then
+        echo " !! Cannot untar repository"
+        exit -1
+fi
+
+# launch distribution specific script
+if [ "${DISTRIBUTION}" = "ubuntu" ];then
+	echo "Launch packaging for Ubuntu (hardy/intrepid/jaunty)"
+	cd ${UBUNTU_DIR} && ./build-packages-ubuntu.sh $*
+
+elif [ "${DISTRIBUTION}" = "opensuse" ]; then
+	echo "Launch packaging for openSUSE 11"
+	cd ${OPENSUSE_DIR} && ./build-packages-opensuse.sh $*
+
+else
+	echo "!! Cannot detect distribution"
+	exit -1
+fi
+
+if [ "$?" -ne 0 ]; then
+	echo "!! Error in subprocess"
+	exit -1
+fi
+
+echo "All done"
+
+# close file descriptor
+exec 3>&-
+
+exit 0
diff --git a/tools/build-system/distributions/globals b/tools/build-system/distributions/globals
index a4b19bf8b1a1045596856baa704b25c61707303b..ceaf1d927745e8b1e30926d5735cb1b709f680dd 100644
--- a/tools/build-system/distributions/globals
+++ b/tools/build-system/distributions/globals
@@ -9,58 +9,42 @@
 # Last Modified: 2009-05-28 15:55:14 -0400
 #####################################################
 
+# general
+RELEASE_MODE="$1"
 ROOT_DIR="/home/sflphone"
 PACKAGING_DIR="${ROOT_DIR}/sflphone-packaging"
 
+# distributions
 UBUNTU_DIR="${PACKAGING_DIR}/ubuntu"
-OPENSUSE="${PACKAGING_DIR}/opensuse"
+OPENSUSE_DIR="${PACKAGING_DIR}/opensuse"
 
+# where packaging will be donne
 BUILD_DIR="${PACKAGING_DIR}/build"
-DIST_DIR="${PACKAGING_DIR}/dists"
 REPOSITORY_ARCHIVE="${BUILD_DIR}/sflphone.tar.gz"
 REPOSITORY_DIR="${BUILD_DIR}/sflphone"
-REPOSITORY_SFLPHONE_COMMON_DIR="${REPOSITORY_DIR}/sflphone-common"
-REPOSITORY_SFLPHONE_CLIENT_KDE_DIR="${REPOSITORY_DIR}/sflphone-client-kde"
-REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR="${REPOSITORY_DIR}/sflphone-client-gnome"
 
+# target directories
+DIST_DIR="${PACKAGING_DIR}/dists"
+
+# system information
 ARCH_FLAG=`getconf -a|grep LONG_BIT | sed -e 's/LONG_BIT\s*//'`
 OS_VERSION=`lsb_release -d -s -c | sed -e '1d'`
+DISTRIBUTION=`lsb_release -s -d | sed 's/"//g' | tr 'A-Z' 'a-z' | cut -d " " -f1`
 VERSION=`cat ${BUILD_DIR}/VERSION` 
 
-if [ ! ${VERSION} ]; then
-        echo "!! Cannot detect current version"
-        exit -1
-fi
-
+# other stuff
 EDITOR=echo
 export EDITOR
 RELEASE_MODE=$1
 USER="sflphone"
+WHOAMI=`whoami`
 
-#PACKAGES=('sflphone-common' 'sflphone-client-gnome' 'sflphone-client-kde')
-PACKAGES=('sflphone-common sflphone-client-gnome')
-
-GLOBAL_LOG=${PACKAGING_DIR}/sflphone-${OS_VERSION}-${ARCH_FLAG}.log
-
-# open log file
-exec 3<>${GLOBAL_LOG}
+# packages we will build
+PACKAGES=('sflphone-common sflphone-client-gnome' 'sflphone-client-kde')
 
-# redirect outputs (stdout & stderr)
-exec 1>&3
-exec 2>&3
-
-echo "SFLPhone version is ${VERSION}"
-
-WHO=`whoami`
-
-if [ "${WHO}" != "${USER}" ]; then
-        echo "!! Please use user ${USER} to run this script"
-        exit -1;
+# log file
+LOG_ID="${OS_VERSION}"
+if [ "${LOG_ID}" = "" ]; then
+	LOG_ID="${DISTRIBUTION}"
 fi
-
-if [ ${RELEASE_MODE} ]; then
-        echo "Release mode : ${RELEASE_MODE}"
-else
-        echo "Snapshot mode"
-fi
-
+LOG_FILE=${PACKAGING_DIR}/sflphone-${LOG_ID}-${ARCH_FLAG}.log
diff --git a/tools/build-system/distributions/opensuse/build-package-opensuse.sh b/tools/build-system/distributions/opensuse/build-packages-opensuse.sh
similarity index 61%
rename from tools/build-system/distributions/opensuse/build-package-opensuse.sh
rename to tools/build-system/distributions/opensuse/build-packages-opensuse.sh
index 636076c90b5e170bdc1756e80d70585ee114b805..7960172fe89943d1b7dbb16c2c5cbbf92a56340f 100755
--- a/tools/build-system/distributions/opensuse/build-package-opensuse.sh
+++ b/tools/build-system/distributions/opensuse/build-packages-opensuse.sh
@@ -1,25 +1,25 @@
 #!/bin/bash
 #####################################################
-# File Name: build-package-opensuse.sh
+# File Name: build-packages-opensuse.sh
 #
 # Purpose :
 #
 # Author: Julien Bonjean (julien@bonjean.info) 
 #
 # Creation Date: 2009-05-27
-# Last Modified: 2009-05-28 16:32:54 -0400
+# Last Modified: 2009-05-29 15:18:14 -0400
 #####################################################
 
-BUILD_DIR=/tmp/sflphone
-SRC_DIR=${HOME}/sflphone-packaging/build/sflphone
-WORKING_DIR=${HOME}/sflphone-packaging
-VERSION=`cat ${SRC_DIR}/sflphone-common/VERSION`
+. ../globals
 
-if [ ! ${VERSION} ]; then
-	echo "!! Cannot detect current version"
-	exit -1
+cd ${OPENSUSE_DIR}
+
+if [ "$?" -ne "0" ]; then
+        echo " !! Cannot cd to openSUSE directory"
+        exit -1
 fi
 
+# create build directories
 echo "Create directories"
 mkdir -p ${BUILD_DIR}/BUILD
 mkdir -p ${BUILD_DIR}/RPMS
@@ -27,6 +27,7 @@ mkdir -p ${BUILD_DIR}/SOURCES
 mkdir -p ${BUILD_DIR}/SPECS
 mkdir -p ${BUILD_DIR}/SRPMS
 
+# create rpm macros
 echo "Create RPM macros"
 cat > ~/.rpmmacros << STOP
 %packager               Julien Bonjean (julien.bonjean@savoirfairelinux.com)
@@ -44,29 +45,48 @@ cat > ~/.rpmmacros << STOP
 %_srcrpmdir		%{_topdir}/SRPMS
 STOP
 
-
+# create packages
 for PACKAGE in ${PACKAGES[@]}
 do
 	echo "Prepare ${PACKAGE}"
 
-	cd ${SRC_DIR}
+	cd ${REPOSITORY_DIR}
 
 	echo " -> create source archive"
-	mv ${PACKAGE} ${PACKAGE}-${VERSION} 2>/dev/null
-	tar cf ${PACKAGE}.tar.gz ${PACKAGE}-${VERSION}
+	mv ${PACKAGE} ${PACKAGE}-${VERSION} 2>/dev/null && \
+	tar cf ${PACKAGE}.tar.gz ${PACKAGE}-${VERSION} && \
 	mv ${PACKAGE}-${VERSION} ${PACKAGE}
 	
+	if [ "$?" -ne "0" ]; then
+		echo "!! Cannot create source archive"
+		exit -1
+	fi
+	
 	echo " -> move archive to source directory"
 	mv ${PACKAGE}.tar.gz ${BUILD_DIR}/SOURCES
 
-	cd ${WORKING_DIR}
+	if [ "$?" -ne "0" ]; then
+                echo "!! Cannot move archive"
+                exit -1
+        fi
+
+	cd ${PACKAGING_DIR}
 
 	echo " -> update spec file"
 	sed "s/VERSION/${VERSION}/g" ${PACKAGE}.spec > ${BUILD_DIR}/SPECS/${PACKAGE}.spec
+
+	if [ "$?" -ne "0" ]; then
+                echo "!! Cannot update spec file"
+                exit -1
+        fi
 done
 
+# launch build
 echo "Launch build"
 rpmbuild -ba ${BUILD_DIR}/SPECS/*.spec
 
-exit 0
+if [ "$?" -ne "0" ]; then
+	echo "!! Cannot build packages"
+	exit -1
+fi
 
diff --git a/tools/build-system/distributions/ubuntu/build-package-ubuntu.sh b/tools/build-system/distributions/ubuntu/build-packages-ubuntu.sh
similarity index 88%
rename from tools/build-system/distributions/ubuntu/build-package-ubuntu.sh
rename to tools/build-system/distributions/ubuntu/build-packages-ubuntu.sh
index 3e73f349bdb538e3c108cdd8fc225c82e7b5a8d9..8b8c85e457f728cfd227b87953c7ac992ac08625 100755
--- a/tools/build-system/distributions/ubuntu/build-package-ubuntu.sh
+++ b/tools/build-system/distributions/ubuntu/build-packages-ubuntu.sh
@@ -7,11 +7,6 @@
 
 . ../globals
 
-if [ ! ${PACKAGING_DIR} ];then
-	echo "!! Cannot source globals file"
-	exit -1
-fi
-
 cd ${UBUNTU_DIR}
 
 if [ "$?" -ne "0" ]; then
@@ -20,7 +15,7 @@ if [ "$?" -ne "0" ]; then
 fi
 
 PACKAGE_SYSVER="0ubuntu1"
-FULL_VERSION="${VERSION}-0ubuntu1"
+FULL_VERSION="${VERSION}-${PACKAGE_SYSVER}"
 
 #########################
 # BEGIN
@@ -39,21 +34,13 @@ echo "Do updates"
 sudo apt-get update >/dev/null
 sudo apt-get upgrade -y >/dev/null
 
-# decompress repository
-echo "Untar repository"
-cd ${BUILD_DIR} && tar xf ${REPOSITORY_ARCHIVE}
-
-if [ "$?" -ne "0" ]; then
-        echo " !! Cannot untar repository"
-        exit -1
-fi
 
 for PACKAGE in ${PACKAGES[@]}
 do
         echo "Process ${PACKAGE}"
 
 	echo " -> prepare debian directories"
-	mv ${UBUNTU_DIR}/debian-${PACKAGE} ${REPOSITORY_DIR}/${PACKAGE}/
+	mv ${UBUNTU_DIR}/debian-${PACKAGE} ${REPOSITORY_DIR}/${PACKAGE}/debian
 
 	# generate the changelog
 	echo " -> generate changelog"
@@ -67,6 +54,10 @@ do
 
 	# copy the appropriate control file based on architecture
 	echo " -> generate control file"
+	if [ ! -e ${REPOSITORY_DIR}/${PACKAGE}/debian/control.$OS_VERSION ];then
+		echo " -> no control file, skipping"
+		continue
+	fi
 	cp ${REPOSITORY_DIR}/${PACKAGE}/debian/control.$OS_VERSION ${REPOSITORY_DIR}/${PACKAGE}/debian/control && \
  	sed -i "s/VERSION/${FULL_VERSION}/g" ${REPOSITORY_DIR}/${PACKAGE}/debian/control
 
@@ -114,10 +105,3 @@ if [ "$?" -ne "0" ]; then
         exit -1
 fi
 
-echo "All done"
-
-# close file descriptor
-exec 3>&-
-
-exit 0
-
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/changelog b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/changelog
index c1edbb33a86c23182ef4a2bdf328359ef7774fd7..408e3afe0806e687b2542f5e95f6a8a46c823b74 100644
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/changelog
+++ b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/changelog
@@ -1,46 +1,199 @@
-sflphone-client-kde (0.9.6-0ubuntu1~1.gbpf07060) SYSTEM; urgency=low
-
-  ** SNAPSHOT build @f07060721d61850d67b89f24f0415d7237281886 **
-
-  [ Emmanuel Milou ]
-  * [#1220] Add Conflicts: sflphone in debian control files
-  * [#1179] Add liblog4c3 runtime dependency
-  * [#1212] FIx typo error in dependency list for itnrepid
-  * [#1212] FIx .desktop file to point on the right exec
-  * [#1212] Modify changelog replacing tag
-
-  [ Sflphone Project ]
-  * "[#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta"
-
-  [ Emmanuel Milou ]
-  * [#1212] restore changelogs
-
-  [ Sflphone Project ]
+sflphone-client-kde (0.9.5-SYSVER~snapshot1243310516) SYSTEM; urgency=low
+
+    ** SNAPSHOT 1243310516 **
+
+  * [#1317] Fixed compilation issues on opensuse 11
+  * [#1505] account list seem to crash the application when clicking
+    Apply very fast...
+  * [#1456] Add a flag to be replaced in the control files
+  * [#1456] Added version dependancy handling
+  * put account alias in AccountWidgetItem rather than in the item with
+    "    " before.
+  * [#1034] The KDE client should start sflphoned if it is not started
+  * [#1500] Handle options for notifications and display on incoming
+    call.
+  * [#1443] Client should not crash when receive an unexpected
+    stateChanged signal
+  * [#1426] Daemon crashes when get alsa plugin
+  * commit for merge
+  * [#1424] Change logo in tray icon and put a different one when
+    incoming call
+  * [#1425] first part done, window title...
+  * [#1413] add manpages creating and installing in build system
+  * [#1417] The client should start the account creation wizard if
+    started for the first time (if config file doesn't exist)
+  * [#1421] Make volume bars horizontal when dialpad is hidden.
+  * Changed main window title and fixed a mistake in sflphone_const.h
+  * [#1412] make debian package building work
+  * changelog changed.
+  * Changed addAccount method in gnome client.
+  * Debian and man folders added.
+  * [#1388] Change project name from sflphone_kde to sflphone-client-kde
+  * Better handle of kabc check.
+  * [#1351] Automatic generation of dbus interfaces in makefile
+    generated by cmake
+  * [#1307] Implement "edit before call" in history and address book.
+  * [#1344] change action_call label in call history from "call" to
+    "call back".
+  * [#1308] Implement Hook feature in kde client
+  * Improved build system.
+  * #1219 : Add address book configuration page
+  * Better handling of registration to the daemon.
+  * #1039 : Add tray icon in kde.
+  * Issue no 1216 : Double click on item in history or address book
+    causes call.
+  * display peer name in call list and call history when called from
+    address book.
+  * Address book functionnal with photo displayed.
+  * Help menu kde available but actions disappeared. All fonctions in
+    view.
+  * Address book functionnal but ugly and making its own sort in the
+    complete address book.
+  * Account choice on right click, clean out includes, page address
+    book, fixed bugs...
+  * Wizard, double click, context menu...
+  * Removed sflphone_kde.kdevelop.filelist
+  * Added account creation wizard and translated interface in english.
+  * Transfer functionnal but ugly.
+  * transfer not functionnal
+  * Bug fixed : unholding (UNHOLD_CURRENT, UNHOLD_RECORD)
+  * Commit functional for push. With install.sh
+  * Before merge.
+  * Problem with enable accounts. Account display increased.
+  * Functional with codec order working , playDTMF.
+  * Commit functional.
+  * sflphone_kde/build added in .gitignore.
+  * complete commit for checkout previous.
+  * Commit before checkout previous version to check the display
+    bug(little font everywhere...)
+  * Functionnal client. Rest : history icons, config icons and
+    functionalities
+  * commit before merge asavard for isRecording.
+  * Call and Automate fusion done and seems to work.
+  * Commiting before putting Automate class in Call class.
+  * Functionnal main window without recording, history, voicemail, kio
+    widgets.
+  * client kde avec kdevelop.
+  * Config Dialog almost finished.
+  * Base of QT client
+
+ -- SFLphone Automatic Build System <team@sflphone.org>  Tue, 26 May 2009 00:02:37 -0400
+
+sflphone-client-kde (0.9.5-SYSVER) SYSTEM; urgency=low
+
+    ** 0.9.5 release **
+
+  * [#1060] FIx bug in chinese translation
+  * [#1313] git add rtpTest.cpp rtpTest.h
+  * [#1313] Add init/close rtp tests
+  * [#1313] Basic instanciation of the rtp layer
+  * [#1449] Gtk-Critical concerning history filters and new calls
+  * [#1400] Make the match with the hostname instead of username
+  * [#1324] Change status bar label for "Using %s (%s)"
+  * [#1403] Icon size: 60x60 px
+  * [#1403] Do not remove notification, improve icon quality
+  * [#1403] Add smaller icon for gnome notifications
+  * [#1403] Prevent crash when hangup && no notification
+  * [#1403] Remove all actions on notifications; code refactoring
+  * [#1451] Use stun.sflphone.org as default STUN server
+  * [#1060] New po files - need to be translated
+  * [#1060] Update french translation - Rebuild template file
+  * [#1456] Add a flag to be replaced in the control files
+  * [#1454] Make cppunit optional; remove from build deps in control
+    files
+  * [#1401] Add libexpat1-dev dependency in control files
+  * [#1448] Take off these ugly debug messages
+  * [#1448] fixed getTelephoneTone and getTelephoneFile() called
+    repeatedly
+  * [#1406] add liblog4c-dev in build-depends
+  * [#1409] Restore .desktop icon
+
+ -- SFLphone Automatic Build System <team@sflphone.org>  Mon, 25 May 2009 11:34:48 -0400
+
+sflphone-client-kde (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
+
+    ** 0.9.5 rc2 **
+
+  * [#1422] Improved error message
+  * [#1402] Fix pjsip build
+  * [#1404] Clear GTK-Critical Bug at client startup
+  * [#1422] Added automatic VM shutdown when building on more than one
+    VM
+  * [#1422] Fixed some issues with new changelog generation script
+  * [#1422] Moved distribution update to specific file
+  * [#1422] Dropped git-dch, replace by home made implementation
+  * [#1402] Fix pjsip build
+  * [#1404] Clear GTK-Critical Bug at client startup
+  * Changes for name based dbus connection
+  * Clean changelogs
+  * [#1343] Gnome: Implement a callback system to handle focus on
+    different widgets
+  * Debus Session
+  * Refactoring Python code, PEP8
+  * [#1430] Get back dbus_g_proxy_new_for_name
+  * [#1430] Get back DBUS_BUS_SESSION type
+  * [#1430] Dbus fixed owner message binding
+  * Second test with DBUS owner
+  * [#1404] Gnome -> Preferences -> Hooks
+  * [#1404] Gnome -> Preferences -> Recordings
+  * [#1404] Call History
+  * [#1404] Gnome -> Preferences -> Address Book
+  * [#1404] IF the first notification option disable the second
+    notification
+  * Dbus with fixed owner does not automatically start the deamon
+  * Add codec debug tests in pysflphone
+  * [#1407] Some print info
+  * [#1407] Add a scenario to pick_up action
+  * Test client dbus connection to a fixed owner
+  * Add python dbus test suite
+  * [#1161] Modified version handling in build system
+  * [#1314] Test pulse audio and audio streams connect and disconnect
+  * [#1402] Add info message after configure
+  * [#1402] Build the daemon with the local pjsip library (vs the
+    installed one)
+  * [#1009] Fix Codec Sampling Rate set to zeros
+  * [#1314] Add mutex to pulse layer audio streams
+  * [#1314] Refactoring pulseaudio stream to test connect disconnect
+  * [#1314] Refactoring of pulselayer to test conect/disconnect
+  * Add debug messages in debus calls concerning account
+  * [#1314] Add some return values to audio init functions
+  * [#1406] add liblog4c-dev in build-depends
+  * [#1409] Restore .desktop icon
+  * Bug #1405: Fix strings as requested.
+  * Bug #1404: Fix strings in preferences panel.
+
+ -- SFLphone Automatic Build System <team@sflphone.org>  Tue, 19 May 2009 12:08:18 -0400
+
+sflphone-client-kde (0.9.5-0ubuntu1~rc1) SYSTEM; urgency=low
+
+  [ SFLphone Project ]
   * [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
-    04-27
+    05-05
 
   [ Emmanuel Milou ]
-  * [#1212] restore changelogs
+  * Add some python CLI client code; not really functional
+  * [#1108] Fix peerHungup method for IP to IP call
 
-  [ Sflphone Project ]
-  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta
+  [ Alexandre Savard ]
+  * [#1108] Correct setting of SIP contact for direct IP call
+  * [#1108] SIP user agent handles incoming REFER
 
   [ Emmanuel Milou ]
-  * [#1212] restore changelogs
+  * Remove website from repository
+  * Update translation
 
-  [ Sflphone Project ]
-  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta
-  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
-    04-28
+  [ Alexandre Savard ]
+  * Sflphone icon's tooltip changed for "configured" instead of
+    "registered"
 
   [ Emmanuel Milou ]
-  * [#1212] Restore changelogs
+  * Update translation
 
   [ Sflphone Project ]
 
- -- Sflphone Project <sflphone@mtl.savoirfairelinux.net>  Tue, 28 Apr 2009 12:23:35 -0400
+ -- Sflphone Project <sflphone@mtl.savoirfairelinux.net>  Tue, 05 May 2009 19:16:13 -0400
 
-sflphone-client-gnome (0.9.5-0ubuntu1~beta) SYSTEM; urgency=low
+sflphone-client-kde (0.9.5-0ubuntu1~beta) SYSTEM; urgency=low
 
   [ Julien Bonjean ]
   * Updated Eclipse stuff
@@ -262,7 +415,7 @@ sflphone-client-gnome (0.9.5-0ubuntu1~beta) SYSTEM; urgency=low
 
  -- Sflphone Project <sflphone@mtl.savoirfairelinux.net>  Mon, 27 Apr 2009 17:00:03 -0400
 
-sflphone-client-gnome (0.9.4-0ubuntu2) SYSTEM; urgency=low
+sflphone-client-kde (0.9.4-0ubuntu2) SYSTEM; urgency=low
 
   [ Alexandre Savard ]
   * Restore speex and GSM detection
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/rules b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/rules
index d2384782b6be0f328c9041a14bdee71c11c70c3a..b0066aad805e337ec5ad7f80cc84c32905c7ea0d 100755
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/rules
+++ b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/rules
@@ -31,7 +31,7 @@ build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp 
 
     # Add here commands to compile the arch part of the package.
-	$(MAKE)
+	$(MAKE) -j
 	touch $@
 
 build-indep: build-indep-stamp
diff --git a/tools/build-system/launch-build-machine.sh b/tools/build-system/launch-build-machine.sh
index ebaa0ac48c673187aaf5274ca339d2ab7d35647a..1b79a17c359250a4ef31aec8c52c3a92353de45a 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-28 18:30:17 -0400
+# Last Modified: 2009-05-29 14:23:45 -0400
 #####################################################
 
 #
@@ -228,7 +228,7 @@ if [ ${DO_PREPARE} ]; then
 			VERSION="${VERSION}~${RELEASE_MODE}"
 		fi
 	else
-		VERSION="${VERSION}-snapshot-${SNAPSHOT_TAG}"
+		VERSION="${VERSION}~snapshot${SNAPSHOT_TAG}"
 	fi
 	echo "Version is : ${VERSION}"
 
@@ -265,7 +265,7 @@ if [ ${DO_PREPARE} ]; then
 	# generate the changelog, according to the distribution and the git commit messages
 	echo "Update debian changelogs (2/2)"
 	cd ${REPOSITORY_DIR}
-	${SCRIPTS_DIR}/sfl-git-dch.sh ${RELEASE_MODE}
+	${SCRIPTS_DIR}/sfl-git-dch.sh ${VERSION} ${RELEASE_MODE}
 	
 	if [ "$?" -ne "0" ]; then
 		echo "!! Cannot update debian changelogs"
@@ -333,7 +333,7 @@ if [ ${DO_MAIN_LOOP} ]; then
 	        fi
 
 		echo "Launch remote build"
-		${SSH_BASE} "cd ${REMOTE_DEPLOY_DIR}/ubuntu/ && ./build-package-ubuntu.sh ${RELEASE_MODE}"
+		${SSH_BASE} "cd ${REMOTE_DEPLOY_DIR} && ./build-packages.sh ${RELEASE_MODE}"
 
 		if [ "$?" -ne "0" ]; then
 	                echo " !! Error during remote packaging process"
diff --git a/tools/build-system/sfl-git-dch.sh b/tools/build-system/sfl-git-dch.sh
index c6ea370334839e6de6dd566e98fe5ce066a1721d..35c2f757e7b2e14c80f910f136319d0d2e7e54a2 100755
--- a/tools/build-system/sfl-git-dch.sh
+++ b/tools/build-system/sfl-git-dch.sh
@@ -7,7 +7,7 @@
 # Author: Julien Bonjean (julien@bonjean.info) 
 #
 # Creation Date: 2009-05-13
-# Last Modified: 2009-05-28 18:24:53 -0400
+# Last Modified: 2009-05-29 14:23:50 -0400
 #####################################################
 
 # set -x