[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=d3cc98f

The following commit has been merged in the master branch:
commit d3cc98f5030bf2cd64a433aa114abc398572594e
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun May 12 12:15:44 2013 +0200

    Avoid usage of HUpnp by config instead of Build-Conflicts.
---
 debian/changelog |    1 +
 debian/control   |    2 +-
 debian/rules     |    1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ab9da25..eeb46a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ kde4libs (4:4.10.3-1) UNRELEASED; urgency=low
     - libktexteditor4.symbols
   * Use SSL/TLS certificates bundle from ca-certificates package, thanks to
     Thijs Kinkhorst <thijs at debian.org>. (Closes: #511597)
+  * Avoid usage of HUpnp by config instead of Build-Conflicts.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 09 May 2013 18:49:01 +0200
 
diff --git a/debian/control b/debian/control
index b69316c..fb2acf5 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 9), cmake (>= 2.6.4), pkg-kde-tools (>= 0.14), libd
  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), libhupnp-dev
+Build-Conflicts: libqtwebkit-dev (<< 2.2.1)
 Standards-Version: 3.9.4
 Homepage: http://www.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git
diff --git a/debian/rules b/debian/rules
index f70bc0f..598cf56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ endif
 
 override_dh_auto_configure:
 	$(overridden_command) -- -DKDE4_BUILD_TESTS=false \
+	    -DWITH_HUpnp=OFF \
 	    -DKDE_DISTRIBUTION_TEXT="Debian packages" \
 	    -DKDE4_USE_ALWAYS_FULL_RPATH=false \
 	    -DCONFIG_INSTALL_DIR=/usr/share/kde4/config \

-- 
KDE Development Platform Libraries module packaging