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

Merge branch 'master' into jbonjean

parents e2c191b2 4e0b59dd
Branches
Tags
No related merge requests found
Showing with 50 additions and 27 deletions
...@@ -2,8 +2,14 @@ sflphone-client-gnome (0.9.5-SYSVER~rc2) SYSTEM; urgency=low ...@@ -2,8 +2,14 @@ sflphone-client-gnome (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
** 0.9.5 rc2 ** ** 0.9.5 rc2 **
* [#1422] Improved error message
* [#1402] Fix pjsip build * [#1402] Fix pjsip build
* [#1404] Clear GTK-Critical Bug at client startup * [#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
* Changes for name based dbus connection * Changes for name based dbus connection
* Clean changelogs * Clean changelogs
* [#1343] Gnome: Implement a callback system to handle focus on * [#1343] Gnome: Implement a callback system to handle focus on
...@@ -26,6 +32,7 @@ sflphone-client-gnome (0.9.5-SYSVER~rc2) SYSTEM; urgency=low ...@@ -26,6 +32,7 @@ sflphone-client-gnome (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
* [#1407] Add a scenario to pick_up action * [#1407] Add a scenario to pick_up action
* Test client dbus connection to a fixed owner * Test client dbus connection to a fixed owner
* Add python dbus test suite * Add python dbus test suite
* [#1161] Modified version handling in build system
* [#1314] Test pulse audio and audio streams connect and disconnect * [#1314] Test pulse audio and audio streams connect and disconnect
* [#1402] Add info message after configure * [#1402] Add info message after configure
* [#1402] Build the daemon with the local pjsip library (vs the * [#1402] Build the daemon with the local pjsip library (vs the
...@@ -36,10 +43,12 @@ sflphone-client-gnome (0.9.5-SYSVER~rc2) SYSTEM; urgency=low ...@@ -36,10 +43,12 @@ sflphone-client-gnome (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
* [#1314] Refactoring of pulselayer to test conect/disconnect * [#1314] Refactoring of pulselayer to test conect/disconnect
* Add debug messages in debus calls concerning account * Add debug messages in debus calls concerning account
* [#1314] Add some return values to audio init functions * [#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 #1405: Fix strings as requested.
* Bug #1404: Fix strings in preferences panel. * Bug #1404: Fix strings in preferences panel.
-- SFLphone Automatic Build System <team@sflphone.org> Fri, 15 May 2009 16:57:05 -0400 -- SFLphone Automatic Build System <team@sflphone.org> Tue, 19 May 2009 12:08:18 -0400
sflphone-client-gnome (0.9.5-0ubuntu1~rc1) SYSTEM; urgency=low sflphone-client-gnome (0.9.5-0ubuntu1~rc1) SYSTEM; urgency=low
......
...@@ -8,7 +8,7 @@ Standards-Version: 3.7.3 ...@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
Package: sflphone-client-gnome Package: sflphone-client-gnome
Priority: optional Priority: optional
Architecture: any Architecture: any
Depends: sflphone-common (>= 0.9.5), 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 (=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 Replaces: sflphone
Conflicts: sflphone Conflicts: sflphone
Homepage: http://www.sflphone.org Homepage: http://www.sflphone.org
......
...@@ -8,7 +8,7 @@ Standards-Version: 3.8.0 ...@@ -8,7 +8,7 @@ Standards-Version: 3.8.0
Package: sflphone-client-gnome Package: sflphone-client-gnome
Priority: optional Priority: optional
Architecture: any Architecture: any
Depends: sflphone-common (>=0.9.5), 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 (=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 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-gnome Package: sflphone-client-gnome
Priority: optional Priority: optional
Architecture: any Architecture: any
Depends: sflphone-common (>=0.9.5), 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 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
Replaces: sflphone Replaces: sflphone
Conflicts: sflphone Conflicts: sflphone
Homepage: http://www.sflphone.org Homepage: http://www.sflphone.org
......
# Makefile.am # Makefile.am
if BUILD_TEST
TESTS_DIR=test
unittest: unittest:
@(cd test; make) @(cd test; make)
@echo "" @echo ""
@echo "NOTICE: Unitary tests successfully build" @echo "NOTICE: Unitary tests successfully build"
@echo "Go in the test directory to run them" @echo "Go in the test directory to run them"
@echo "" @echo ""
else
unittest:
@echo "SFLphone WARNING:"
@echo " -- You need the cppunit devel package to compile the unitary tests."
endif
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
SUBDIRS = libs src ringtones po man test SUBDIRS = libs src ringtones po man $(TESTS_DIR)
EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/* README.gentoo EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/* README.gentoo
...@@ -267,11 +267,9 @@ AC_ARG_WITH(build-libdbus-cxx, ...@@ -267,11 +267,9 @@ AC_ARG_WITH(build-libdbus-cxx,
) )
AC_SUBST(BUILD_LIBDBUS_CXX_DIR) AC_SUBST(BUILD_LIBDBUS_CXX_DIR)
dnl Check for libcppunit-dev dnl Check for libcppunit-dev
CPPUNIT_MIN_VERSION=1.12 CPPUNIT_MIN_VERSION=1.12
PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION}) PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION}, AM_CONDITIONAL(BUILD_TEST, test 1 = 1 ), AM_CONDITIONAL(BUILD_TEST, test 0 = 1 ))
AC_SUBST(CPPUNIT_LIBS) AC_SUBST(CPPUNIT_LIBS)
# check for libgsm1 (doesn't use pkg-config) # check for libgsm1 (doesn't use pkg-config)
......
...@@ -2,8 +2,14 @@ sflphone-common (0.9.5-SYSVER~rc2) SYSTEM; urgency=low ...@@ -2,8 +2,14 @@ sflphone-common (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
** 0.9.5 rc2 ** ** 0.9.5 rc2 **
* [#1422] Improved error message
* [#1402] Fix pjsip build * [#1402] Fix pjsip build
* [#1404] Clear GTK-Critical Bug at client startup * [#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
* Changes for name based dbus connection * Changes for name based dbus connection
* Clean changelogs * Clean changelogs
* [#1343] Gnome: Implement a callback system to handle focus on * [#1343] Gnome: Implement a callback system to handle focus on
...@@ -26,6 +32,7 @@ sflphone-common (0.9.5-SYSVER~rc2) SYSTEM; urgency=low ...@@ -26,6 +32,7 @@ sflphone-common (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
* [#1407] Add a scenario to pick_up action * [#1407] Add a scenario to pick_up action
* Test client dbus connection to a fixed owner * Test client dbus connection to a fixed owner
* Add python dbus test suite * Add python dbus test suite
* [#1161] Modified version handling in build system
* [#1314] Test pulse audio and audio streams connect and disconnect * [#1314] Test pulse audio and audio streams connect and disconnect
* [#1402] Add info message after configure * [#1402] Add info message after configure
* [#1402] Build the daemon with the local pjsip library (vs the * [#1402] Build the daemon with the local pjsip library (vs the
...@@ -36,10 +43,12 @@ sflphone-common (0.9.5-SYSVER~rc2) SYSTEM; urgency=low ...@@ -36,10 +43,12 @@ sflphone-common (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
* [#1314] Refactoring of pulselayer to test conect/disconnect * [#1314] Refactoring of pulselayer to test conect/disconnect
* Add debug messages in debus calls concerning account * Add debug messages in debus calls concerning account
* [#1314] Add some return values to audio init functions * [#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 #1405: Fix strings as requested.
* Bug #1404: Fix strings in preferences panel. * Bug #1404: Fix strings in preferences panel.
-- SFLphone Automatic Build System <team@sflphone.org> Fri, 15 May 2009 16:56:52 -0400 -- SFLphone Automatic Build System <team@sflphone.org> Tue, 19 May 2009 12:08:03 -0400
sflphone-common (0.9.5-0ubuntu1~rc1) SYSTEM; urgency=low sflphone-common (0.9.5-0ubuntu1~rc1) SYSTEM; urgency=low
......
...@@ -2,7 +2,7 @@ Source: sflphone-common ...@@ -2,7 +2,7 @@ Source: sflphone-common
Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com> Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome Section: gnome
Priority: optional Priority: optional
Build-Depends: debhelper (>= 5), libgcc1, autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, uuid-dev 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 Standards-Version: 3.7.3
Package: sflphone-common Package: sflphone-common
......
...@@ -2,7 +2,7 @@ Source: sflphone-common ...@@ -2,7 +2,7 @@ Source: sflphone-common
Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com> Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome Section: gnome
Priority: optional Priority: optional
Build-Depends: debhelper (>= 5), libgcc1 , autoconf, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev 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 Standards-Version: 3.8.0
Package: sflphone-common Package: sflphone-common
......
...@@ -2,7 +2,7 @@ Source: sflphone-common ...@@ -2,7 +2,7 @@ Source: sflphone-common
Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com> Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome Section: gnome
Priority: optional Priority: optional
Build-Depends: debhelper (>= 5), libgcc1 , autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev 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, libspeexdsp-dev, uuid-dev, libexpat1-dev
Standards-Version: 3.7.3 Standards-Version: 3.7.3
Package: sflphone-common Package: sflphone-common
......
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: sflphone\n" "Project-Id-Version: sflphone\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-05-05 17:03-0400\n" "POT-Creation-Date: 2009-05-05 17:43-0400\n"
"PO-Revision-Date: 2009-01-08 10:46-0500\n" "PO-Revision-Date: 2009-01-08 10:46-0500\n"
"Last-Translator: Sven Werlen <sven.werlen@savoirfairelinux.com>\n" "Last-Translator: Sven Werlen <sven.werlen@savoirfairelinux.com>\n"
"Language-Team: SavoirFaire Linux Inc <sflphoneteam@savoirfairelinux.com>\n" "Language-Team: SavoirFaire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
...@@ -438,8 +438,8 @@ msgid "_Show main window" ...@@ -438,8 +438,8 @@ msgid "_Show main window"
msgstr "_Hauptfenster anzeigen" msgstr "_Hauptfenster anzeigen"
#: ../../sflphone-client-gnome/src/statusicon.c:124 #: ../../sflphone-client-gnome/src/statusicon.c:124
#, c-format #, fuzzy, c-format
msgid "SFLphone - %i accounts registered" msgid "SFLphone - %i accounts configured"
msgstr "SFLphone - %i Konten registriert" msgstr "SFLphone - %i Konten registriert"
#: ../../sflphone-client-gnome/src/timestamp.c:46 #: ../../sflphone-client-gnome/src/timestamp.c:46
......
...@@ -9,7 +9,7 @@ msgid "" ...@@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: SFLphone 0.9.4\n" "Project-Id-Version: SFLphone 0.9.4\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-05-05 17:03-0400\n" "POT-Creation-Date: 2009-05-05 17:43-0400\n"
"PO-Revision-Date: 2008-08-11 11:53+0200\n" "PO-Revision-Date: 2008-08-11 11:53+0200\n"
"Last-Translator: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>\n" "Last-Translator: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>\n"
"Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n" "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
...@@ -435,8 +435,8 @@ msgid "_Show main window" ...@@ -435,8 +435,8 @@ msgid "_Show main window"
msgstr "Mostrar ventana principal" msgstr "Mostrar ventana principal"
#: ../../sflphone-client-gnome/src/statusicon.c:124 #: ../../sflphone-client-gnome/src/statusicon.c:124
#, c-format #, fuzzy, c-format
msgid "SFLphone - %i accounts registered" msgid "SFLphone - %i accounts configured"
msgstr "SFLphone - %i cuenta registrada" msgstr "SFLphone - %i cuenta registrada"
#: ../../sflphone-client-gnome/src/timestamp.c:46 #: ../../sflphone-client-gnome/src/timestamp.c:46
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: SFLphone 0.9.4\n" "Project-Id-Version: SFLphone 0.9.4\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-05-05 17:03-0400\n" "POT-Creation-Date: 2009-05-05 17:43-0400\n"
"PO-Revision-Date: 2009-01-08 15:19 GMT-5\n" "PO-Revision-Date: 2009-01-08 15:19 GMT-5\n"
"Last-Translator: HUSSEIN ABDALLAH <hussein.abdallah@savoirfairelinux.com>\n" "Last-Translator: HUSSEIN ABDALLAH <hussein.abdallah@savoirfairelinux.com>\n"
"Language-Team: Savoir-Faire Linux Inc <sflphoneteam@savoirfairelinux.com>\n" "Language-Team: Savoir-Faire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
...@@ -432,8 +432,8 @@ msgid "_Show main window" ...@@ -432,8 +432,8 @@ msgid "_Show main window"
msgstr "_Показать главное окно" msgstr "_Показать главное окно"
#: ../../sflphone-client-gnome/src/statusicon.c:124 #: ../../sflphone-client-gnome/src/statusicon.c:124
#, c-format #, fuzzy, c-format
msgid "SFLphone - %i accounts registered" msgid "SFLphone - %i accounts configured"
msgstr "SFLphone - Зарегистрировано %i аккаунтов" msgstr "SFLphone - Зарегистрировано %i аккаунтов"
#: ../../sflphone-client-gnome/src/timestamp.c:46 #: ../../sflphone-client-gnome/src/timestamp.c:46
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: SFLphone 0.9.2\n" "Project-Id-Version: SFLphone 0.9.2\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-05-05 17:03-0400\n" "POT-Creation-Date: 2009-05-05 17:43-0400\n"
"PO-Revision-Date: 2008-10-28 14:15\n" "PO-Revision-Date: 2008-10-28 14:15\n"
"Last-Translator: Yun Liu <yun.liu@savoirfairelinux.com>\n" "Last-Translator: Yun Liu <yun.liu@savoirfairelinux.com>\n"
"Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n" "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
...@@ -432,8 +432,8 @@ msgid "_Show main window" ...@@ -432,8 +432,8 @@ msgid "_Show main window"
msgstr "显示主窗口(S)" msgstr "显示主窗口(S)"
#: ../../sflphone-client-gnome/src/statusicon.c:124 #: ../../sflphone-client-gnome/src/statusicon.c:124
#, c-format #, fuzzy, c-format
msgid "SFLphone - %i accounts registered" msgid "SFLphone - %i accounts configured"
msgstr "SFLphone - %i 个帐户已注册" msgstr "SFLphone - %i 个帐户已注册"
#: ../../sflphone-client-gnome/src/timestamp.c:46 #: ../../sflphone-client-gnome/src/timestamp.c:46
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: SFLphone 0.9.2\n" "Project-Id-Version: SFLphone 0.9.2\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-05-05 17:03-0400\n" "POT-Creation-Date: 2009-05-05 17:43-0400\n"
"PO-Revision-Date: 2008-10-28 14:15\n" "PO-Revision-Date: 2008-10-28 14:15\n"
"Last-Translator: Yun Liu <yun.liu@savoirfairelinux.com>\n" "Last-Translator: Yun Liu <yun.liu@savoirfairelinux.com>\n"
"Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n" "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
...@@ -431,8 +431,8 @@ msgid "_Show main window" ...@@ -431,8 +431,8 @@ msgid "_Show main window"
msgstr "顯示主窗口(S)" msgstr "顯示主窗口(S)"
#: ../../sflphone-client-gnome/src/statusicon.c:124 #: ../../sflphone-client-gnome/src/statusicon.c:124
#, c-format #, fuzzy, c-format
msgid "SFLphone - %i accounts registered" msgid "SFLphone - %i accounts configured"
msgstr "SFLphone - %i 個帳戶已註冊" msgstr "SFLphone - %i 個帳戶已註冊"
#: ../../sflphone-client-gnome/src/timestamp.c:46 #: ../../sflphone-client-gnome/src/timestamp.c:46
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment