rev 21039 - in kde-extras/kmymoney2/trunk/debian: . patches

Pino Toscano pino at moszumanska.debian.org
Thu Feb 8 19:40:30 UTC 2018


Author: pino
Date: 2018-02-08 19:40:30 +0000 (Thu, 08 Feb 2018)
New Revision: 21039

Added:
   kde-extras/kmymoney2/trunk/debian/patches/
   kde-extras/kmymoney2/trunk/debian/patches/series
   kde-extras/kmymoney2/trunk/debian/patches/upstream_cmake-set-SONAME-also-for-kmm_icons-and-kmm_csvimpor.patch
Modified:
   kde-extras/kmymoney2/trunk/debian/changelog
   kde-extras/kmymoney2/trunk/debian/kmymoney.install
Log:
fix SONAMEs of two libraries

backport upstream commit 16eb1fea93db913ec0a2cd8d825366473733a290;
fix install file accordingly


Modified: kde-extras/kmymoney2/trunk/debian/changelog
===================================================================
--- kde-extras/kmymoney2/trunk/debian/changelog	2018-02-08 18:22:38 UTC (rev 21038)
+++ kde-extras/kmymoney2/trunk/debian/changelog	2018-02-08 19:40:30 UTC (rev 21039)
@@ -37,6 +37,9 @@
   * Remove get-orig-source target from rules, as it is obsolete.
   * Recommend krosspython for the weboob plugin. (Closes: #865885)
   * Remove old stuff from watch file.
+  * Backport upstream commit 16eb1fea93db913ec0a2cd8d825366473733a290 to set
+    the SONAME for the kmm_icons, and kmm_csvimportercore libraries; patch
+    upstream_cmake-set-SONAME-also-for-kmm_icons-and-kmm_csvimpor.patch.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 07 Feb 2018 21:56:19 +0100
 

Modified: kde-extras/kmymoney2/trunk/debian/kmymoney.install
===================================================================
--- kde-extras/kmymoney2/trunk/debian/kmymoney.install	2018-02-08 18:22:38 UTC (rev 21038)
+++ kde-extras/kmymoney2/trunk/debian/kmymoney.install	2018-02-08 19:40:30 UTC (rev 21039)
@@ -1,5 +1,4 @@
 usr/bin/kmymoney
-usr/lib/*/lib*.so
 usr/lib/*/lib*.so.*
 usr/lib/*/qt5/plugins/kmymoney/*.so
 usr/share/applications/org.kde.kmymoney.desktop

Added: kde-extras/kmymoney2/trunk/debian/patches/series
===================================================================
--- kde-extras/kmymoney2/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/kmymoney2/trunk/debian/patches/series	2018-02-08 19:40:30 UTC (rev 21039)
@@ -0,0 +1 @@
+upstream_cmake-set-SONAME-also-for-kmm_icons-and-kmm_csvimpor.patch

Added: kde-extras/kmymoney2/trunk/debian/patches/upstream_cmake-set-SONAME-also-for-kmm_icons-and-kmm_csvimpor.patch
===================================================================
--- kde-extras/kmymoney2/trunk/debian/patches/upstream_cmake-set-SONAME-also-for-kmm_icons-and-kmm_csvimpor.patch	                        (rev 0)
+++ kde-extras/kmymoney2/trunk/debian/patches/upstream_cmake-set-SONAME-also-for-kmm_icons-and-kmm_csvimpor.patch	2018-02-08 19:40:30 UTC (rev 21039)
@@ -0,0 +1,44 @@
+From 16eb1fea93db913ec0a2cd8d825366473733a290 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Thu, 8 Feb 2018 20:36:23 +0100
+Subject: [PATCH] cmake: set SONAME also for kmm_icons and kmm_csvimportercore
+
+They are (installed) public libraries, so make sure they have a proper
+SONAME set.
+---
+ kmymoney/icons/CMakeLists.txt                   | 4 ++++
+ kmymoney/plugins/csv/import/core/CMakeLists.txt | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/kmymoney/icons/CMakeLists.txt b/kmymoney/icons/CMakeLists.txt
+index e20f0e84..4a3e0321 100644
+--- a/kmymoney/icons/CMakeLists.txt
++++ b/kmymoney/icons/CMakeLists.txt
+@@ -35,5 +35,9 @@ add_library(kmm_icons SHARED ${icons_SOURCES})
+ generate_export_header(kmm_icons)
+ target_link_libraries(kmm_icons PRIVATE Qt5::Core Qt5::Gui)
+ 
++set_target_properties(kmm_icons PROPERTIES
++  VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}
++)
++
+ install(TARGETS kmm_icons
+   ${INSTALL_TARGETS_DEFAULT_ARGS} )
+diff --git a/kmymoney/plugins/csv/import/core/CMakeLists.txt b/kmymoney/plugins/csv/import/core/CMakeLists.txt
+index 866a80ad..aa2efe20 100644
+--- a/kmymoney/plugins/csv/import/core/CMakeLists.txt
++++ b/kmymoney/plugins/csv/import/core/CMakeLists.txt
+@@ -17,6 +17,10 @@ target_link_libraries(kmm_csvimportercore
+     kmm_mymoney
+ )
+ 
++set_target_properties(kmm_csvimportercore PROPERTIES
++  VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}
++)
++
+ ########### install files ###############
+ 
+ install(TARGETS kmm_csvimportercore
+-- 
+2.15.1
+




More information about the pkg-kde-commits mailing list