[Pkg-voip-commits] r6541 - in /qutecom/trunk/debian: ./ patches/ patches/debian/ patches/generic/
cavedon-guest at alioth.debian.org
cavedon-guest at alioth.debian.org
Wed Dec 10 09:00:18 UTC 2008
Author: cavedon-guest
Date: Wed Dec 10 09:00:17 2008
New Revision: 6541
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6541
Log:
build agains system libpurple
remove useless coredumper patch
Added:
qutecom/trunk/debian/patches/generic/libpurple-external.patch
Removed:
qutecom/trunk/debian/patches/generic/cmake-static-coredumper.patch
Modified:
qutecom/trunk/debian/changelog
qutecom/trunk/debian/control
qutecom/trunk/debian/get-orig-source.sh
qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch
qutecom/trunk/debian/patches/generic/install-qutecom.patch
qutecom/trunk/debian/patches/series
Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=6541&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Wed Dec 10 09:00:17 2008
@@ -13,10 +13,12 @@
- generic/cmake-repo-revision-quotes.patch: to handle the absence of an hg
revision number during build
- generic/getcurrentdatetime.patch: to fix a compilation bug of a build tool
+ - generic/libpurple-external.patch: use system libpurple, instead of
+ internal one
* Using cdbs cmake.mk, instead of a custom one
* Updating Standards-Version to 3.8.0
- -- Ludovico Cavedon <cavedon at sssup.it> Sat, 22 Nov 2008 17:54:50 -0800
+ -- Ludovico Cavedon <cavedon at sssup.it> Tue, 09 Dec 2008 00:39:10 -0800
wengophone (2.1.2.dfsg0-6) unstable; urgency=low
Modified: qutecom/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/control?rev=6541&op=diff
==============================================================================
--- qutecom/trunk/debian/control (original)
+++ qutecom/trunk/debian/control Wed Dec 10 09:00:17 2008
@@ -13,7 +13,7 @@
libasound2-dev (>= 1.0.11), libspeex-dev (>= 1.1.12), libssl-dev (>= 0.9.8a),
libxml2-dev (>= 2.6.24), libsamplerate0-dev (>= 0.1.2),
libsndfile1-dev (>= 1.0.12), libcurl4-openssl-dev (>= 7.16.1),
- dpkg-dev (>= 1.13.19), libx11-dev, python-dev
+ dpkg-dev (>= 1.13.19), libx11-dev, python-dev, libpurple-dev
Build-Conflicts: qt3-dev-tools
Standards-Version: 3.8.0
Homepage: http://www.qutecom.org/
Modified: qutecom/trunk/debian/get-orig-source.sh
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/get-orig-source.sh?rev=6541&op=diff
==============================================================================
--- qutecom/trunk/debian/get-orig-source.sh (original)
+++ qutecom/trunk/debian/get-orig-source.sh Wed Dec 10 09:00:17 2008
@@ -106,6 +106,12 @@
# Remove openssl code
purge_3rdparty $destdir/libs/3rdparty/openssl
+# Remove gaim code
+purge_3rdparty $destdir/libs/3rdparty/gaim
+
+# Remove libpurple code
+purge_3rdparty $destdir/libs/3rdparty/libpurple
+
echo "Cleaning done"
# Make the sources archive
Modified: qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch?rev=6541&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch (original)
+++ qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch Wed Dec 10 09:00:17 2008
@@ -1,8 +1,8 @@
Index: qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
===================================================================
---- qutecom-2.2~rc2.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-11-27 05:19:44.000000000 +0000
-+++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-11-27 05:19:58.000000000 +0000
-@@ -62,7 +62,3 @@
+--- qutecom-2.2~rc2.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-12-10 08:40:02.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-12-10 08:40:26.000000000 +0000
+@@ -67,7 +67,3 @@
RENAME qutecom.png)
endforeach(size)
Modified: qutecom/trunk/debian/patches/generic/install-qutecom.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/install-qutecom.patch?rev=6541&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/generic/install-qutecom.patch (original)
+++ qutecom/trunk/debian/patches/generic/install-qutecom.patch Wed Dec 10 09:00:17 2008
@@ -1,7 +1,7 @@
Index: qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
===================================================================
---- qutecom-2.2~rc2.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-11-27 06:51:23.000000000 +0000
-+++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-11-27 06:52:41.000000000 +0000
+--- qutecom-2.2~rc2.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-10-21 10:31:56.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-12-10 08:36:48.000000000 +0000
@@ -3,7 +3,7 @@
${BINARY_NAME}
PROPERTIES
@@ -19,18 +19,14 @@
+ ${TMP_BUILD_DIR}/liblibpurple.so
+ DESTINATION lib${LIB_SUFFIX}/qutecom)
--#if (ENABLE_CRASHREPORT)
--# install(PROGRAMS
--# ${TMP_BUILD_DIR}/libcoredumper.so
--# DESTINATION lib${LIB_SUFFIX}/wengophone
--# )
--#endif (ENABLE_CRASHREPORT)
-+if (ENABLE_CRASHREPORT)
-+ install(PROGRAMS
+ if (ENABLE_CRASHREPORT)
+ install(PROGRAMS
+- ${TMP_BUILD_DIR}/libcoredumper.so
+- DESTINATION lib${LIB_SUFFIX}/wengophone
+ ${TMP_BUILD_DIR}/libowmemorydump.so
+ DESTINATION lib${LIB_SUFFIX}/qutecom
-+ )
-+endif (ENABLE_CRASHREPORT)
+ )
+ endif (ENABLE_CRASHREPORT)
if (CURL_INTERNAL)
install(PROGRAMS
@@ -51,8 +47,8 @@
install(FILES
Index: qutecom-2.2~rc2.dfsg0/DefineInstallationPaths.cmake
===================================================================
---- qutecom-2.2~rc2.dfsg0.orig/DefineInstallationPaths.cmake 2008-11-27 06:51:11.000000000 +0000
-+++ qutecom-2.2~rc2.dfsg0/DefineInstallationPaths.cmake 2008-11-27 06:51:26.000000000 +0000
+--- qutecom-2.2~rc2.dfsg0.orig/DefineInstallationPaths.cmake 2008-10-21 10:31:56.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/DefineInstallationPaths.cmake 2008-12-10 08:34:49.000000000 +0000
@@ -21,6 +21,6 @@
set(DATA_COPY_DIR ${BUILD_DIR}
CACHE PATH "Data/resources (sounds, translations...) copy path")
Added: qutecom/trunk/debian/patches/generic/libpurple-external.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/libpurple-external.patch?rev=6541&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/libpurple-external.patch (added)
+++ qutecom/trunk/debian/patches/generic/libpurple-external.patch Wed Dec 10 09:00:17 2008
@@ -1,0 +1,103 @@
+Index: qutecom-2.2~rc2.dfsg0/libs/3rdparty/libpurple/CMakeLists-external.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/libs/3rdparty/libpurple/CMakeLists-external.txt 2008-12-10 08:39:25.000000000 +0000
+@@ -0,0 +1,10 @@
++if (NOT LIBPURPLE_FOUND)
++ find_package(LibPurple REQUIRED)
++endif (NOT LIBPURPLE_FOUND)
++
++ow_create_project(libpurple)
++
++ow_use_public_libraries(
++ LIBPURPLE
++)
++
+Index: qutecom-2.2~rc2.dfsg0/libs/3rdparty/libpurple/CMakeLists.txt
+===================================================================
+--- qutecom-2.2~rc2.dfsg0.orig/libs/3rdparty/libpurple/CMakeLists.txt 2008-12-10 08:39:22.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/libs/3rdparty/libpurple/CMakeLists.txt 2008-12-10 08:39:25.000000000 +0000
+@@ -1,7 +1,11 @@
+ if (NOT WIN32)
+ # Not MSVC and not MinGW
+- include(CMakeLists-unix.txt)
++ if (LIBPURPLE_INTERNAL)
++ include(CMakeLists-unix.txt)
++ else (LIBPURPLE_INTERNAL)
++ include(CMakeLists-external.txt)
++ endif (LIBPURPLE_INTERNAL)
+ else (NOT WIN32)
+ # If MSVC or MinGW
+ include(CMakeLists-win32.txt)
+-endif (NOT WIN32)
+\ No newline at end of file
++endif (NOT WIN32)
+Index: qutecom-2.2~rc2.dfsg0/libs/3rdparty/CMakeLists.txt
+===================================================================
+--- qutecom-2.2~rc2.dfsg0.orig/libs/3rdparty/CMakeLists.txt 2008-12-10 08:39:22.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/libs/3rdparty/CMakeLists.txt 2008-12-10 08:39:25.000000000 +0000
+@@ -8,6 +8,7 @@
+ option(SAMPLERATE_INTERNAL "Use internal libsamplerate" OFF)
+ option(OSIP2_INTERNAL "Use internal oSIP" ON)
+ option(CURL_INTERNAL "Use internal cURL" OFF)
++ option(LIBPURPLE_INTERNAL "Use internal libpurple" OFF)
+ else (LINUX)
+ option(PORTAUDIO_INTERNAL "Use internal PortAudio" ON)
+ option(FFMPEG_INTERNAL "Use internal FFmpeg" ON)
+@@ -16,6 +17,7 @@
+ option(SAMPLERATE_INTERNAL "Use internal libsamplerate" ON)
+ option(OSIP2_INTERNAL "Use internal oSIP" ON)
+ option(CURL_INTERNAL "Use internal cURL" ON)
++ option(LIBPURPLE_INTERNAL "Use internal libpurple" ON)
+ endif (LINUX)
+
+ if (WIN32)
+Index: qutecom-2.2~rc2.dfsg0/libs/imwrapper/src/purple/PurpleIMFactory.h
+===================================================================
+--- qutecom-2.2~rc2.dfsg0.orig/libs/imwrapper/src/purple/PurpleIMFactory.h 2008-12-10 08:39:22.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/libs/imwrapper/src/purple/PurpleIMFactory.h 2008-12-10 08:39:25.000000000 +0000
+@@ -24,6 +24,7 @@
+ #include <imwrapper/IMAccount.h>
+
+ #include <glib.h>
++#include <glib/gtypes.h>
+
+ class PurpleAccountMngr;
+ class PurpleChatMngr;
+Index: qutecom-2.2~rc2.dfsg0/libs/imwrapper/CMakeLists.txt
+===================================================================
+--- qutecom-2.2~rc2.dfsg0.orig/libs/imwrapper/CMakeLists.txt 2008-12-10 08:39:22.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/libs/imwrapper/CMakeLists.txt 2008-12-10 08:39:25.000000000 +0000
+@@ -9,6 +9,7 @@
+
+ ow_use_public_libraries(
+ owsettings
++ glib2
+ )
+
+ ow_use_private_libraries(
+Index: qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
+===================================================================
+--- qutecom-2.2~rc2.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-12-10 08:39:32.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-12-10 08:40:02.000000000 +0000
+@@ -23,7 +23,6 @@
+ ${TMP_BUILD_DIR}/libowsl.so
+ ${TMP_BUILD_DIR}/libowutil.so
+ ${TMP_BUILD_DIR}/libpsiidle.so
+- ${TMP_BUILD_DIR}/liblibpurple.so
+ DESTINATION lib${LIB_SUFFIX}/qutecom)
+
+ if (ENABLE_CRASHREPORT)
+@@ -39,6 +38,12 @@
+ DESTINATION lib${LIB_SUFFIX}/qutecom)
+ endif (CURL_INTERNAL)
+
++if (LIBPURPLE_INTERNAL)
++ install(PROGRAMS
++ ${TMP_BUILD_DIR}/liblibpurple.so
++ DESTINATION lib${LIB_SUFFIX}/qutecom)
++endif (LIBPURPLE_INTERNAL)
++
+ install(DIRECTORY
+ ${TMP_BUILD_DIR}/lang
+ DESTINATION ${DATA_INSTALL_DIR}
Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=6541&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Wed Dec 10 09:00:17 2008
@@ -1,9 +1,9 @@
-generic/cmake-static-coredumper.patch
#generic/curl-openssl-mt-fix.patch
generic/getcurrentdatetime.patch
generic/googlebreakpad-64bit.patch
generic/install-qutecom.patch
generic/cmake-repo-revision-quotes.patch
generic/desktop-file-update.patch
+generic/libpurple-external.patch
debian/remove-extra-copying-file.patch
debian/cmake-force-fpic.patch
More information about the Pkg-voip-commits
mailing list