[SCM] kpmcore packaging branch, master, updated. 1dccc60e318d02086289cc3c1d7d546ccc7705ca

[Jonathan Cristopher Carter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kpmcore.git;a=commitdiff;h=1dccc60

The following commit has been merged in the master branch:
commit 1dccc60e318d02086289cc3c1d7d546ccc7705ca
Author: Jonathan Carter <jcarter at linux.com>
Date:   Tue Sep 5 11:08:12 2017 +0200

    New upstream release
---
 debian/changelog | 11 +++++++++++
 debian/control   | 12 ++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 26e02ec..9023f56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+<<<<<<< HEAD
+kpmcore (3.1.2-2) unstable; urgency=medium
+
+  * Add corresponding breaks field for the replace field (Closes: #870435)
+  * Update maintainer email address
+  * Update standards version to 4.1.0.0
+
+ -- Jonathan Carter <jcc at debian.org>  Tue, 29 Aug 2017 09:45:05 +0200
+
+=======
+>>>>>>> e988a39f67713170ac8d767e9010940fd2da9b6f
 kpmcore (3.1.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 96c1ec8..246dd9b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,11 @@ Source: kpmcore
 Section: kde
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+<<<<<<< HEAD
+Uploaders: Jonathan Carter <jcc at debian.org>
+=======
 Uploaders: Jonathan Carter <jcarter at linux.com>
+>>>>>>> e988a39f67713170ac8d767e9010940fd2da9b6f
 Build-Depends: cmake,
                debhelper (>= 10),
                extra-cmake-modules,
@@ -16,7 +20,11 @@ Build-Depends: cmake,
                libparted-dev,
                pkg-config,
                pkg-kde-tools
+<<<<<<< HEAD
+Standards-Version: 4.1.0.0
+=======
 Standards-Version: 4.0.0
+>>>>>>> e988a39f67713170ac8d767e9010940fd2da9b6f
 Homepage: https://github.com/KDE/kpmcore
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/kde-extras/kpmcore.git/
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-extras/kpmcore.git
@@ -25,6 +33,10 @@ Package: libkpmcore5
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libkpmcore3, libkpmcore4
+<<<<<<< HEAD
+Breaks: libkpmcore3, libkpmcore4
+=======
+>>>>>>> e988a39f67713170ac8d767e9010940fd2da9b6f
 Description: KDE Partition Manager Core
  KDE Parition Partition Manager Core (KPM core) allows
  software to re-use common partitioning GUI tasks.

-- 
kpmcore packaging