Merge branch 'jbonjean'

.gitignore

@@ -63,40 +63,40 @@ sflphone-client-gnome/stamp-h1
 /libs/pjproject-1.0.3/third_party/build/portaudio/os-auto.mak
 
 # Makefile
-sflphone-common/src/Makefile
-sflphone-common/src/dbus/Makefile
-sflphone-common/src/config/Makefile
-sflphone-common/src/plug-in/Makefile
-sflphone-common/src/plug-in/test/Makefile
-sflphone-common/src/plug-in/audiorecorder/Makefile
-sflphone-common/src/audio/Makefile
-sflphone-common/src/audio/codecs/Makefile
-sflphone-common/src/audio/codecs/ilbc/Makefile
-sflphone-common/src/hooks/Makefile
-sflphone-common/doc/Makefile
-sflphone-common/man/Makefile
-sflphone-common/po/Makefile
-sflphone-common/test/Makefile
-sflphone-common/ringtones/Makefile
-sflphone-common/doc/doxygen/Makefile
-sflphone-common/libs/Makefile
-sflphone-common/libs/utilspp/Makefile
-sflphone-common/libs/stund/Makefile
-sflphone-common/libs/iax2/Makefile
-sflphone-common/libs/utilspp/functor/Makefile
-sflphone-common/libs/utilspp/singleton/Makefile
-sflphone-client-gnome/Makefile
-sflphone-client-gnome/src/Makefile
-sflphone-client-gnome/src/config/Makefile
-sflphone-client-gnome/src/dbus/Makefile
-sflphone-client-gnome/src/contacts/Makefile
-sflphone-client-gnome/src/contacts/addressbook/Makefile
-sflphone-client-gnome/pixmaps/Makefile
-sflphone-client-gnome/tests/Makefile
-sflphone-client-gnome/man/Makefile
-sflphone-client-gnome/src/widget/Makefile
-sflphone-client-gnome/doc/Makefile
-sflphone-client-gnome/po/Makefile
+/sflphone-common/src/Makefile
+/sflphone-common/src/dbus/Makefile
+/sflphone-common/src/config/Makefile
+/sflphone-common/src/plug-in/Makefile
+/sflphone-common/src/plug-in/test/Makefile
+/sflphone-common/src/plug-in/audiorecorder/Makefile
+/sflphone-common/src/audio/Makefile
+/sflphone-common/src/audio/codecs/Makefile
+/sflphone-common/src/audio/codecs/ilbc/Makefile
+/sflphone-common/src/hooks/Makefile
+/sflphone-common/doc/Makefile
+/sflphone-common/man/Makefile
+/sflphone-common/po/Makefile
+/sflphone-common/test/Makefile
+/sflphone-common/ringtones/Makefile
+/sflphone-common/doc/doxygen/Makefile
+/sflphone-common/libs/Makefile
+/sflphone-common/libs/utilspp/Makefile
+/sflphone-common/libs/stund/Makefile
+/sflphone-common/libs/iax2/Makefile
+/sflphone-common/libs/utilspp/functor/Makefile
+/sflphone-common/libs/utilspp/singleton/Makefile
+/sflphone-client-gnome/Makefile
+/sflphone-client-gnome/src/Makefile
+/sflphone-client-gnome/src/config/Makefile
+/sflphone-client-gnome/src/dbus/Makefile
+/sflphone-client-gnome/src/contacts/Makefile
+/sflphone-client-gnome/src/contacts/addressbook/Makefile
+/sflphone-client-gnome/pixmaps/Makefile
+/sflphone-client-gnome/tests/Makefile
+/sflphone-client-gnome/man/Makefile
+/sflphone-client-gnome/src/widget/Makefile
+/sflphone-client-gnome/doc/Makefile
+/sflphone-client-gnome/po/Makefile
 
 
 # Ignore sflphone-client-gnome stuff
@@ -123,73 +123,87 @@ sflphone-client-gnome/po/Makefile
 
 # Ignore sub-modules stuff
 ## libiax2
-sflphone-common/libs/libiax2/doc/html
-sflphone-common/libs/libiax2/config.*
-sflphone-common/libs/libiax2/autom4te.cache
-sflphone-common/libs/libiax2/src/.libs
-sflphone-common/libs/libiax2/libtool
-sflphone-common/libs/libiax2/ltmain.sh
-sflphone-common/libs/libiax2/iax-config
-sflphone-common/libs/libiax2/configure
-sflphone-common/libs/libiax2/Makefile
-sflphone-common/libs/libiax2/iax2-config
-sflphone-common/libs/libiax2/src/Makefile
-sflphone-common
+/sflphone-common/libs/libiax2/doc/html
+/sflphone-common/libs/libiax2/config.*
+/sflphone-common/libs/libiax2/autom4te.cache
+/sflphone-common/libs/libiax2/src/.libs
+/sflphone-common/libs/libiax2/libtool
+/sflphone-common/libs/libiax2/ltmain.sh
+/sflphone-common/libs/libiax2/iax-config
+/sflphone-common/libs/libiax2/configure
+/sflphone-common/libs/libiax2/Makefile
+/sflphone-common/libs/libiax2/iax2-config
+/sflphone-common/libs/libiax2/src/Makefile
+/sflphone-common
 ## dbus-c++
-sflphone-common/libs/dbus-c++/Makefile
-sflphone-common/libs/dbus-c++/autom4te.cache/requests
-sflphone-common/libs/dbus-c++/config.log
-sflphone-common/libs/dbus-c++/Makefile
-sflphone-common/libs/dbus-c++/autom4te.cache/requests
-sflphone-common/libs/dbus-c++/config.log
-sflphone-common/libs/dbus-c++/config.status
-sflphone-common/libs/dbus-c++/configure
-sflphone-common/libs/dbus-c++/data/Makefile
-sflphone-common/libs/dbus-c++/dbus-c++-1-uninstalled.pc
-sflphone-common/libs/dbus-c++/dbus-c++-1.pc
-sflphone-common/libs/dbus-c++/doc/Doxyfile
-sflphone-common/libs/dbus-c++/doc/Makefile
-sflphone-common/libs/dbus-c++/examples/Makefile
-sflphone-common/libs/dbus-c++/examples/echo/.libs/
-sflphone-common/libs/dbus-c++/examples/echo/Makefile
-sflphone-common/libs/dbus-c++/examples/echo/echo-client-glue.h
-sflphone-common/libs/dbus-c++/examples/echo/echo-client-mt
-sflphone-common/libs/dbus-c++/examples/echo/echo-server
-sflphone-common/libs/dbus-c++/examples/echo/echo-server-glue.h
-sflphone-common/libs/dbus-c++/examples/glib/Makefile
-sflphone-common/libs/dbus-c++/examples/glib/dbus-glue.h
-sflphone-common/libs/dbus-c++/examples/hal/.libs/
-sflphone-common/libs/dbus-c++/examples/hal/Makefile
-sflphone-common/libs/dbus-c++/examples/hal/hal-listen
-sflphone-common/libs/dbus-c++/examples/properties/.libs/
-sflphone-common/libs/dbus-c++/examples/properties/Makefile
-sflphone-common/libs/dbus-c++/examples/properties/propsgs-client
-sflphone-common/libs/dbus-c++/examples/properties/propsgs-glue-adaptor.h
-sflphone-common/libs/dbus-c++/examples/properties/propsgs-glue-proxy.h
-sflphone-common/libs/dbus-c++/examples/properties/propsgs-server
-sflphone-common/libs/dbus-c++/include/dbus-c++/config.h
-sflphone-common/libs/dbus-c++/include/dbus-c++/stamp-h1
-sflphone-common/libs/dbus-c++/src/.libs/
-sflphone-common/libs/dbus-c++/src/Makefile
-sflphone-common/libs/dbus-c++/tools/.libs/
-sflphone-common/libs/dbus-c++/tools/Makefile
-sflphone-common/libs/dbus-c++/tools/dbusxx-introspect
-sflphone-common/libs/dbus-c++/tools/dbusxx-xml2cpp
+/sflphone-common/libs/dbus-c++/Makefile
+/sflphone-common/libs/dbus-c++/autom4te.cache/requests
+/sflphone-common/libs/dbus-c++/config.log
+/sflphone-common/libs/dbus-c++/Makefile
+/sflphone-common/libs/dbus-c++/autom4te.cache/requests
+/sflphone-common/libs/dbus-c++/config.log
+/sflphone-common/libs/dbus-c++/config.status
+/sflphone-common/libs/dbus-c++/configure
+/sflphone-common/libs/dbus-c++/data/Makefile
+/sflphone-common/libs/dbus-c++/dbus-c++-1-uninstalled.pc
+/sflphone-common/libs/dbus-c++/dbus-c++-1.pc
+/sflphone-common/libs/dbus-c++/doc/Doxyfile
+/sflphone-common/libs/dbus-c++/doc/Makefile
+/sflphone-common/libs/dbus-c++/examples/Makefile
+/sflphone-common/libs/dbus-c++/examples/echo/.libs/
+/sflphone-common/libs/dbus-c++/examples/echo/Makefile
+/sflphone-common/libs/dbus-c++/examples/echo/echo-client-glue.h
+/sflphone-common/libs/dbus-c++/examples/echo/echo-client-mt
+/sflphone-common/libs/dbus-c++/examples/echo/echo-server
+/sflphone-common/libs/dbus-c++/examples/echo/echo-server-glue.h
+/sflphone-common/libs/dbus-c++/examples/glib/Makefile
+/sflphone-common/libs/dbus-c++/examples/glib/dbus-glue.h
+/sflphone-common/libs/dbus-c++/examples/hal/.libs/
+/sflphone-common/libs/dbus-c++/examples/hal/Makefile
+/sflphone-common/libs/dbus-c++/examples/hal/hal-listen
+/sflphone-common/libs/dbus-c++/examples/properties/.libs/
+/sflphone-common/libs/dbus-c++/examples/properties/Makefile
+/sflphone-common/libs/dbus-c++/examples/properties/propsgs-client
+/sflphone-common/libs/dbus-c++/examples/properties/propsgs-glue-adaptor.h
+/sflphone-common/libs/dbus-c++/examples/properties/propsgs-glue-proxy.h
+/sflphone-common/libs/dbus-c++/examples/properties/propsgs-server
+/sflphone-common/libs/dbus-c++/include/dbus-c++/config.h
+/sflphone-common/libs/dbus-c++/include/dbus-c++/stamp-h1
+/sflphone-common/libs/dbus-c++/src/.libs/
+/sflphone-common/libs/dbus-c++/src/Makefile
+/sflphone-common/libs/dbus-c++/tools/.libs/
+/sflphone-common/libs/dbus-c++/tools/Makefile
+/sflphone-common/libs/dbus-c++/tools/dbusxx-introspect
+/sflphone-common/libs/dbus-c++/tools/dbusxx-xml2cpp
+
 # Ignore temp files
 *~
 
 # GNOME doc file
-sflphone-client-gnome/gnome-doc-utils.make
-sflphone-client-gnome/doc/de/
-sflphone-client-gnome/doc/fr/
-sflphone-client-gnome/doc/es/
-sflphone-client-gnome/doc/it/
-sflphone-client-gnome/doc/ko/
-sflphone-client-gnome/doc/pl/
-sflphone-client-gnome/doc/pt/
-sflphone-client-gnome/doc/pt_BR/
-sflphone-client-gnome/doc/ru/
-sflphone-client-gnome/doc/zh_CN/
-sflphone-client-gnome/doc/zh_TW/
-sflphone-client-gnome/doc/zh_HK/
+/sflphone-client-gnome/gnome-doc-utils.make
+/sflphone-client-gnome/doc/de/
+/sflphone-client-gnome/doc/fr/
+/sflphone-client-gnome/doc/es/
+/sflphone-client-gnome/doc/it/
+/sflphone-client-gnome/doc/ko/
+/sflphone-client-gnome/doc/pl/
+/sflphone-client-gnome/doc/pt/
+/sflphone-client-gnome/doc/pt_BR/
+/sflphone-client-gnome/doc/ru/
+/sflphone-client-gnome/doc/zh_CN/
+/sflphone-client-gnome/doc/zh_TW/
+/sflphone-client-gnome/doc/zh_HK/
+
+# build system
+/tools/build-system/launchpad/sflphone-common
+!/tools/build-system/launchpad/sflphone-common/debian
+/tools/build-system/launchpad/sflphone-client-gnome
+!/tools/build-system/launchpad/sflphone-client-gnome/debian
+/tools/build-system/launchpad/sflphone-client-kde
+!/tools/build-system/launchpad/sflphone-client-kde/debian
+/tools/build-system/launchpad/*.dsc
+/tools/build-system/launchpad/*.changes
+/tools/build-system/launchpad/*.tar.gz
+/tools/build-system/launchpad/*.build
+/tools/build-system/launchpad/*.upload
 

sflphone-client-gnome/Makefile.am

@@ -7,7 +7,7 @@ GNOME_DOC=gnome-doc-utils.make
 log4crc_DATA = log4crc
 log4crcdir = $(datadir)/sflphone
 
-uidir=$(DESTDIR)$(datadir)/sflphone/ui
+uidir=$(datadir)/sflphone/ui
 ui_DATA=src/ui.xml
 
 EXTRA_DIST   = $(log4crc_DATA) sflphone.desktop.in $(GNOME_DOC) m4 $(UI_DATA)

tools/build-system/launch-build-machine-2.sh

+#!/bin/bash
+#####################################################
+# File Name: launch-build-machine.sh
+#
+# Purpose :
+#
+# Author: Julien Bonjean (julien@bonjean.info) 
+#
+# Creation Date: 2009-10-20
+# Last Modified: 2009-10-21 16:54:28 -0400
+#####################################################
+
+# home directory
+ROOT_DIR=${HOME}
+
+# gpg passphrase file
+GPG_FILE="${ROOT_DIR}/.gpg-sflphone"
+
+IS_RELEASE=
+VERSION_INDEX="1"
+DO_PUSH=1
+DO_LOGGING=1
+DO_UPLOAD=1
+DO_GIT_BRANCH_CHANGE=1
+
+EDITOR=echo
+export EDITOR
+
+REFERENCE_REPOSITORY="${ROOT_DIR}/sflphone-source-repository"
+
+WORKING_DIR="${ROOT_DIR}/sflphone-build-repository/tools/build-system"
+LAUNCHPAD_DIR="${WORKING_DIR}/launchpad"
+LAUNCHPAD_DISTRIBUTIONS=( "jaunty" "karmic" )
+LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" "sflphone-common" )
+
+echo
+echo "    /***********************\\"
+echo "    | SFLPhone build system |"
+echo "    \\***********************/"
+echo
+
+for PARAMETER in $*
+do
+        case ${PARAMETER} in
+        --help)
+                echo
+                echo "Options :"
+                echo " --skip-push"
+                echo " --skip-upload"
+                echo " --no-logging"
+                echo " --skip-git-branch-change"
+                echo " --release"
+                echo " --version-index=[1,2,...]"
+                echo
+                exit 0;;
+        --skip-push)
+                unset DO_PUSH;;
+        --skip-git-branch-change)
+                unset DO_GIT_BRANCH_CHANGE;;
+         --skip-upload)
+                unset DO_UPLOAD;;
+        --no-logging)
+                unset DO_LOGGING;;
+        --release)
+                IS_RELEASE=1;;
+        --version-index=*)
+                VERSION_INDEX=(${PARAMETER##*=});;
+        *)
+                echo "Unknown parameter : ${PARAMETER}"
+                exit -1;;
+        esac
+done
+
+#########################
+# LAUNCHPAD
+#########################
+
+# change to working directory
+cd ${LAUNCHPAD_DIR}
+
+if [ "$?" -ne "0" ]; then
+        echo " !! Cannot cd to launchpad directory"
+        exit -1
+fi
+
+# logging
+if [ ${DO_LOGGING} ]; then
+
+	# open file descriptor
+	exec 3<> ${ROOT_DIR}/packaging.log
+
+	# redirect outputs (stdout & stderr)
+	exec 1>&3
+	exec 2>&3
+fi
+
+if [ ${RELEASE_MODE} ]; then
+	echo "Release mode"
+else
+	echo "Snapshot mode"
+fi
+
+#########################
+# COMMON PART
+#########################
+
+echo "Update reference sources"
+if [ ${IS_RELEASE} ]; then
+        cd ${REFERENCE_REPOSITORY} && git checkout origin/release -b release && git pull
+else
+        cd ${REFERENCE_REPOSITORY} && git checkout master && git pull
+fi
+
+echo "Retrieve build info"
+# retrieve info we may need
+cd ${REFERENCE_REPOSITORY}
+CURRENT_RELEASE_TAG_NAME=`git tag -l "[0-9]\.[0-9]\.[0-9]\.*" | tail -n 1`
+PREVIOUS_RELEASE_TAG_NAME=`git tag -l "[0-9]\.[0-9]\.[0-9]\.*" | tail -n 2 | sed -n '1p;1q'`
+CURRENT_RELEASE_COMMIT_HASH=`git show --pretty=format:"%H" -s ${CURRENT_RELEASE_TAG_NAME} | tail -n 1`
+PREVIOUS_RELEASE_COMMIT_HASH=`git show --pretty=format:"%H" -s ${PREVIOUS_RELEASE_TAG_NAME} | tail -n 1`
+CURRENT_COMMIT=`git show --pretty=format:"%H"  -s | tail -n 1`
+CURRENT_RELEASE_TYPE=${CURRENT_RELEASE_TAG_NAME##*.}
+PREVIOUS_RELEASE_TYPE=${PREVIOUS_RELEASE_TAG_NAME##*.}
+CURRENT_RELEASE_VERSION=${CURRENT_RELEASE_TAG_NAME%*.*}
+PREVIOUS_VERSION=${PREVIOUS_RELEASE_TAG_NAME%*.*}
+cd ${LAUNCHPAD_DIR}
+
+COMMIT_HASH_BEGIN=""
+COMMIT_HASH_END=""
+SOFTWARE_VERSION=""
+
+echo "Clean build directory"
+git clean -f -x ${LAUNCHPAD_DIR}/* >/dev/null
+
+if [ ${IS_RELEASE} ]; then
+	VERSION_APPEND=""
+	if [ "${CURRENT_RELEASE_TYPE}" != "stable" ] ; then
+		VERSION_APPEND="~${CURRENT_RELEASE_TYPE}"
+	fi
+	SOFTWARE_VERSION="${CURRENT_RELEASE_VERSION}${VERSION_APPEND}"
+	COMMIT_HASH_BEGIN="${PREVIOUS_RELEASE_COMMIT_HASH}"
+else
+	SNAPSHOT_TAG=`date +%Y%m%d`
+	SOFTWARE_VERSION="snapshot${SNAPSHOT_TAG}0${VERSION_INDEX}"
+	COMMIT_HASH_BEGIN="${CURRENT_RELEASE_COMMIT_HASH}"
+fi
+
+cd ${LAUNCHPAD_DIR}
+
+VERSION="ppa~SYSTEM~${SOFTWARE_VERSION}"
+
+for LAUNCHPAD_PACKAGE in ${LAUNCHPAD_PACKAGES[*]}
+do
+	echo " Package: ${LAUNCHPAD_PACKAGE}"	
+
+	echo "  --> Clean old sources"
+	git clean -f -x ${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}/* >/dev/null
+
+	echo "  --> Retrieve new sources"
+	cp -r ${REFERENCE_REPOSITORY}/${LAUNCHPAD_PACKAGE} ${LAUNCHPAD_DIR}/ 
+
+	DEBIAN_DIR="${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}/debian"
+
+	echo "  --> Clean debian directory"
+	git checkout ${DEBIAN_DIR} 
+
+	echo "  --> Update debian changelog"
+
+cat << END > ${WORKING_DIR}/sfl-git-dch.conf
+WORKING_DIR="${WORKING_DIR}"
+SOFTWARE="${LAUNCHPAD_PACKAGE}"
+VERSION="${VERSION}"
+DISTRIBUTION="SYSTEM"
+CHANGELOG_FILE="${DEBIAN_DIR}/changelog"
+COMMIT_HASH_BEGIN="${COMMIT_HASH_BEGIN}"
+COMMIT_HASH_END="${COMMIT_HASH_END}"
+IS_RELEASE=${IS_RELEASE}
+export DEBFULLNAME="SFLphone Automatic Build System"
+export DEBEMAIL="team@sflphone.org"
+export EDITOR="echo"
+END
+
+	${WORKING_DIR}/sfl-git-dch-2.sh ${WORKING_DIR}/sfl-git-dch.conf
+	if [ "$?" -ne "0" ]; then
+		echo "!! Cannot update debian changelogs"
+		exit -1
+	fi
+	rm -f ${WORKING_DIR}/sfl-git-dch.conf >/dev/null 2>&1
+
+	cp ${DEBIAN_DIR}/changelog ${DEBIAN_DIR}/changelog.generic
+	
+	for LAUNCHPAD_DISTRIBUTION in ${LAUNCHPAD_DISTRIBUTIONS[*]}
+	do
+
+		LOCAL_VERSION="ppa~${LAUNCHPAD_DISTRIBUTION}~${SOFTWARE_VERSION}"
+
+		cp ${DEBIAN_DIR}/control.${LAUNCHPAD_DISTRIBUTION} ${DEBIAN_DIR}/control
+		cp ${DEBIAN_DIR}/changelog.generic ${DEBIAN_DIR}/changelog
+
+		sed -i "s/SYSTEM/${LAUNCHPAD_DISTRIBUTION}/g" ${DEBIAN_DIR}/changelog
+
+		cd ${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}
+		./autogen.sh
+		debuild -S -sa -kCCCC676C
+		cd ${LAUNCHPAD_DIR}
+
+		if [ ${DO_UPLOAD} ] ; then
+			dput -f -c ${LAUNCHPAD_DIR}/dput.conf sflphone-${LAUNCHPAD_DISTRIBUTION} ${LAUNCHPAD_PACKAGE}_${LOCAL_VERSION}_source.changes
+		fi
+	done
+
+done
+
+# if push is activated
+if [[ ${DO_PUSH} && ${IS_RELEASE} && ${DO_GIT_BRANCH_CHANGE} ]];then
+	echo " Doing commit"
+	git commit -m "[#1262] Released ${SOFTWARE_VERSION}" .
+
+	echo " Pushing commit"
+	git push origin release
+fi
+
+# close file descriptor
+exec 3>&-
+
+exit 0
+

tools/build-system/launchpad/debian-sflphone-client-gnome/control.intrepid

-Source: sflphone-client-gnome
-Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1, autoconf, libtool, libgtk2.0-dev, libsexy-dev, libdbus-glib-1-dev, libnotify-dev, libebook1.2-dev, check, liblog4c-dev
-Standards-Version: 3.8.0
-
-Package: sflphone-client-gnome
-Priority: optional
-Architecture: any
-Depends: sflphone-common (=VERSION), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0), libdbus-glib-1-2, libnotify1 (>= 0.4), libsexy2 (>= 0.1), librsvg2-common (>= 2.22.2), liblog4c3
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: GNOME client for SFLphone
- Provide a GNOME client to SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.

tools/build-system/launchpad/debian-sflphone-client-kde/control.intrepid

-Source: sflphone-client-kde
-Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
-Section: kde
-Priority: optional
-Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2), libqt4-dev (>=4.3)
-Standards-Version: 3.7.3
-
-Package: sflphone-client-kde
-Priority: optional
-Architecture: any
-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
-Description: KDE client for SFLphone
- Provide a KDE client for SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.

tools/build-system/launchpad/debian-sflphone-client-kde/control.jaunty

-Source: sflphone-client-kde
-Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
-Section: kde
-Priority: optional
-Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2), libqt4-dev (>=4.3)
-Standards-Version: 3.7.3
-
-Package: sflphone-client-kde
-Priority: optional
-Architecture: i386
-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
-Description: KDE client for SFLphone
- Provide a KDE client for SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.

tools/build-system/launchpad/debian-sflphone-common/control.hardy

-Source: sflphone-common
-Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1, autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, uuid-dev, libexpat1-dev
-Standards-Version: 3.7.3
-
-Package: sflphone-common
-Priority: optional
-Architecture: any
-Depends:  libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1, libc6 (>= 2.3.6-6) , libcommoncpp2-1.6-0 ,libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-0
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone - Core
- This package provides SFLphone daemon, that is the core of the application.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.

tools/build-system/launchpad/debian-sflphone-common/control.intrepid

-Source: sflphone-common
-Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1 , autoconf, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev
-Standards-Version: 3.8.0
-
-Package: sflphone-common
-Priority: optional
-Architecture: any
-Depends: libsamplerate0 (>=0.1.2) , libexpat1 , libc6 (>= 2.3.6-6) , libcommoncpp2-1.6-0 , libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-1, libspeexdsp1
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone - Core 
- This package provides SFLphone daemon, that is the core of the application.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.

tools/build-system/launchpad/dput.conf

+[sflphone-jaunty]
+fqdn = ppa.launchpad.net
+method = ftp
+incoming = ~julien-bonjean/ppa/ubuntu/jaunty
+login = anonymous
+allow_unsigned_uploads = 0
+
+[sflphone-karmic]
+fqdn = ppa.launchpad.net
+method = ftp
+incoming = ~julien-bonjean/ppa/ubuntu/karmic
+login = anonymous
+allow_unsigned_uploads = 0
+

tools/build-system/launchpad/debian-sflphone-client-gnome/changelog → tools/build-system/launchpad/sflphone-client-gnome/debian/changelog

-sflphone-client-gnome (0.9.7~karmic) karmic; urgency=low
+sflphone-client-gnome (0.9.6-SYSVER) SYSTEM; urgency=low
 
     ** 0.9.6 **
 

tools/build-system/launchpad/debian-sflphone-client-gnome/control.hardy → tools/build-system/launchpad/sflphone-client-gnome/debian/control.jaunty

 Source: sflphone-client-gnome
-Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
+Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
 Section: gnome
 Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1, autoconf, automake, libtool, libgtk2.0-dev, libsexy-dev, libdbus-glib-1-dev, libnotify-dev, libebook1.2-dev, check, liblog4c-dev
+Build-Depends: debhelper, libgcc1, autoconf, automake, libtool, libgtk2.0-dev, libdbus-glib-1-dev, libnotify-dev, libebook1.2-dev, check, liblog4c-dev, libgnomeui-dev, gnome-doc-utils, rarian-compat
 Standards-Version: 3.7.3
 
 Package: sflphone-client-gnome
 Priority: optional
 Architecture: any
-Depends: sflphone-common (=VERSION), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0), libdbus-glib-1-2, libnotify1 (>= 0.4), libsexy2 (>= 0.1), librsvg2-common (>=2.22.2), liblog4c3
+Depends: sflphone-common (=${source:Version}), libdbus-glib-1-2, libgtk2.0-0, libc6, libglib2.0-0, libdbus-glib-1-2, libnotify1, librsvg2-common, liblog4c3, libebook1.2-9, libgnomeui-0
 Replaces: sflphone
 Conflicts: sflphone
 Homepage: http://www.sflphone.org
 Description: GNOME client for SFLphone
- Provide a GNOME client to SFLphone.
+ Provide a GNOME client for SFLphone.
  SFLphone is meant to be a robust enterprise-class desktop phone.
  SFLphone is released under the GNU General Public License.
  SFLphone is being developed by the global community, and maintained by

tools/build-system/launchpad/debian-sflphone-client-gnome/control → tools/build-system/launchpad/sflphone-client-gnome/debian/control.karmic

 Source: sflphone-client-gnome
-Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
+Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
 Section: gnome
 Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1, autoconf, automake, libtool, libgtk2.0-dev (>=2.16), libdbus-glib-1-dev, libnotify-dev, libebook1.2-dev, check, liblog4c-dev, libgnomeui-dev, gnome-doc-utils, rarian-compat
+Build-Depends: debhelper, libgcc1, autoconf, automake, libtool, libgtk2.0-dev, libdbus-glib-1-dev, libnotify-dev, libebook1.2-dev, check, liblog4c-dev, libgnomeui-dev, gnome-doc-utils, rarian-compat
 Standards-Version: 3.7.3
 
 Package: sflphone-client-gnome
 Priority: optional
-#Architecture: any
-Architecture: i386
-Depends: sflphone-common (=VERSION), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 (>=2.16) , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) ,libdbus-glib-1-2, libnotify1 (>= 0.4), librsvg2-common (>=2.22.2), liblog4c3
+Architecture: any
+Depends: sflphone-common (=${source:Version}), libdbus-glib-1-2, libgtk2.0-0, libc6, libglib2.0-0, libdbus-glib-1-2, libnotify1, librsvg2-common, liblog4c3, libebook1.2-9, libgnomeui-0
 Replaces: sflphone
 Conflicts: sflphone
 Homepage: http://www.sflphone.org