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

[Pino Toscano]

Author: pino
Date: 2016-06-19 15:33:48 +0000 (Sun, 19 Jun 2016)
New Revision: 20507

Added:
   kde-extras/kmymoney2/trunk/debian/patches/
   kde-extras/kmymoney2/trunk/debian/patches/series
   kde-extras/kmymoney2/trunk/debian/patches/upstream_cmake-do-not-install-the-appdata-as-executable.patch
   kde-extras/kmymoney2/trunk/debian/patches/upstream_cmake-fix-appdata-installation-directory.patch
Modified:
   kde-extras/kmymoney2/trunk/debian/changelog
Log:
fix installation of kmymoney.appdata.xml

backport upstream commits bf8fb00d91eaa260127b7a38b3c820bccd02bfd3 and
b0ed94a49111b60ebc99a7331f8395604e68f8c3


Modified: kde-extras/kmymoney2/trunk/debian/changelog
===================================================================
--- kde-extras/kmymoney2/trunk/debian/changelog	2016-06-19 15:11:20 UTC (rev 20506)
+++ kde-extras/kmymoney2/trunk/debian/changelog	2016-06-19 15:33:48 UTC (rev 20507)
@@ -6,6 +6,11 @@
   * Bump Standards-Version to 3.9.8, no changes required.
   * Disable building of tests, since it is not easy to run them.
   * Update install files.
+  * Backport upstream commits bf8fb00d91eaa260127b7a38b3c820bccd02bfd3 and
+    b0ed94a49111b60ebc99a7331f8395604e68f8c3 to fix the installation of the
+    kmymoney.appdata.xml file; patches
+    upstream_cmake-do-not-install-the-appdata-as-executable.patch and
+    upstream_cmake-fix-appdata-installation-directory.patch.
 
   [ Micha Lenk ]
   * Update the Gwenhywfar build dependencies. (Closes: #824705)

Added: kde-extras/kmymoney2/trunk/debian/patches/series
===================================================================
--- kde-extras/kmymoney2/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/kmymoney2/trunk/debian/patches/series	2016-06-19 15:33:48 UTC (rev 20507)
@@ -0,0 +1,2 @@
+upstream_cmake-do-not-install-the-appdata-as-executable.patch
+upstream_cmake-fix-appdata-installation-directory.patch

Added: kde-extras/kmymoney2/trunk/debian/patches/upstream_cmake-do-not-install-the-appdata-as-executable.patch
===================================================================
--- kde-extras/kmymoney2/trunk/debian/patches/upstream_cmake-do-not-install-the-appdata-as-executable.patch	                        (rev 0)
+++ kde-extras/kmymoney2/trunk/debian/patches/upstream_cmake-do-not-install-the-appdata-as-executable.patch	2016-06-19 15:33:48 UTC (rev 20507)
@@ -0,0 +1,25 @@
+From bf8fb00d91eaa260127b7a38b3c820bccd02bfd3 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sun, 19 Jun 2016 17:01:45 +0200
+Subject: [PATCH] cmake: do not install the appdata as executable
+
+---
+ kmymoney/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kmymoney/CMakeLists.txt b/kmymoney/CMakeLists.txt
+index 7febf05..cbfb041 100644
+--- a/kmymoney/CMakeLists.txt
++++ b/kmymoney/CMakeLists.txt
+@@ -107,7 +107,7 @@ install(FILES ${_HEADERS}
+ install(PROGRAMS kmymoney.desktop
+   DESTINATION ${XDG_APPS_INSTALL_DIR}
+   )
+-install(PROGRAMS kmymoney.appdata.xml
++install(FILES kmymoney.appdata.xml
+   DESTINATION ${DATA_INSTALL_DIR}/appdata/
+   )
+ 
+-- 
+2.8.1
+

Added: kde-extras/kmymoney2/trunk/debian/patches/upstream_cmake-fix-appdata-installation-directory.patch
===================================================================
--- kde-extras/kmymoney2/trunk/debian/patches/upstream_cmake-fix-appdata-installation-directory.patch	                        (rev 0)
+++ kde-extras/kmymoney2/trunk/debian/patches/upstream_cmake-fix-appdata-installation-directory.patch	2016-06-19 15:33:48 UTC (rev 20507)
@@ -0,0 +1,27 @@
+From b0ed94a49111b60ebc99a7331f8395604e68f8c3 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sun, 19 Jun 2016 17:27:26 +0200
+Subject: [PATCH] cmake: fix appdata installation directory
+
+it should go under the general "share" data directory, not within the
+application own data directory
+---
+ kmymoney/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kmymoney/CMakeLists.txt b/kmymoney/CMakeLists.txt
+index cbfb041..eff91f1 100644
+--- a/kmymoney/CMakeLists.txt
++++ b/kmymoney/CMakeLists.txt
+@@ -108,7 +108,7 @@ install(PROGRAMS kmymoney.desktop
+   DESTINATION ${XDG_APPS_INSTALL_DIR}
+   )
+ install(FILES kmymoney.appdata.xml
+-  DESTINATION ${DATA_INSTALL_DIR}/appdata/
++  DESTINATION ${SHARE_INSTALL_PREFIX}/appdata
+   )
+ 
+ install(FILES x-kmymoney.xml
+-- 
+2.8.1
+