[SCM] kchmviewer packaging branch, master, updated. e1f50b212d61d353837421ff5fbdf8b64c74d030

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Mon Sep 21 23:27:54 UTC 2015


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

The following commit has been merged in the master branch:
commit e1f50b212d61d353837421ff5fbdf8b64c74d030
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 21 20:27:33 2015 -0300

    Override dh_auto_configure in order to use Qt5's qmake.
---
 debian/changelog | 2 ++
 debian/rules     | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ec25ae3..a826dc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ kchmviewer (7.3-1) UNRELEASED; urgency=medium
   * New upstream release.
     - Switch to the Qt5 version in order to drop Qt4's webkit (Closes: #784476)
       and KDE4 support. We can add KF5 support as soon as it happen upstream.
+  * Override dh_auto_configure in order to use Qt5's qmake. We can drop this
+    if CMakeLists.txt starts detecting Qt5.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon, 21 Sep 2015 19:47:54 -0300
 
diff --git a/debian/rules b/debian/rules
index cf8a19f..aa252f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,3 +8,6 @@ export QT_SELECT := qt5
 
 %:
 	dh $@ --parallel
+
+override_dh_auto_configure:
+	qmake

-- 
kchmviewer packaging



More information about the pkg-kde-commits mailing list