[Pkg-voip-commits] r3041 - in kiax/tags/0.8.51.dfsg-2/debian: .
patches
Kilian Krause
kilian at alioth.debian.org
Fri Jan 19 23:30:21 CET 2007
Author: kilian
Date: 2007-01-19 23:30:20 +0100 (Fri, 19 Jan 2007)
New Revision: 3041
Added:
kiax/tags/0.8.51.dfsg-2/debian/patches/
kiax/tags/0.8.51.dfsg-2/debian/patches/00list
kiax/tags/0.8.51.dfsg-2/debian/patches/01_debian-patch.dpatch
kiax/tags/0.8.51.dfsg-2/debian/patches/02_disable_echo_cancellation.dpatch
Log:
readd patches dir which was deleted by accident.
Added: kiax/tags/0.8.51.dfsg-2/debian/patches/00list
===================================================================
--- kiax/tags/0.8.51.dfsg-2/debian/patches/00list 2007-01-19 17:51:28 UTC (rev 3040)
+++ kiax/tags/0.8.51.dfsg-2/debian/patches/00list 2007-01-19 22:30:20 UTC (rev 3041)
@@ -0,0 +1,2 @@
+01_debian-patch
+#02_disable_echo_cancellation
Added: kiax/tags/0.8.51.dfsg-2/debian/patches/01_debian-patch.dpatch
===================================================================
--- kiax/tags/0.8.51.dfsg-2/debian/patches/01_debian-patch.dpatch 2007-01-19 17:51:28 UTC (rev 3040)
+++ kiax/tags/0.8.51.dfsg-2/debian/patches/01_debian-patch.dpatch 2007-01-19 22:30:20 UTC (rev 3041)
@@ -0,0 +1,157 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_debian-patch.dpatch by <msp at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from kiax 0.8.4-4 diff.gz
+
+ at DPATCH@
+diff -urNad kiax-0.8.51.dfsg~/bin/Makefile kiax-0.8.51.dfsg/bin/Makefile
+--- kiax-0.8.51.dfsg~/bin/Makefile 2006-06-26 00:26:18.000000000 +0300
++++ kiax-0.8.51.dfsg/bin/Makefile 2006-06-26 00:26:19.000000000 +0300
+@@ -1,4 +1,4 @@
+-DEST_PATH=/usr/local/bin/
++DEST_PATH=/usr/bin/
+ all:
+ echo 'none'
+ install:
+diff -urNad kiax-0.8.51.dfsg~/lib/Makefile kiax-0.8.51.dfsg/lib/Makefile
+--- kiax-0.8.51.dfsg~/lib/Makefile 2006-02-05 02:34:34.000000000 +0200
++++ kiax-0.8.51.dfsg/lib/Makefile 2006-06-26 00:26:31.000000000 +0300
+@@ -16,7 +16,7 @@
+
+
+
+-CODEC_ILBC=1
++CODEC_ILBC=0
+
+ SPEEX_PREPROCESS=1
+ SPAN_EC=0
+diff -urNad kiax-0.8.51.dfsg~/repath.pl kiax-0.8.51.dfsg/repath.pl
+--- kiax-0.8.51.dfsg~/repath.pl 2006-06-26 00:26:18.000000000 +0300
++++ kiax-0.8.51.dfsg/repath.pl 2006-06-26 00:26:19.000000000 +0300
+@@ -88,8 +88,8 @@
+ $proFile =~ s|icons\.path = .*?\n|icons.path = $params{'prefix'}/share/kiax/icons/\n|;
+ $proFile =~ s|translations\.path = .*?\n|translations.path = $params{'prefix'}/share/kiax/i18n/\n|;
+ $proFile =~ s|binary\.path = .*?\n|binary.path = $params{'prefix'}/bin/\n|;
+- $proFile =~ s|ICONS_PATH=\\"./icons/\\"|ICONS_PATH=\\"$params{'prefix'}/share/kiax/icons/\\"|;
+- $proFile =~ s|I18N_DIRECTORY=\\"./i18n/\\"|I18N_DIRECTORY=\\"$params{'prefix'}/share/kiax/i18n/\\"|;
++ $proFile =~ s|ICONS_PATH=\\".*/icons/\\"|ICONS_PATH=\\"$params{'prefix'}/share/kiax/icons/\\"|;
++ $proFile =~ s|I18N_DIRECTORY=\\".*/i18n/\\"|I18N_DIRECTORY=\\"$params{'prefix'}/share/kiax/i18n/\\"|;
+ }
+
+ open FH, ">$fnSrcpro" or die "Can't open file $fnSrcpro: $!\n";
+diff -urNad kiax-0.8.51.dfsg~/src/iaxwrapper.cpp kiax-0.8.51.dfsg/src/iaxwrapper.cpp
+--- kiax-0.8.51.dfsg~/src/iaxwrapper.cpp 2006-06-26 00:26:18.000000000 +0300
++++ kiax-0.8.51.dfsg/src/iaxwrapper.cpp 2006-06-26 00:26:19.000000000 +0300
+@@ -564,8 +564,6 @@
+ uint IaxWrapper::getCodecMaskFromName(QString codecName)
+ {
+
+- if (codecName=="ilbc")
+- return IAXC_FORMAT_ILBC;
+ if (codecName=="gsm")
+ return IAXC_FORMAT_GSM;
+ if (codecName=="ulaw")
+diff -urNad kiax-0.8.51.dfsg~/src/kiaxaccountwizard.cpp kiax-0.8.51.dfsg/src/kiaxaccountwizard.cpp
+--- kiax-0.8.51.dfsg~/src/kiaxaccountwizard.cpp 2006-06-26 00:26:18.000000000 +0300
++++ kiax-0.8.51.dfsg/src/kiaxaccountwizard.cpp 2006-06-26 00:26:19.000000000 +0300
+@@ -135,7 +135,7 @@
+ voipgatePreset->operatorHomePage = "http://www.voipgate.com";
+ voipgatePreset->operatorName = "VoipGATE";
+ voipgatePreset->registerPageURL = "https://www.voipgate.com/register.php?afflink=kiax";
+- voipgatePreset->preferredCodec = "ilbc";
++ voipgatePreset->preferredCodec = "gsm";
+ voipgatePreset->userLoginPage = "https://www.voipgate.com/login.php";
+ voipgatePreset->instructions = "<font color=\"#00007f\">VoipGATE is a VoIP service provider based in Luxemburg. It provides quality communication services for end-users and business customers on reasonable and low prices. PC-to-PC VoIP communication is free! </font>";
+
+diff -urNad kiax-0.8.51.dfsg~/src/kiaxprefswindow.cpp kiax-0.8.51.dfsg/src/kiaxprefswindow.cpp
+--- kiax-0.8.51.dfsg~/src/kiaxprefswindow.cpp 2006-06-26 00:26:18.000000000 +0300
++++ kiax-0.8.51.dfsg/src/kiaxprefswindow.cpp 2006-06-26 00:26:19.000000000 +0300
+@@ -228,8 +228,6 @@
+ QString KiaxPrefsWindow::getSelectedCodecName()
+ {
+ QString result = "gsm";
+- if (ilbcRadioButton->isChecked())
+- result = "ilbc";
+ if (gsmRadioButton->isChecked())
+ result = "gsm";
+ if (speexRadioButton->isChecked())
+@@ -241,7 +239,6 @@
+
+ void KiaxPrefsWindow::setCodecByName(QString codecName)
+ {
+- ilbcRadioButton->setChecked(codecName == "ilbc");
+ gsmRadioButton->setChecked(codecName == "gsm");
+ speexRadioButton->setChecked(codecName == "speex");
+ ulawRadioButton->setChecked(codecName == "ulaw");
+diff -urNad kiax-0.8.51.dfsg~/src/prefswindow.ui kiax-0.8.51.dfsg/src/prefswindow.ui
+--- kiax-0.8.51.dfsg~/src/prefswindow.ui 2006-06-26 00:26:18.000000000 +0300
++++ kiax-0.8.51.dfsg/src/prefswindow.ui 2006-06-26 00:26:19.000000000 +0300
+@@ -167,7 +167,7 @@
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+- <widget class="QRadioButton" row="0" column="3">
++ <widget class="QRadioButton" row="0" column="2">
+ <property name="name">
+ <cstring>ulawRadioButton</cstring>
+ </property>
+@@ -175,7 +175,7 @@
+ <string>U-LAW</string>
+ </property>
+ </widget>
+- <widget class="QRadioButton" row="0" column="2">
++ <widget class="QRadioButton" row="0" column="1">
+ <property name="name">
+ <cstring>speexRadioButton</cstring>
+ </property>
+@@ -183,7 +183,7 @@
+ <string>Speex</string>
+ </property>
+ </widget>
+- <widget class="QRadioButton" row="0" column="1">
++ <widget class="QRadioButton" row="0" column="0">
+ <property name="name">
+ <cstring>gsmRadioButton</cstring>
+ </property>
+@@ -194,17 +194,6 @@
+ <bool>true</bool>
+ </property>
+ </widget>
+- <widget class="QRadioButton" row="0" column="0">
+- <property name="name">
+- <cstring>ilbcRadioButton</cstring>
+- </property>
+- <property name="text">
+- <string>iLBC</string>
+- </property>
+- <property name="checked">
+- <bool>false</bool>
+- </property>
+- </widget>
+ </grid>
+ </widget>
+ <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2">
+@@ -760,7 +749,6 @@
+ <tabstop>passwordEdit</tabstop>
+ <tabstop>callerIdEdit</tabstop>
+ <tabstop>callerIdNumberEdit</tabstop>
+- <tabstop>ilbcRadioButton</tabstop>
+ <tabstop>makeDefaultCheckBox</tabstop>
+ <tabstop>newAccountButton</tabstop>
+ <tabstop>deleteAccountButton</tabstop>
+diff -urNad kiax-0.8.51.dfsg~/src/src.pro.or kiax-0.8.51.dfsg/src/src.pro.or
+--- kiax-0.8.51.dfsg~/src/src.pro.or 2006-06-26 00:26:18.000000000 +0300
++++ kiax-0.8.51.dfsg/src/src.pro.or 2006-06-26 00:26:19.000000000 +0300
+@@ -87,10 +87,8 @@
+ kiaxcontactlistitem.cpp \
+ kiaxiconfactory.cpp \
+ kiaxkeyfilter.cpp
+-TARGETDEPS += ../lib/libiaxclient.a
+ LIBS += ../lib/libiaxclient.a ${LIBOSSAUDIO}
+-INCLUDEPATH = ../src \
+-../lib
++INCLUDEPATH = ../src ../lib /usr/include
+ DEFINES = ICONS_PATH=\"/usr/local/share/kiax/icons/\" \
+ I18N_DIRECTORY=\"/usr/local/share/kiax/i18n/\"
+ TARGET = ../bin/kiax
Property changes on: kiax/tags/0.8.51.dfsg-2/debian/patches/01_debian-patch.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: kiax/tags/0.8.51.dfsg-2/debian/patches/02_disable_echo_cancellation.dpatch
===================================================================
--- kiax/tags/0.8.51.dfsg-2/debian/patches/02_disable_echo_cancellation.dpatch 2007-01-19 17:51:28 UTC (rev 3040)
+++ kiax/tags/0.8.51.dfsg-2/debian/patches/02_disable_echo_cancellation.dpatch 2007-01-19 22:30:20 UTC (rev 3041)
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_disable_echo_cancellation.dpatch by <danchev at spnet.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not show Echo Cancellation checkbox.
+
+ at DPATCH@
+diff -urNad kiax-0.8.51-src~/src/kiaxprefswindow.cpp kiax-0.8.51-src/src/kiaxprefswindow.cpp
+--- kiax-0.8.51-src~/src/kiaxprefswindow.cpp 2006-02-04 20:47:12.000000000 +0200
++++ kiax-0.8.51-src/src/kiaxprefswindow.cpp 2006-06-10 15:28:10.000000000 +0300
+@@ -165,7 +165,7 @@
+ if (noiseReductionCheckBox->isChecked()) aFilterFlag |= IAXC_FILTER_DENOISE;
+ if (aagcCheckBox->isChecked()) aFilterFlag |= IAXC_FILTER_AAGC;
+ if (agcCheckBox->isChecked()) aFilterFlag |= IAXC_FILTER_AGC;
+- if (echoCancelationCheckBox->isChecked()) aFilterFlag |= IAXC_FILTER_ECHO;
++ // if (echoCancelationCheckBox->isChecked()) aFilterFlag |= IAXC_FILTER_ECHO;
+ if (comfortNoiseCheckBox->isChecked()) aFilterFlag |= IAXC_FILTER_CN;
+ settings->setFilterFlag(aFilterFlag);
+ if (silenceSuppressionCheckBox->isChecked()) settings->setSilenceThreshold(1);//auto
+@@ -190,7 +190,7 @@
+ noiseReductionCheckBox->setChecked(settings->getFilterFlag()&IAXC_FILTER_DENOISE);
+ aagcCheckBox->setChecked(settings->getFilterFlag()&IAXC_FILTER_AAGC);
+ agcCheckBox->setChecked(settings->getFilterFlag()&IAXC_FILTER_AGC);
+- echoCancelationCheckBox->setChecked(settings->getFilterFlag()&IAXC_FILTER_ECHO);
++ // echoCancelationCheckBox->setChecked(settings->getFilterFlag()&IAXC_FILTER_ECHO);
+ comfortNoiseCheckBox->setChecked(settings->getFilterFlag()&IAXC_FILTER_CN);
+ if (settings->getSilenceThreshold()==1) silenceSuppressionCheckBox->setChecked(true);
+ incomingRingMuteCheckBox->setChecked(settings->getIncomingRingMute());
+diff -urNad kiax-0.8.51-src~/src/prefswindow.ui kiax-0.8.51-src/src/prefswindow.ui
+--- kiax-0.8.51-src~/src/prefswindow.ui 2006-02-06 18:31:54.000000000 +0200
++++ kiax-0.8.51-src/src/prefswindow.ui 2006-06-10 15:27:35.000000000 +0300
+@@ -476,14 +476,6 @@
+ <bool>true</bool>
+ </property>
+ </widget>
+- <widget class="QCheckBox" row="1" column="0">
+- <property name="name">
+- <cstring>echoCancelationCheckBox</cstring>
+- </property>
+- <property name="text">
+- <string>Echo Cancelation</string>
+- </property>
+- </widget>
+ <widget class="QCheckBox" row="0" column="1">
+ <property name="name">
+ <cstring>aagcCheckBox</cstring>
Property changes on: kiax/tags/0.8.51.dfsg-2/debian/patches/02_disable_echo_cancellation.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-voip-commits
mailing list