[SCM] Repository for the KDE Debconf access library. branch, debconf-kde0, updated. debian/0.3-1-9-g9d9f0cc

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/debconf-kde.git;a=commitdiff;h=9d9f0cc

The following commit has been merged in the debconf-kde0 branch:
commit 9d9f0ccb4d12dee0c7f764c1d31b20d6a96b69ff
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jul 10 08:19:59 2015 +0200

    Add Conflicts with libdebconf-kde-dev.
    
    They will provide some conflicting files as long as libdebconf-kde0-dev is
    around
---
 debian/changelog | 1 +
 debian/control   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cd873e6..6e4da97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ debconf-kde0 (0.3-2~) UNRELEASED; urgency=medium
   * Reintroduce libdebconf-kde0 in src:debconf-kde0.
   * Bump Standards-Version to 3.9.6, no changes needed.
   * Update copyright information.
+  * Add Conflicts with libdebconf-kde-dev.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 10 Jul 2015 01:32:44 +0200
 
diff --git a/debian/control b/debian/control
index 243f6f1..02361e0 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,7 @@ Section: libdevel
 Architecture: any
 Depends: libdebconf-kde0 (= ${binary:Version}),
          ${misc:Depends}
+Conflicts: libdebconf-kde-dev
 Description: Development headers for the Debconf KDE library
  Debconf KDE is a GUI library for including Debconf frontends in Qt-based
  applications.

-- 
Repository for the KDE Debconf access library.