[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.10.5-1

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=b3af5cd

The following commit has been merged in the master branch:
commit b3af5cd07ff38ac5d5aec5f55bd1911606e7fc7a
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sat Mar 9 16:40:37 2013 +0100

    Add libhupnp-dev to Build-Conflicts.
---
 debian/changelog |    1 +
 debian/control   |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 65bfa96..accdefe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ kde4libs (4:4.10.1-0r0) UNRELEASED; urgency=low
     the build system.
   * Explain in README.source why some optional missing build depends reported by
     cmake aren't in Build-Depends.
+  * Add libhupnp-dev to Build-Conflicts.
   * Use wildcards in install files (in a way that an SONAME bump won't go
     unnoticed).
   * Update installed files.
diff --git a/debian/control b/debian/control
index 97458ea..95ff788 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 7.3.16), cmake (>= 2.6.4), pkg-kde-tools (>= 0.14),
  libutempter-dev, liblzma-dev, libattica-dev (>= 0.1.90), shared-desktop-ontologies (>= 0.6.50),
  libpolkit-qt-1-dev (>= 0.99.0), libxss-dev, libqca2-dev, libdbusmenu-qt-dev, docbook-xml, docbook-xsl,
  libxrender-dev, libkrb5-dev, libudev-dev [linux-any]
-Build-Conflicts: libqtwebkit-dev (<< 2.2.1)
+Build-Conflicts: libqtwebkit-dev (<< 2.2.1), libhupnp-dev
 Standards-Version: 3.9.3
 Homepage: http://www.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git

-- 
KDE Development Platform Libraries module packaging