[SCM] libkcddb packaging branch, kubuntu_xenial_archive, updated. debian/15.08.0-1-23-gb41da01

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libkcddb.git;a=commitdiff;h=b41da01

The following commit has been merged in the kubuntu_xenial_archive branch:
commit b41da0103d7b9b3847b0b98b0d4c0dfb4f3da7bf
Merge: 6ae92695173c207ff82be4d770db29ce4a12bf0e f912e94b752a15f660535e253faf3cc939023d82
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Feb 11 17:42:42 2016 -0800

    Debian merge: No remaining changes.
    
    * Debian merge: No remaining changes.
    * New upstream release (15.12.1)

 debian/.gitattributes                  |  1 +
 debian/changelog                       | 39 +++++++++++++++++++++++++++++++---
 debian/control                         | 12 ++++++-----
 debian/patches/libmusicbrainz5cc.patch |  9 ++++++++
 debian/rules                           |  4 +++-
 debian/source/include-binaries         |  1 -
 6 files changed, 56 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index db558de,b7d02ff..3580d50
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,64 -1,32 +1,98 @@@
 +libkcddb (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
++  [ Clive Johnston ]
 +  * New upstream release
 +
++  [ Scarlett Clark ]
++  * Debian merge: No remaining changes.
++  * New upstream release (15.12.1) 
++
 + -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:29:31 +0000
 +
 +libkcddb (4:15.08.2-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:51 +0100
 +
 +libkcddb (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:54:57 +0100
 +
 +libkcddb (4:15.08.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release (15.08.1)
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 17:37:55 +0100
 +
+ libkcddb (4:15.08.0-1) unstable; urgency=medium
+ 
+   * New upstream release (15.08.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 19 Sep 2015 19:10:49 +0200
+ 
 +libkcddb (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:44:45 +0100
 +
 +libkcddb (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 11:22:29 +0100
 +
 +libkcddb (4:15.04.3-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream version.
 +  * New patch: libmusicbrainz5cc.patch (Closes: #791884)
 +  * Update symbols file.
 +
 + -- Matthias Klose <doko at ubuntu.com>  Fri, 14 Aug 2015 23:02:59 +0200
 +
 +libkcddb (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +  * New upstream release
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 19:41:54 +0200
 +
+ libkcddb (4:15.04.1-2) unstable; urgency=medium
+ 
+   * Update symbols files. (Closes: #777949)
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 10 Aug 2015 12:25:46 +0200
+ 
+ libkcddb (4:15.04.1-1) unstable; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * New upstream release (15.04.1).
+   * Update symbols files from buildds logs (4:14.12.2-1).
+   * New patch: libmusicbrainz5cc.patch (Closes: #791884)
+   * Bump build depends of libmusicbrainz5-dev to 5.1.0+git20150707~
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 10 Jul 2015 11:57:03 +0200
+ 
 +libkcddb (4:14.12.3-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:06:02 -0700
 +
+ libkcddb (4:14.12.2-1) experimental; urgency=medium
+ 
+   * Prepare Debian release.
+   * Bump Standards-Version to 3.9.6, no changes needed.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 20 Feb 2015 09:18:51 +0100
+ 
  libkcddb (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/patches/libmusicbrainz5cc.patch
index 5161c7f,94437bc..3e079a4
--- a/debian/patches/libmusicbrainz5cc.patch
+++ b/debian/patches/libmusicbrainz5cc.patch
@@@ -1,11 -1,11 +1,20 @@@
  Description: Prefer libmusicbrainz5cc to libmusicbrainz5
  Author: Maximiliano Curia <maxy at debian.org>
++<<<<<<< HEAD
 +Last-Update: 2015-07-17
 +Index: libkcddb-15.07.90/cmake/FindMusicBrainz5.cmake
 +===================================================================
 +--- libkcddb-15.07.90.orig/cmake/FindMusicBrainz5.cmake
 ++++ libkcddb-15.07.90/cmake/FindMusicBrainz5.cmake
 +@@ -18,7 +18,7 @@ IF (NOT WIN32)
++=======
+ Last-Update: 2015-07-09
+ Index: libkcddb/cmake/FindMusicBrainz5.cmake
+ ===================================================================
+ --- libkcddb.orig/cmake/FindMusicBrainz5.cmake	2015-09-19 16:23:48.135877796 +0200
+ +++ libkcddb/cmake/FindMusicBrainz5.cmake	2015-09-19 16:24:15.822765486 +0200
+ @@ -18,7 +18,7 @@
++>>>>>>> master
      # use pkg-config to get the directories and then use these values
      # in the FIND_PATH() and FIND_LIBRARY() calls
      find_package(PkgConfig)

-- 
libkcddb packaging