[Pkg-voip-commits] r10211 - in /sflphone/trunk/debian: changelog patches/changeset_rb68857a4b485b7d43f92714cd5792595ff895f82.diff patches/disable-ilbc.patch patches/series rules
msp at alioth.debian.org
msp at alioth.debian.org
Sat Jun 1 10:15:53 UTC 2013
Author: msp
Date: Sat Jun 1 10:15:52 2013
New Revision: 10211
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10211
Log:
* NOT RELEASED YET
* New upstream release
* changeset_rb68857a4b485b7d43f92714cd5792595ff895f82.diff - fix QTest
* pjproject ./configure --disable-sound --disable-video
Added:
sflphone/trunk/debian/patches/changeset_rb68857a4b485b7d43f92714cd5792595ff895f82.diff
sflphone/trunk/debian/patches/disable-ilbc.patch
Modified:
sflphone/trunk/debian/changelog
sflphone/trunk/debian/patches/series
sflphone/trunk/debian/rules
Modified: sflphone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/sflphone/trunk/debian/changelog?rev=10211&op=diff
==============================================================================
--- sflphone/trunk/debian/changelog (original)
+++ sflphone/trunk/debian/changelog Sat Jun 1 10:15:52 2013
@@ -1,3 +1,13 @@
+sflphone (1.2.2-1) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+
+ * New upstream release
+ * changeset_rb68857a4b485b7d43f92714cd5792595ff895f82.diff - fix QTest
+ * pjproject ./configure --disable-sound --disable-video
+
+ -- Mark Purcell <msp at debian.org> Mon, 21 Jan 2013 14:27:46 +1100
+
sflphone (1.2.0-3) unstable; urgency=low
* Upload to unstable
Added: sflphone/trunk/debian/patches/changeset_rb68857a4b485b7d43f92714cd5792595ff895f82.diff
URL: http://svn.debian.org/wsvn/pkg-voip/sflphone/trunk/debian/patches/changeset_rb68857a4b485b7d43f92714cd5792595ff895f82.diff?rev=10211&op=file
==============================================================================
--- sflphone/trunk/debian/patches/changeset_rb68857a4b485b7d43f92714cd5792595ff895f82.diff (added)
+++ sflphone/trunk/debian/patches/changeset_rb68857a4b485b7d43f92714cd5792595ff895f82.diff Sat Jun 1 10:15:52 2013
@@ -1,0 +1,19 @@
+commit b68857a4b485b7d43f92714cd5792595ff895f82
+Author: Montel Laurent <montel at kde.org>
+Date: Tue Feb 12 07:48:24 2013 +0100
+
+ Fix include (but account_test doesn't compile account::save is private)
+
+diff --git a/src/test/account_test.cpp b/src/test/account_test.cpp
+index 44ab5a9..c6eb6fe 100644
+--- a/kde/src/test/account_test.cpp
++++ b/kde/rc/test/account_test.cpp
+@@ -16,7 +16,7 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+ #include <QtCore/QString>
+-#include <QtTest/QtTest/QtTest>
++#include <QtTest/QtTest>
+ //#include <QtCore>
+
+ #include "../src/lib/configurationmanager_interface_singleton.h"
Added: sflphone/trunk/debian/patches/disable-ilbc.patch
URL: http://svn.debian.org/wsvn/pkg-voip/sflphone/trunk/debian/patches/disable-ilbc.patch?rev=10211&op=file
==============================================================================
--- sflphone/trunk/debian/patches/disable-ilbc.patch (added)
+++ sflphone/trunk/debian/patches/disable-ilbc.patch Sat Jun 1 10:15:52 2013
@@ -1,0 +1,11 @@
+Index: sflphone-1.2.1/daemon/libs/pjproject-2.0.1/third_party/build/os-linux.mak
+===================================================================
+--- sflphone-1.2.1.orig/daemon/libs/pjproject-2.0.1/third_party/build/os-linux.mak 2013-01-10 09:12:15.000000000 +1100
++++ sflphone-1.2.1/daemon/libs/pjproject-2.0.1/third_party/build/os-linux.mak 2013-01-12 09:57:06.000000000 +1100
+@@ -1,5 +1,5 @@
+ DIRS += gsm
+-DIRS += ilbc
++#DIRS += ilbc
+ DIRS += speex
+ DIRS += portaudio
+ DIRS += g7221
Modified: sflphone/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/sflphone/trunk/debian/patches/series?rev=10211&op=diff
==============================================================================
--- sflphone/trunk/debian/patches/series (original)
+++ sflphone/trunk/debian/patches/series Sat Jun 1 10:15:52 2013
@@ -1,4 +1,6 @@
-gcc47-fixes.patch
+disable-ilbc.patch
+#gcc47-fixes.patch
02_target_s390.patch
#03_binutils-gold.patch
-04_target_s4.patch
+#04_target_s4.patch
+changeset_rb68857a4b485b7d43f92714cd5792595ff895f82.diff
Modified: sflphone/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/sflphone/trunk/debian/rules?rev=10211&op=diff
==============================================================================
--- sflphone/trunk/debian/rules (original)
+++ sflphone/trunk/debian/rules Sat Jun 1 10:15:52 2013
@@ -1,21 +1,18 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+
+PJPROJECT_VERSION := 2.0.1
%:
dh $@
override_dh_auto_configure:
- cd daemon/libs/pjproject && ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-ilbc-codec
+# cd daemon/libs/ && ./compile_pjsip.sh
+ cd daemon/libs/pjproject-$(PJPROJECT_VERSION) && CFLAGS=-fPIC ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-sound --disable-video
cd daemon && ./autogen.sh --prefix=/usr
- cd daemon && ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --disable-doxygen --without-ilbc
+ cd daemon && ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS) -fPIC" LDFLAGS="-Wl,-z,defs" --disable-doxygen
cd gnome && ./autogen.sh --prefix=/usr
cd gnome && ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
cd kde && ./config.sh --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
@@ -23,14 +20,15 @@
cd plugins && ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
override_dh_auto_build:
- cd daemon/libs/pjproject && make V=1
- cd daemon && make V=1
- cd gnome && make V=1
- cd kde/build && make V=1
- cd plugins && make V=1
+# cd daemon/libs/ && ./compile_pjsip.sh
+ cd daemon/libs/pjproject-$(PJPROJECT_VERSION) && make
+ cd daemon && make
+ cd gnome && make
+ cd kde/build && make
+ cd plugins && make
override_dh_auto_clean:
- cd daemon/libs/pjproject && [ ! -f build.mak ] || $(MAKE) distclean
+ cd daemon/libs/pjproject-$(PJPROJECT_VERSION) && [ ! -f build.mak ] || $(MAKE) distclean
cd daemon && [ ! -f Makefile ] || $(MAKE) distclean
cd gnome && [ ! -f Makefile ] || $(MAKE) distclean
cd kde && [ ! -f Makefile ] || $(MAKE) distclean
More information about the Pkg-voip-commits
mailing list