[Pkg-voip-commits] r6508 - in /qutecom/trunk/debian: patches/debian/cmake-no-rpath_to_link_path.patch patches/debian/cmake-rpath-shlibs.patch patches/debian/remove-extra-copying-file.patch patches/generic/install-qutecom.patch patches/series rules

cavedon-guest at alioth.debian.org cavedon-guest at alioth.debian.org
Thu Nov 27 06:00:18 UTC 2008 

Author: cavedon-guest
Date: Thu Nov 27 06:00:14 2008
New Revision: 6508

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6508
Log:
fix RPATH issues

Removed:
    qutecom/trunk/debian/patches/debian/cmake-no-rpath_to_link_path.patch
    qutecom/trunk/debian/patches/debian/cmake-rpath-shlibs.patch
Modified:
    qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch
    qutecom/trunk/debian/patches/generic/install-qutecom.patch
    qutecom/trunk/debian/patches/series
    qutecom/trunk/debian/rules

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=6508&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch (original)
+++ qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch Thu Nov 27 06:00:14 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-25 07:27:06.000000000 +0000
-+++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2008-11-25 07:27:41.000000000 +0000
-@@ -61,7 +61,3 @@
+--- 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 @@
  		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=6508&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/generic/install-qutecom.patch (original)
+++ qutecom/trunk/debian/patches/generic/install-qutecom.patch Thu Nov 27 06:00:14 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-25 07:56:09.000000000 +0000
-+++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2008-11-25 08:17:28.000000000 +0000
+--- qutecom-2.2~rc2.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2008-11-27 05:18:28.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2008-11-27 05:19:31.000000000 +0000
 @@ -3,7 +3,7 @@
  	${BINARY_NAME}
  	PROPERTIES
@@ -11,11 +11,12 @@
  		INSTALL_RPATH_USE_LINK_PATH
  			ON
  )
-@@ -23,19 +23,19 @@
+@@ -23,19 +23,20 @@
  	${TMP_BUILD_DIR}/libowsl.so
  	${TMP_BUILD_DIR}/libowutil.so
  	${TMP_BUILD_DIR}/libpsiidle.so
 -	DESTINATION lib${LIB_SUFFIX}/wengophone)
++	${TMP_BUILD_DIR}/liblibpurple.so
 +	DESTINATION lib${LIB_SUFFIX}/qutecom)
  
  #if (ENABLE_CRASHREPORT)
@@ -34,7 +35,7 @@
  endif (CURL_INTERNAL)
  
  install(DIRECTORY
-@@ -58,7 +58,7 @@
+@@ -58,7 +59,7 @@
  	install(FILES
  		${CMAKE_SOURCE_DIR}/wengophone/res/wengophone_${size}x${size}.png
  		DESTINATION share/icons/hicolor/${size}x${size}/apps/
@@ -43,3 +44,15 @@
  endforeach(size)
  
  install(FILES
+Index: qutecom-2.2~rc2.dfsg0/DefineInstallationPaths.cmake
+===================================================================
+--- qutecom-2.2~rc2.dfsg0.orig/DefineInstallationPaths.cmake	2008-11-27 05:16:52.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/DefineInstallationPaths.cmake	2008-11-27 05:18:31.000000000 +0000
+@@ -21,6 +21,6 @@
+ 	set(DATA_COPY_DIR ${BUILD_DIR}
+ 		CACHE PATH "Data/resources (sounds, translations...) copy path")
+ 
+-	set(DATA_INSTALL_DIR "share/wengophone"
++	set(DATA_INSTALL_DIR "share/qutecom"
+ 		CACHE PATH "Data/resources (sounds, translations...) installation path")
+ endif (LINUX)

Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=6508&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Thu Nov 27 06:00:14 2008
@@ -4,8 +4,6 @@
 generic/googlebreakpad-64bit.patch
 generic/install-qutecom.patch
 generic/cmake-repo-revision-quotes.patch
+generic/desktop-file-update.patch
 debian/remove-extra-copying-file.patch
-generic/desktop-file-update.patch
-#debian/cmake-no-rpath_to_link_path.patch
-#debian/cmake-rpath-shlibs.patch
 #debian/cmake-force-fpic.patch

Modified: qutecom/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/rules?rev=6508&op=diff
==============================================================================
--- qutecom/trunk/debian/rules (original)
+++ qutecom/trunk/debian/rules Thu Nov 27 06:00:14 2008
@@ -13,6 +13,8 @@
 DEB_CMAKE_EXTRA_FLAGS := -DQT_UIC_EXECUTABLE=/usr/bin/uic-qt4 \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
+	-DCMAKE_INSTALL_RPATH=/usr/lib/qutecom \
+	-DCMAKE_SKIP_RPATH=FALSE \
 	-DOWSOUND_PORTAUDIO_SUPPORT=OFF \
 	-DFFMPEG_INTERNAL=OFF \
 	-DSPEEX_INTERNAL=OFF \

More information about the Pkg-voip-commits mailing list