[SCM] kaccounts-integration packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.12.3-0ubuntu1-8-g5deb0af

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 5deb0afa9fcb4551f0507490091d8a50ba0a1b2c
Author: Scarlett Clark <sgclark at kde.org>
Date:   Sat Apr 30 06:54:43 2016 -0700

    Re-generate a new patch using 15.12.3 tag upstream.
---
 debian/changelog                                           |  1 +
 .../patches/upstream_allow_install_other_providers.patch   | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 840853b..654f4bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ kaccounts-integration (4:15.12.3-0ubuntu3) UNRELEASED; urgency=medium
   * Add series file. 
   * Fix patch so it applies to this source. 
   * Again... 
+  * Re-generate a new patch using 15.12.3 tag upstream. 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Sat, 23 Apr 2016 10:18:44 -0700
 
diff --git a/debian/patches/upstream_allow_install_other_providers.patch b/debian/patches/upstream_allow_install_other_providers.patch
index ca4d2b7..2c145ec 100644
--- a/debian/patches/upstream_allow_install_other_providers.patch
+++ b/debian/patches/upstream_allow_install_other_providers.patch
@@ -12,21 +12,25 @@ BUG: 347219
 FIXED-IN: 16.04
 ---
 
-
+diff --git a/src/lib/KAccountsMacros.cmake b/src/lib/KAccountsMacros.cmake
+index dfcb636..c3d18c1 100644
 --- a/src/lib/KAccountsMacros.cmake
 +++ b/src/lib/KAccountsMacros.cmake
-@@ -4,5 +4,6 @@
+@@ -2,12 +2,14 @@ function(kaccounts_add_provider provider_in_file)
+     get_filename_component(provider_filename ${provider_in_file} NAME_WE)
+     set(provider_file ${CMAKE_CURRENT_BINARY_DIR}/${provider_filename}.provider)
      execute_process(COMMAND intltool-merge -x -u --no-translations ${provider_in_file} ${provider_file})
 -    install(FILES ${provider_file} DESTINATION ${ACCOUNTS_PROVIDERS_DIR})
-+    # The suffix must match whatever we set for $XDG_CURRENT_DESKTOP
++# 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)
-@@ -11,12 +11,13 @@
+     get_filename_component(service_filename ${service_file_in} NAME_WE)
+     set(service_file ${CMAKE_CURRENT_BINARY_DIR}/${service_filename}.service)
      execute_process(COMMAND intltool-merge -x -u --no-translations ${service_file_in} ${service_file})
 -    install(FILES ${service_file} DESTINATION ${ACCOUNTS_SERVICES_DIR})
-+    # The suffix must match whatever we set for $XDG_CURRENT_DESKTOP
++# The suffix must match whatever we set for $XDG_CURRENT_DESKTOP
 +    install(FILES ${service_file} DESTINATION ${ACCOUNTS_SERVICES_DIR}/kde/)
  endfunction()
  

-- 
kaccounts-integration packaging