[Pkg-voip-commits] r4872 - in /wengophone/trunk/debian: changelog patches/debian/cmake-no-soname-shlibs.patch patches/debian/cmake-rpath-shlibs.patch patches/series

[cavedon-guest at alioth.debian.org]

Author: cavedon-guest
Date: Wed Nov 28 23:04:10 2007
New Revision: 4872

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4872
Log:
Added patches to comply with the new dpkg-shlibdeps

Added:
    wengophone/trunk/debian/patches/debian/cmake-no-soname-shlibs.patch
    wengophone/trunk/debian/patches/debian/cmake-rpath-shlibs.patch
Modified:
    wengophone/trunk/debian/changelog
    wengophone/trunk/debian/patches/series

Modified: wengophone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/changelog?rev=4872&op=diff
==============================================================================
--- wengophone/trunk/debian/changelog (original)
+++ wengophone/trunk/debian/changelog Wed Nov 28 23:04:10 2007
@@ -1,12 +1,17 @@
 wengophone (2.1.2.dfsg0-2) UNRELEASED; urgency=low
 
   * Documented video support status in README.Debian. Closes: #448307
-  * Adding patch qt-fix-bad-window-size.patch to fix bad window size under
+  * Added patch qt-fix-bad-window-size.patch to fix bad window size under
     some configurations
   * Removed Build-Conflicts on qt3-dev-tools: no longer necessary since
     cmake 2.4.3-3
-
- -- Ludovico Cavedon <cavedon at sssup.it>  Mon, 19 Nov 2007 19:21:30 +0100
+  * Added patches to comply with the new dpkg-shlibdeps (1.14.7):
+    - debian/cmake-rpath-shlibs.patch: add RPATH to private shared libraries
+      depending on other private shared libraries
+    - debian/patches/debian/cmake-no-soname-shlibs.patch: remove SONAMEs from
+      private shared libraries
+
+ -- Ludovico Cavedon <cavedon at sssup.it>  Wed, 28 Nov 2007 23:56:26 +0100
 
 wengophone (2.1.2.dfsg0-1) unstable; urgency=low
 

Added: wengophone/trunk/debian/patches/debian/cmake-no-soname-shlibs.patch
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/patches/debian/cmake-no-soname-shlibs.patch?rev=4872&op=file
==============================================================================
--- wengophone/trunk/debian/patches/debian/cmake-no-soname-shlibs.patch (added)
+++ wengophone/trunk/debian/patches/debian/cmake-no-soname-shlibs.patch Wed Nov 28 23:04:10 2007
@@ -1,0 +1,17 @@
+Index: wengophone-2.1.2.dfsg0/CMakeLists.txt
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/CMakeLists.txt	2007-11-28 18:47:25.000000000 +0000
++++ wengophone-2.1.2.dfsg0/CMakeLists.txt	2007-11-28 18:52:47.000000000 +0000
+@@ -1,3 +1,12 @@
++# Avoiding sonames for shared libraries
++# The following two lines have been copied and modified from
++# /usr/share/cmake-2.4/Modules/CMakeCInformation.cmake and
++# /usr/share/cmake-2.4/Modules/CMakeCXXInformation.cmake
++SET(CMAKE_C_CREATE_SHARED_LIBRARY
++    "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
++SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
++    "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
++
+ include(CMakeLists-owbuild.txt)
+ 
+ project(wengophone)

Added: wengophone/trunk/debian/patches/debian/cmake-rpath-shlibs.patch
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/patches/debian/cmake-rpath-shlibs.patch?rev=4872&op=file
==============================================================================
--- wengophone/trunk/debian/patches/debian/cmake-rpath-shlibs.patch (added)
+++ wengophone/trunk/debian/patches/debian/cmake-rpath-shlibs.patch Wed Nov 28 23:04:10 2007
@@ -1,0 +1,30 @@
+Index: wengophone-2.1.2.dfsg0/wifo/phapi/CMakeLists.txt
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wifo/phapi/CMakeLists.txt	2007-11-28 18:46:32.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/phapi/CMakeLists.txt	2007-11-28 18:46:44.000000000 +0000
+@@ -324,3 +324,10 @@
+ ow_set_library_version(0.2.0 0)
+ 
+ ow_create_binary()
++
++set_target_properties(
++    phapi
++    PROPERTIES
++        INSTALL_RPATH
++            ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/wengophone
++)
+Index: wengophone-2.1.2.dfsg0/wifo/wifo-plugins/sfp-plugin/CMakeLists.txt
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wifo/wifo-plugins/sfp-plugin/CMakeLists.txt	2007-11-28 18:46:33.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/wifo-plugins/sfp-plugin/CMakeLists.txt	2007-11-28 18:47:00.000000000 +0000
+@@ -37,3 +37,10 @@
+ )
+ 
+ ow_create_binary()
++
++set_target_properties(
++    sfp-plugin
++    PROPERTIES
++        INSTALL_RPATH
++            ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/wengophone
++)

Modified: wengophone/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/patches/series?rev=4872&op=diff
==============================================================================
--- wengophone/trunk/debian/patches/series (original)
+++ wengophone/trunk/debian/patches/series Wed Nov 28 23:04:10 2007
@@ -11,5 +11,7 @@
 generic/curl-openssl-mt-fix.patch
 debian/remove-extra-copying-file.patch
 debian/cmake-no-rpath_to_link_path.patch
+debian/cmake-rpath-shlibs.patch
+debian/cmake-no-soname-shlibs.patch
 debian/cmake-force-fpic.patch
 debian/cmake-find-boost-1.34.0.patch