[SCM] libkcddb packaging branch, kubuntu_xenial_archive, updated. debian/15.08.0-1-25-g47a118f

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 47a118f63ad61be2b9b9346bfce89ebfa666d490
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Feb 11 19:10:24 2016 -0800

    Fix tags in the patch.
---
 debian/changelog                       | 1 +
 debian/patches/libmusicbrainz5cc.patch | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0854989..aadcdeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libkcddb (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
   * Debian merge: No remaining changes.
   * New upstream release (15.12.1) 
   * Bump version.. oops 
+  * Fix tags in the patch. 
 
  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:29:31 +0000
 
diff --git a/debian/patches/libmusicbrainz5cc.patch b/debian/patches/libmusicbrainz5cc.patch
index 3e079a4..94437bc 100644
--- a/debian/patches/libmusicbrainz5cc.patch
+++ b/debian/patches/libmusicbrainz5cc.patch
@@ -1,20 +1,11 @@
 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