[SCM] frameworkintegration packaging branch, master, updated. debian/5.37.0-2-105-ge9c37f4

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/frameworkintegration.git;a=commitdiff;h=fef883d

The following commit has been merged in the master branch:
commit fef883dacc1d40eda3b9be900b23bc3f8f9f6a11
Merge: d1b057d242dc2f1143587fc58e33d1d02eb673af 2252fd71ace012fbda44edb96e279f1c14cf50d0
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Dec 2 14:31:42 2015 -0800

    Debian merge. No remaining changes.

 debian/changelog                    | 37 +++++++++++++++++++++++++++++++++++++
 debian/control                      | 25 +++++++++++--------------
 debian/frameworkintegration.install |  4 ++++
 3 files changed, 52 insertions(+), 14 deletions(-)

diff --cc debian/changelog
index 7b67d97,ee330b6..7130eb5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,54 -1,34 +1,91 @@@
++frameworkintegration (5.16.0-1ubuntu1) UNRELEASED; urgency=medium
++
++  * Debian merge. No remaining changes. 
++
++ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 02 Dec 2015 14:31:27 -0800
++
+ frameworkintegration (5.16.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.16.0).
+   * Use Noto fonts by default.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 30 Nov 2015 12:12:16 +0100
+ 
+ frameworkintegration (5.15.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.15.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 09 Oct 2015 19:15:47 +0200
+ 
 +frameworkintegration (5.15.0-0ubuntu2) UNRELEASED; urgency=medium
 +
 +  * Vivid backport. 
 +  * Refresh install file.
 +  * Frameworkintegration requires kconf_update to build,
 +    which resides in libkf5config-bin. Adding to build deps. 
 +  * Revert last change, added runtime dep to kconfig instead
 +    due to the number of packages it affected. 
 +  * 
 +  * Fix merge madness. 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 08 Oct 2015 20:22:00 -0700
 +
 +frameworkintegration (5.15.0-0ubuntu2) xenial; urgency=medium
 +
 +  * Fix autopackagetests by adding allow-stderr to the requirements.
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Tue, 03 Nov 2015 15:34:28 +0100
 +
 +frameworkintegration (5.15.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * Vivid backport
 +
 +  [ Jonathan Riddell ]
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 07 Oct 2015 13:41:53 +0100
 +
+ frameworkintegration (5.14.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.14.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 15 Sep 2015 13:47:31 +0200
+ 
 +frameworkintegration (5.14.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Thu, 17 Sep 2015 13:08:58 +0100
 +
+ frameworkintegration (5.13.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.13.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Sep 2015 22:03:37 +0200
+ 
 +frameworkintegration (5.13.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 12:46:40 +0200
 +
+ frameworkintegration (5.12.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.12.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 09 Jul 2015 12:42:45 +0200
+ 
 +frameworkintegration (5.12.0-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +  * Fix merge, remove broken backport.
 +  * Vivid backport. 
 +  * Apply 0001-Fix-changelog-format-to-avoid-a-lintian-warning.patch
 +    provided by santa. 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 14:23:00 +0200
 +
  frameworkintegration (5.11.0-1) unstable; urgency=medium
  
    * New upstream release (5.10.0).
diff --cc debian/frameworkintegration.install
index 25f2f37,1dea657..d664a2b
--- a/debian/frameworkintegration.install
+++ b/debian/frameworkintegration.install
@@@ -1,6 -1,6 +1,10 @@@
  usr/lib/*/qt5/plugins/kf5/FrameworkIntegrationPlugin.so
  usr/lib/*/qt5/plugins/platformthemes/KDEPlatformTheme.so
++<<<<<<< HEAD
 +usr/share/kconf_update/
++=======
+ usr/share/kconf_update/frameworksintegration-5.16-font.*
++>>>>>>> master
  usr/share/kf5/infopage/
  usr/share/knotifications5/plasma_workspace.notifyrc
  usr/share/locale/*/*/frameworkintegration5.mo

-- 
frameworkintegration packaging