[Pkg-voip-commits] r1974 - in kiax/trunk/debian: . patches
Mark Purcell
msp at costa.debian.org
Wed Jun 28 21:26:34 UTC 2006
Author: msp
Date: 2006-06-28 21:26:34 +0000 (Wed, 28 Jun 2006)
New Revision: 1974
Modified:
kiax/trunk/debian/changelog
kiax/trunk/debian/patches/00list
kiax/trunk/debian/patches/01_debian-patch.dpatch
kiax/trunk/debian/rules
Log:
was the root of invalid dfsg repackaging (Closes: #375894)
Modified: kiax/trunk/debian/changelog
===================================================================
--- kiax/trunk/debian/changelog 2006-06-28 20:58:01 UTC (rev 1973)
+++ kiax/trunk/debian/changelog 2006-06-28 21:26:34 UTC (rev 1974)
@@ -3,12 +3,9 @@
[ George Danchev ]
* Fix the sed snippet which failed to figure out the corrent upstream
version from the changelog when dfsg is followed by digits. This
- was the root of invalid dfsg repackaging
+ was the root of invalid dfsg repackaging (Closes: #375894)
[ Mark Purcell ]
- * 0.8.51.dfsg-2-1 removes all of lib/ again. (Backout r1949)
- - Fixes: kiax DFSGness not taken seriously (Closes: #375894)
- * Renable 02_disable_echo_cancellation
* Add debian/rules check-ilbc target & warning
-- Mark Purcell <msp at debian.org> Wed, 28 Jun 2006 21:38:29 +0100
Modified: kiax/trunk/debian/patches/00list
===================================================================
--- kiax/trunk/debian/patches/00list 2006-06-28 20:58:01 UTC (rev 1973)
+++ kiax/trunk/debian/patches/00list 2006-06-28 21:26:34 UTC (rev 1974)
@@ -1,2 +1,2 @@
01_debian-patch
-02_disable_echo_cancellation
+#02_disable_echo_cancellation
Modified: kiax/trunk/debian/patches/01_debian-patch.dpatch
===================================================================
--- kiax/trunk/debian/patches/01_debian-patch.dpatch 2006-06-28 20:58:01 UTC (rev 1973)
+++ kiax/trunk/debian/patches/01_debian-patch.dpatch 2006-06-28 21:26:34 UTC (rev 1974)
@@ -5,55 +5,30 @@
## DP: New patch generated from kiax 0.8.4-4 diff.gz
@DPATCH@
-diff -urNad kiax-0.8.5~/bin/Makefile kiax-0.8.5/bin/Makefile
---- kiax-0.8.5~/bin/Makefile 2006-02-06 16:02:48.000000000 +0000
-+++ kiax-0.8.5/bin/Makefile 2006-03-29 21:21:49.000000000 +0100
+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.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
-@@ -3,15 +3,13 @@
- # Subdir relative project main directory: .
- # Target is a subdirs project
+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 @@
--TARGETDEPS += lib/libiaxclient.a \
-- src/../bin/kiax
-+TARGETDEPS += src/../bin/kiax
- CONFIG += release \
- warn_on \
- qt \
- thread \
- x11
- TEMPLATE = subdirs
--SUBDIRS += lib \
-- i18n \
-+SUBDIRS += i18n \
- src \
- bin
-diff -urNad kiax-0.8.5~/src/src.pro.or kiax-0.8.5/src/src.pro.or
---- kiax-0.8.5~/src/src.pro.or 2006-03-25 23:21:46.000000000 +0000
-+++ kiax-0.8.5/src/src.pro.or 2006-03-29 21:23:58.000000000 +0100
-@@ -86,10 +86,8 @@
- kiaxcontactlistitem.cpp \
- kiaxiconfactory.cpp \
- kiaxkeyfilter.cpp
--TARGETDEPS += ../lib/libiaxclient.a
--LIBS += ../lib/libiaxclient.a ${LIBOSSAUDIO}
--INCLUDEPATH = ../src \
--../lib
-+LIBS += -lportaudio -lgsm -lspeex -liaxclient ${LIBOSSAUDIO}
-+INCLUDEPATH = ../src /usr/include
- DEFINES = ICONS_PATH=\"/usr/local/share/kiax/icons/\" \
- I18N_DIRECTORY=\"/usr/local/share/kiax/i18n/\"
- TARGET = ../bin/kiax
-diff -urNad kiax-0.8.5~/repath.pl kiax-0.8.5/repath.pl
---- kiax-0.8.5~/repath.pl 2005-04-08 16:47:06.000000000 +0200
-+++ kiax-0.8.5/repath.pl 2006-05-05 23:50:40.000000000 +0200
+
+
+-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|;
@@ -65,9 +40,9 @@
}
open FH, ">$fnSrcpro" or die "Can't open file $fnSrcpro: $!\n";
-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
+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)
{
@@ -77,9 +52,9 @@
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
+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";
@@ -89,9 +64,9 @@
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
+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()
{
@@ -109,9 +84,9 @@
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
+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>
@@ -165,3 +140,18 @@
<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
Modified: kiax/trunk/debian/rules
===================================================================
--- kiax/trunk/debian/rules 2006-06-28 20:58:01 UTC (rev 1973)
+++ kiax/trunk/debian/rules 2006-06-28 21:26:34 UTC (rev 1974)
@@ -122,7 +122,12 @@
@@echo Removing non dfsg compliant parts out of it
@@[ -d ../tarballs/dfsg/. ]||mkdir -p ../tarballs/dfsg
@@tar -xzf ../tarballs/$(FILENAME) -C ../tarballs/dfsg
- @@rm -rf ../tarballs/dfsg/$(SRCDIR)/lib
+# @@rm -rf ../tarballs/dfsg/$(SRCDIR)/lib
+ @@rm -rf ../tarballs/dfsg/$(SRCDIR)/lib/CVS
+ @@rm -rf ../tarballs/dfsg/$(SRCDIR)/lib/iLBC
+ @@rm -rf ../tarballs/dfsg/$(SRCDIR)/lib/aec_nlms
+# @@for f in `ls ../tarballs/dfsg/$(SRCDIR)/lib | grep -v [libiax2][gsm][Makefile]` ; \
+# do rm -rf ../tarballs/dfsg/$(SRCDIR)/lib/$$f; done
@@echo Fixing the tar warning
@@touch ../tarballs/dfsg/$(SRCDIR)/templates
@@ echo Building the dfsg tarball
More information about the Pkg-voip-commits
mailing list