[SCM] kcoreaddons packaging branch, master, updated. debian/5.37.0-2-101-ga15783a

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 8dc754e9b7db5fd02660207f39d477861279c09c
Merge: 85a94ff1056b5c8d329cc8a16b913beb4f852bbe 298c09618510247577b021efa5d92106f4b87782
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Nov 5 16:50:32 2015 +0100

    Merge branch 'master' into kubuntu_unstable

 debian/changelog                        | 46 +++++++++++++++++++++++++++++++++
 debian/control                          |  5 ++--
 debian/libkf5coreaddons-bin-dev.install |  1 +
 debian/libkf5coreaddons-dev.install     |  4 ++-
 debian/libkf5coreaddons5.symbols        |  4 +++
 debian/tests/control                    |  1 +
 6 files changed, 57 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index f7a9d14,dbd29a9..7081a86
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,55 -1,37 +1,100 @@@
+ kcoreaddons (5.15.0-2~) UNRELEASED; urgency=medium
+ 
+   * Move bin-dev cmake files from the -dev package. Thanks to Aleix Pol
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 04 Nov 2015 17:05:18 +0100
+ 
+ kcoreaddons (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:59 +0200
+ 
 +kcoreaddons (5.15.0-0ubuntu2) UNRELEASED; urgency=medium
 +
 +  * Vivid backport. 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 08 Oct 2015 20:56:24 -0700
 +
 +kcoreaddons (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:44:49 +0100
 +
+ kcoreaddons (5.14.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.14.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 15 Sep 2015 13:48:01 +0200
+ 
 +kcoreaddons (5.14.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Thu, 17 Sep 2015 13:11:49 +0100
 +
+ kcoreaddons (5.13.0-1) unstable; urgency=medium
+ 
+   * Drop XS-Testsuite field
+   * New upstream release (5.13.0).
+   * Update symbols files.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 12 Aug 2015 21:36:47 +0200
+ 
 +kcoreaddons (5.13.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * new upstream release
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Update symbols files.
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 12:53:50 +0200
 +
+ kcoreaddons (5.12.0-1) unstable; urgency=medium
+ 
+   * Update copyright information.
+   * New upstream release (5.12.0).
+   * Update symbols files.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 09 Jul 2015 12:43:02 +0200
+ 
 +kcoreaddons (5.12.0-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +  * Vivid backport. 
 +  * Apply 0001-Update-symbols.patch provided by santa. 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 14:26:22 +0200
 +
++kcoreaddons (5.11.0-1) unstable; urgency=medium
++
++  * New upstream release (5.10.0).
++  * Remove upstream applied patch: colliding_webp_mime_info
++  * New upstream release (5.11.0).
++  * Revert the -dev package to MA same.
++  * Update symbols files.
++  * Update copyright information.
++
++ -- Maximiliano Curia <maxy at debian.org>  Fri, 26 Jun 2015 13:14:02 +0200
++
 +kcoreaddons (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Vivid backport
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:09:53 -0700
 +
 +kcoreaddons (5.11.0-2~) UNRELEASED; urgency=medium
 +
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 26 Jun 2015 21:51:05 +0200
 +
  kcoreaddons (5.11.0-1) unstable; urgency=medium
  
    * New upstream release (5.10.0).
@@@ -201,3 -183,3 +246,4 @@@ kcoreaddons (5.0.0-0ubuntu1) utopic; ur
    * Initial stable upstream release
  
   -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 09 Jul 2014 16:36:04 +0200
++
diff --cc debian/libkf5coreaddons5.symbols
index eb1b040,ba00891..642b2a7
--- a/debian/libkf5coreaddons5.symbols
+++ b/debian/libkf5coreaddons5.symbols
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +# SymbolsHelper-Confirmed: 5.15.0+git20151104.0143+15.10 amd64 i386
++=======
+ # SymbolsHelper-Confirmed: 5.13.0 amd64
++>>>>>>> master
  libKF5CoreAddons.so.5 libkf5coreaddons5 #MINVER#
   _ZN10KAboutData10addLicenseEN13KAboutLicense10LicenseKeyE at Base 4.100.0
   _ZN10KAboutData10pluginDataERK7QString at Base 4.97.0

-- 
kcoreaddons packaging