Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

tools/build-system/launchpad/dput.conf

@@ -53,3 +53,10 @@ method = ftp
 incoming = ~savoirfairelinux/sflphone-nightly/ubuntu/maverick
 login = anonymous
 allow_unsigned_uploads = 0
+
+[sflphone-nightly-natty]
+fqdn = ppa.launchpad.net
+method = ftp
+incoming = ~savoirfairelinux/sflphone-nightly/ubuntu/natty
+login = anonymous
+allow_unsigned_uploads = 0

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

+Source: sflphone-client-gnome
+Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
+Section: gnome
+Priority: optional
+Build-Depends: debhelper, libgcc1, autoconf, automake, libtool, libgtk2.0-dev, libdbus-glib-1-dev, libnotify-dev, libebook1.2-dev, libedataserver1.2-dev, libedataserverui1.2-dev, check, liblog4c-dev, libgnomeui-dev, gnome-doc-utils, rarian-compat, libwebkitgtk-dev
+Standards-Version: 3.7.3
+
+Package: sflphone-client-gnome
+Priority: optional
+Architecture: any
+Depends: sflphone-common (=${source:Version}), libdbus-glib-1-2, libgtk2.0-0, libc6, libglib2.0-0, libnotify1, librsvg2-common, liblog4c3, libebook1.2-9, libedataserver1.2-13, libedataserverui1.2-11, libgnomeui-0, libwebkitgtk-1.0-0
+Replaces: sflphone
+Conflicts: sflphone
+Homepage: http://www.sflphone.org
+Description: GNOME client for 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
+ Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.

tools/build-system/launchpad/sflphone-client-gnome/debian/copyright

@@ -11,7 +11,7 @@ Savoir-Faire Linux Inc.
 
 License:
 
-This software is copyright (c) 2004-2009 Savoir-Faire Linux inc.
+This software is copyright (c) 2004-2011 Savoir-Faire Linux inc.
 
 You are free to distribute this software under the terms of
 the GNU General Public License version 3.

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

+Source: sflphone-common
+Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
+Section: gnome
+Priority: optional
+Build-Depends: debhelper, libgcc1 , autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev, libzrtpcpp-dev, libssl-dev, libpcre3-dev, libyaml-dev, libcelt-dev
+Standards-Version: 3.7.3
+
+Package: sflphone-common
+Priority: optional
+Architecture: any
+Depends: libsamplerate0, libexpat1 , libc6, libccgnu2-1.7-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.7-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8, libpcre3, libyaml-0-2, libcelt0-0
+Replaces: sflphone
+Conflicts: sflphone
+Homepage: http://www.sflphone.org
+Description: SIP and IAX2 compatible softphone - Core
+ 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/sflphone-common/debian/copyright

@@ -11,7 +11,7 @@ Savoir-Faire Linux Inc.
 
 License:
 
-This software is copyright (c) 2004-2009 Savoir-Faire Linux inc.
+This software is copyright (c) 2004-2011 Savoir-Faire Linux inc.
 
 You are free to distribute this software under the terms of
 the GNU General Public License version 3.

tools/build-system/setenv.sh

@@ -22,6 +22,6 @@ export REFERENCE_REPOSITORY="${ROOT_DIR}/sflphone-source-repository"
 
 export WORKING_DIR="${ROOT_DIR}/sflphone-build-repository/tools/build-system"
 export LAUNCHPAD_DIR="${WORKING_DIR}/launchpad"
-LAUNCHPAD_DISTRIBUTIONS=( "karmic" "lucid" "maverick" )
+LAUNCHPAD_DISTRIBUTIONS=( "lucid" "maverick" "natty")
 export LAUNCHPAD_DISTRIBUTIONS