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

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 924156d2301812dc005f9ec2ecc428f617884eed
Author: Scarlett Clark <sgclark at kde.org>
Date:   Sat Apr 30 06:46:11 2016 -0700

    Again...
---
 debian/changelog                                            | 1 +
 debian/patches/upstream_allow_install_other_providers.patch | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac211c2..840853b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kaccounts-integration (4:15.12.3-0ubuntu3) UNRELEASED; urgency=medium
   * Add upstream_enforce_accounts-glib_version.patch 
   * Add series file. 
   * Fix patch so it applies to this source. 
+  * Again... 
 
  -- 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 88cab74..ca4d2b7 100644
--- a/debian/patches/upstream_allow_install_other_providers.patch
+++ b/debian/patches/upstream_allow_install_other_providers.patch
@@ -15,7 +15,7 @@ FIXED-IN: 16.04
 
 --- a/src/lib/KAccountsMacros.cmake
 +++ b/src/lib/KAccountsMacros.cmake
-@@ -4,7 +4,8 @@
+@@ -4,5 +4,6 @@
      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
@@ -23,7 +23,7 @@ FIXED-IN: 16.04
  endfunction()
  
  function(kaccounts_add_service service_file_in)
-@@ -11,6 +11,7 @@
+@@ -11,12 +11,13 @@
      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

-- 
kaccounts-integration packaging