Merge branch 'master' into jbonjean

Conflicts:
	sflphone-common/src/dbus/configurationmanager-introspec.xml

.gitignore

@@ -168,7 +168,7 @@ sflphone-client-gnome/stamp-h1
 /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

build_tarball.sh

@@ -30,10 +30,12 @@ rm -rf $BUILDDIR
 rm -f *.tar.gz
 
 rm -rf lang/
-rm -rf tools/build-system/
-rm -f tools/pysflphone/*.pyc
-rm -f tools/build-package.sh tools/bleach.sh tools/autotoolize.sh
-rm -rf sflphone-client-kde/build
+rm -rf tools/
+rm -rf sflphone-client-kde/
+rm -rf sippxml
+
+rm -rf .git/
+rm -f .gitignore
 
 find -name .project -type f -exec rm {} \;
 find -name .cproject -type f -exec rm {} \;
@@ -56,6 +58,9 @@ rm -f pjlib-util/bin/pjlib-util-test-x86_64-unknown-linux-gnu
 rm -f pjnath/bin/pjturn-srv-x86_64-unknown-linux-gnu
 rm -f pjmedia/bin/pjmedia-test-x86_64-unknown-linux-gnu
 
+rm -f third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf
+rm -f third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf
+
 # Put actual files in the tarball
 rm -f config.guess config.sub
 cp /usr/share/misc/config.guess .

lang/copy-in-gnome.sh

-for fichier in `find  .  -name sflphone.po `
+for fichier in `find  .  -name *.po `
 do
 locale=`echo $fichier | cut -d / -f2`
-cp $fichier ../sflphone-client-gnome/po/$locale/sflphone-client-gnome.po
-echo "$fichier	copied to	../sflphone-client-gnome/po/$locale/sflphone-client-gnome.po"
+cp $fichier ../sflphone-client-gnome/po/$locale/$locale.po
+echo "$fichier	copied to	../sflphone-client-gnome/po/$locale/$locale.po"
 done