[SCM] kaccounts-integration packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.12.1-0ubuntu1-3-g99936eb

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kaccounts-integration.git;a=commitdiff;h=99936eb

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 99936ebaae6f4a9c57f822245a144e56d45719bc
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Sat Mar 12 06:16:56 2016 -0800

    Add the file...
---
 debian/changelog                                   |  1 +
 .../upstream_allow_install_other_providers.patch   | 37 ++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e09c5fa..89a3037 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kaccounts-integration (4:15.12.2-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream bugfix release
   * Add upstream_allow_install_other_providers.patch (LP: #1451728) 
+  * Add the file... 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 09 Mar 2016 20:52:39 -0800
 
diff --git a/debian/patches/upstream_allow_install_other_providers.patch b/debian/patches/upstream_allow_install_other_providers.patch
new file mode 100644
index 0000000..011ad68
--- /dev/null
+++ b/debian/patches/upstream_allow_install_other_providers.patch
@@ -0,0 +1,37 @@
+From: Martin Klapetek <mklapetek at kde.org>
+Date: Wed, 24 Feb 2016 01:49:29 +0000
+Subject: Update the providers/services install path to not collide on Ubuntu
+X-Git-Url: http://quickgit.kde.org/?p=kaccounts-integration.git&a=commitdiff&h=deff781ae751f2f1c95b24997d01aa38c0dd7502
+---
+Update the providers/services install path to not collide on Ubuntu
+
+This now definitely closes bug 347219. Now it's up to Ubuntu to fix
+their packages.
+
+BUG: 347219
+FIXED-IN: 16.04
+---
+
+
+--- a/src/lib/KAccountsMacros.cmake
++++ b/src/lib/KAccountsMacros.cmake
+@@ -9,7 +9,8 @@
+     if(intltool_error)
+         message(FATAL_ERROR "error processing ${provider_in_file}: ${intltool_error}")
+     endif()
+-    install(FILES ${provider_file} DESTINATION ${ACCOUNTS_PROVIDERS_DIR})
++    # The suffix must match whatever we set for $XDG_CURRENT_DESKTOP
++    install(FILES ${provider_file} DESTINATION ${ACCOUNTS_PROVIDERS_DIR}/kde/)
+ endfunction()
+ 
+ function(kaccounts_add_service service_file_in)
+@@ -23,6 +24,7 @@
+     if(intltool_error)
+         message(FATAL_ERROR "error processing  ${service_file_in}: ${intltool_error}")
+     endif()
+-    install(FILES ${service_file} DESTINATION ${ACCOUNTS_SERVICES_DIR})
++    # The suffix must match whatever we set for $XDG_CURRENT_DESKTOP
++    install(FILES ${service_file} DESTINATION ${ACCOUNTS_SERVICES_DIR}/kde/)
+ endfunction()
+ 
+

-- 
kaccounts-integration packaging