[Pkg-voip-commits] r1712 - in kiax/trunk/debian: . patches
Santiago Garcia Mantinan
manty at costa.debian.org
Sat May 6 23:03:07 UTC 2006
Author: manty
Date: 2006-05-06 23:03:05 +0000 (Sat, 06 May 2006)
New Revision: 1712
Modified:
kiax/trunk/debian/changelog
kiax/trunk/debian/patches/01_debian-patch.dpatch
Log:
Really commit the dfsg stuff.
Modified: kiax/trunk/debian/changelog
===================================================================
--- kiax/trunk/debian/changelog 2006-05-06 16:58:28 UTC (rev 1711)
+++ kiax/trunk/debian/changelog 2006-05-06 23:03:05 UTC (rev 1712)
@@ -10,6 +10,7 @@
* Copy the icons and i18n files into place.
* Fix patching.
* Add patch for location of icons and i18n files.
+ * Drop iLBC and all other non dfsg stuff.
-- Santiago Garcia Mantinan <manty at debian.org> Sat, 6 May 2006 15:51:22 +0100
Modified: kiax/trunk/debian/patches/01_debian-patch.dpatch
===================================================================
--- kiax/trunk/debian/patches/01_debian-patch.dpatch 2006-05-06 16:58:28 UTC (rev 1711)
+++ kiax/trunk/debian/patches/01_debian-patch.dpatch 2006-05-06 23:03:05 UTC (rev 1712)
@@ -14,8 +14,6 @@
all:
echo 'none'
install:
-<<<<<<< .mine
-=======
diff -urNad kiax-0.8.5~/qkiax.pro kiax-0.8.5/qkiax.pro
--- kiax-0.8.5~/qkiax.pro 2005-04-08 15:29:52.000000000 +0100
+++ kiax-0.8.5/qkiax.pro 2006-03-29 21:23:45.000000000 +0100
@@ -67,4 +65,103 @@
}
open FH, ">$fnSrcpro" or die "Can't open file $fnSrcpro: $!\n";
->>>>>>> .r1699
+diff -urNad kiax-0.8.5~/src/iaxwrapper.cpp kiax-0.8.5/src/iaxwrapper.cpp
+--- kiax-0.8.5~/src/iaxwrapper.cpp 2006-03-25 22:57:11.000000000 +0100
++++ kiax-0.8.5/src/iaxwrapper.cpp 2006-05-06 22:54:29.000000000 +0200
+@@ -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.5~/src/kiaxaccountwizard.cpp kiax-0.8.5/src/kiaxaccountwizard.cpp
+--- kiax-0.8.5~/src/kiaxaccountwizard.cpp 2006-02-05 02:10:11.000000000 +0100
++++ kiax-0.8.5/src/kiaxaccountwizard.cpp 2006-05-06 22:58:41.000000000 +0200
+@@ -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.5~/src/kiaxprefswindow.cpp kiax-0.8.5/src/kiaxprefswindow.cpp
+--- kiax-0.8.5~/src/kiaxprefswindow.cpp 2006-02-04 19:47:12.000000000 +0100
++++ kiax-0.8.5/src/kiaxprefswindow.cpp 2006-05-06 23:00:14.000000000 +0200
+@@ -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.5~/src/prefswindow.ui kiax-0.8.5/src/prefswindow.ui
+--- kiax-0.8.5~/src/prefswindow.ui 2006-02-06 17:31:54.000000000 +0100
++++ kiax-0.8.5/src/prefswindow.ui 2006-05-06 21:58:43.000000000 +0200
+@@ -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>
More information about the Pkg-voip-commits
mailing list