diff --git a/daemon/src/global.h b/daemon/src/global.h
index 04e78a864406709ce0e5289f3862e7d27eca10d5..c63b1a0a09f38c34ed48ca21fa1aaba7576572ff 100644
--- a/daemon/src/global.h
+++ b/daemon/src/global.h
@@ -76,7 +76,7 @@ const char * const ZRTP_ZID_FILENAME = "sfl.zid";
// Define the audio api
#define PULSEAUDIO_API_STR "pulseaudio"
#define ALSA_API_STR "alsa"
-#if HAVE_PULSE == 1
+#if HAVE_PULSE
#define DEFAULT_AUDIO_API_STR PULSEAUDIO_API_STR
#else
#define DEFAULT_AUDIO_API_STR ALSA_API_STR
diff --git a/daemon/src/preferences.cpp b/daemon/src/preferences.cpp
index 4207aaaf549d401f60621405bd4df05c3eaea4ad..a8fe165e0a5cbe56cfe50309613e1f8be06bbf1a 100644
--- a/daemon/src/preferences.cpp
+++ b/daemon/src/preferences.cpp
@@ -84,7 +84,7 @@ static const char * const URL_SIP_FIELD_KEY = "urlSipField";
// audio preferences
static const char * const ALSAMAP_KEY = "alsa";
-#if HAVE_PULSE == 1
+#if HAVE_PULSE
static const char * const PULSEMAP_KEY = "pulse";
#endif
static const char * const CARDIN_KEY = "cardIn";
@@ -367,7 +367,7 @@ void checkSoundCard(int &card, int stream)
AudioLayer* AudioPreference::createAudioLayer()
{
-#if HAVE_PULSE == 1
+#if HAVE_PULSE
if (audioApi_ == PULSEAUDIO_API_STR) {
if (system("ps -C pulseaudio > /dev/null") == 0)
return new PulseLayer;
@@ -386,7 +386,7 @@ AudioLayer* AudioPreference::createAudioLayer()
AudioLayer* AudioPreference::switchAndCreateAudioLayer()
{
-#if HAVE_PULSE == 1
+#if HAVE_PULSE
if (audioApi_ == PULSEAUDIO_API_STR)
audioApi_ = ALSA_API_STR;
else
@@ -453,7 +453,7 @@ void AudioPreference::serialize(Conf::YamlEmitter &emitter)
alsapreferencemap.setKeyValue(PLUGIN_KEY, &plugin);
alsapreferencemap.setKeyValue(SMPLRATE_KEY, &alsaSmplrate);
-#if HAVE_PULSE == 1
+#if HAVE_PULSE
Conf::MappingNode pulsepreferencemap(NULL);
preferencemap.setKeyValue(PULSEMAP_KEY, &pulsepreferencemap);
pulsepreferencemap.setKeyValue(DEVICE_PLAYBACK_KEY, &pulseDevicePlayback);
@@ -489,7 +489,7 @@ void AudioPreference::unserialize(const Conf::MappingNode &map)
alsamap->getValue(PLUGIN_KEY, &alsaPlugin_);
}
-#if HAVE_PULSE == 1
+#if HAVE_PULSE
Conf::MappingNode *pulsemap =(Conf::MappingNode *)(map.getValue("pulse"));
if (pulsemap) {
diff --git a/daemon/test/audiolayertest.cpp b/daemon/test/audiolayertest.cpp
index 3e80ef2f1fc0395c1bf14610ebe78ead56232b9c..d3a008bb5af4bd9f160b2563b60d8b07ea787c7c 100644
--- a/daemon/test/audiolayertest.cpp
+++ b/daemon/test/audiolayertest.cpp
@@ -44,18 +44,18 @@ void AudioLayerTest::testAudioLayerConfig()
{
TITLE();
- CPPUNIT_ASSERT(Manager::instance().audioPreference.getSmplrate() == 44100);
+ CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaSmplrate() == 44100);
// alsa preferences
- CPPUNIT_ASSERT(Manager::instance().audioPreference.getCardin() == 0);
- CPPUNIT_ASSERT(Manager::instance().audioPreference.getCardout() == 0);
- CPPUNIT_ASSERT(Manager::instance().audioPreference.getCardring() == 0);
- CPPUNIT_ASSERT(Manager::instance().audioPreference.getPlugin() == "default");
+ CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaCardin() == 0);
+ CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaCardout() == 0);
+ CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaCardring() == 0);
+ CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaPlugin() == "default");
// pulseaudio preferences
- CPPUNIT_ASSERT(Manager::instance().audioPreference.getDevicePlayback() == "alsa_output.pci-0000_00_1b.0.analog-stereo");
- CPPUNIT_ASSERT(Manager::instance().audioPreference.getDeviceRecord() == "alsa_input.pci-0000_00_1b.0.analog-stereo");
- CPPUNIT_ASSERT(Manager::instance().audioPreference.getDeviceRingtone() == "alsa_output.pci-0000_00_1b.0.analog-stereo");
+ CPPUNIT_ASSERT(Manager::instance().audioPreference.getPulseDevicePlayback() == "alsa_output.pci-0000_00_1b.0.analog-stereo");
+ CPPUNIT_ASSERT(Manager::instance().audioPreference.getPulseDeviceRecord() == "alsa_input.pci-0000_00_1b.0.analog-stereo");
+ CPPUNIT_ASSERT(Manager::instance().audioPreference.getPulseDeviceRingtone() == "alsa_output.pci-0000_00_1b.0.analog-stereo");
CPPUNIT_ASSERT(Manager::instance().audioPreference.getVolumemic() == 100);
CPPUNIT_ASSERT(Manager::instance().audioPreference.getVolumespkr() == 100);
diff --git a/daemon/test/configurationtest.cpp b/daemon/test/configurationtest.cpp
index a3553bc55990819e7b68051d6c133dbef29ef9bf..a8ee6b6d544d2336c44f6ed2ba6c7b63898dc8df 100644
--- a/daemon/test/configurationtest.cpp
+++ b/daemon/test/configurationtest.cpp
@@ -43,10 +43,10 @@ void ConfigurationTest::testDefaultValueAudio()
{
TITLE();
- CPPUNIT_ASSERT(Manager::instance().audioPreference.getCardin() == ALSA_DFT_CARD_ID);
- CPPUNIT_ASSERT(Manager::instance().audioPreference.getCardout() == ALSA_DFT_CARD_ID);
- CPPUNIT_ASSERT(Manager::instance().audioPreference.getSmplrate() == 44100);
- CPPUNIT_ASSERT(Manager::instance().audioPreference.getPlugin() == PCM_DEFAULT);
+ CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaCardin() == ALSA_DFT_CARD_ID);
+ CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaCardout() == ALSA_DFT_CARD_ID);
+ CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaSmplrate() == 44100);
+ CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaPlugin() == PCM_DEFAULT);
CPPUNIT_ASSERT(Manager::instance().audioPreference.getVolumespkr() == 100);
CPPUNIT_ASSERT(Manager::instance().audioPreference.getVolumemic() == 100);
}
diff --git a/tools/build-system/launch-build-machine-2.sh b/tools/build-system/launch-build-machine-2.sh
index 54ef12efb611377fb29b48ca474178698ac82295..0fa4bb53dc2cfe7a3a995db6b2416284d9c95145 100755
--- a/tools/build-system/launch-build-machine-2.sh
+++ b/tools/build-system/launch-build-machine-2.sh
@@ -219,10 +219,9 @@ END
fi
if [ "${LAUNCHPAD_PACKAGE}" == "sflphone-client-kde" ]; then
- #echo > ${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}/debian/changelog
- sed -i -e 's/Standards-Version: [0-9.A-Za-z]*/Standards-Version: 1.1.2/' ${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}/debian/control
-echo ${VERSION} `echo ${VERSION} | grep -e '[0-9]*\.[0-9.]*' -o | head -n1`
- tar -cjf ${LAUNCHPAD_DIR}/sflphone-client-kde_$(echo ${VERSION} | grep -e '[0-9]*\.[0-9.]*' -o | head -n1).orig.tar.bz2 ${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}/
+ version_kde=$(echo ${VERSION} | grep -e '[0-9]*\.[0-9.]*' -o | head -n1)
+ sed -i -e "s/Standards-Version: [0-9.A-Za-z]*/Standards-Version: ${version_kde}/" ${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}/debian/control
+ tar -C ${LAUNCHPAD_DIR}/ -cjf ${LAUNCHPAD_DIR}/sflphone-client-kde_${version_kde}.orig.tar.bz2 ${LAUNCHPAD_PACKAGE}
fi
rm -f ${WORKING_DIR}/sfl-git-dch.conf >/dev/null 2>&1
diff --git a/tools/build-system/launchpad/sflphone-client-kde/debian/changelog b/tools/build-system/launchpad/sflphone-client-kde/debian/changelog
index 6629d130bc5c4229ffc3a40a6a2f466624b64418..1971a95b4829007a8c42a47968bc01832715f535 100644
--- a/tools/build-system/launchpad/sflphone-client-kde/debian/changelog
+++ b/tools/build-system/launchpad/sflphone-client-kde/debian/changelog
@@ -1,3 +1,25 @@
+sflphone-client-kde (1.1.0-rc20120607~ppa1~SYSTEM) SYSTEM; urgency=low
+
+ ** SNAPSHOT 1.1.0-rc20120607~ppa1~SYSTEM **
+
+ * [ #12096 ] Implement more calls details, make it more scalable
+ * [ #11290 ] Update french translation
+ * [ #11859 ] Fix a regression in name conversion
+ * [ #11850 ] Fix a little regression
+ * [ #11859 ] Fix sorting by popularity
+ * [ #11569 ] Fix filter
+ * [ #12003 ] Add icon overlay for history item
+ * [ #11886 ] Add basic reverse peer naming support
+ * kde/callview: removed trailing whitespace
+ * [ #12008 ] Implement GUI part
+ * [ #11988 ] Move ringtone to a new tab
+ * [ #11990 ] Fix history delegate width
+ * [ #11990 ] Make call item height configurable
+ * [ #7007 ] Fix many history bugs and add 'copy' contextual menu
+ * [ #7007 ] Add more contextual options
+
+ -- Julien Bonjean <julien.bonjean@savoirfairelinux.com> Thu, 07 Jun 2012 15:52:52 -0400
+
sflphone-client-kde (1.1.0) SYSTEM; urgency=low
** SNAPSHOT 1.0.0-rc20110930~ppa1~SYSTEM **
diff --git a/tools/build-system/launchpad/sflphone-client-kde/debian/control b/tools/build-system/launchpad/sflphone-client-kde/debian/control
index e6cd1db1cfe73f1f09aa93a7ffe9cb7b53bdc7d5..774347a3d87bd265ae3c7d5e82d332e6364ef50f 100644
--- a/tools/build-system/launchpad/sflphone-client-kde/debian/control
+++ b/tools/build-system/launchpad/sflphone-client-kde/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
Uploaders: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
-Standards-Version: 1.1.2
+Standards-Version: 1.1.0
Build-Depends: debhelper (>= 5.0), cdbs, kdelibs5-dev, cmake, kdepimlibs5-dev,
Homepage: http://www.sfphone.org/