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

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 765d82dd28cf973f834d118b4fae1eb28283f9c0
Author: Scarlett Clark <sgclark at kde.org>
Date:   Sat Apr 30 06:40:00 2016 -0700

    Fix patch so it applies to this source.
---
 debian/changelog                                            |  1 +
 debian/patches/upstream_allow_install_other_providers.patch | 12 ++++--------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b73a5b2..ac211c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ kaccounts-integration (4:15.12.3-0ubuntu3) UNRELEASED; urgency=medium
   * DO a ppa build to test. 
   * Add upstream_enforce_accounts-glib_version.patch 
   * Add series file. 
+  * Fix patch so it applies to this source. 
 
  -- 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 011ad68..88cab74 100644
--- a/debian/patches/upstream_allow_install_other_providers.patch
+++ b/debian/patches/upstream_allow_install_other_providers.patch
@@ -15,20 +15,16 @@ 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()
+@@ -4,7 +4,8 @@
+     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
 +    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()
+@@ -11,6 +11,7 @@
+     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
 +    install(FILES ${service_file} DESTINATION ${ACCOUNTS_SERVICES_DIR}/kde/)

-- 
kaccounts-integration packaging