[SCM] sonnet packaging branch, master, updated. debian/5.37.0-2-100-g6ea1571

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/sonnet.git;a=commitdiff;h=f33065a

The following commit has been merged in the master branch:
commit f33065acda20243a2e0dc281faf891779be39d30
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Dec 13 09:44:39 2017 -0300

    Prepare changelog for 5.41.0-1~
---
 debian/.gitattributes           |  1 +
 debian/changelog                | 12 ++++++------
 debian/libkf5sonnet-doc.install |  4 ++++
 debian/rules                    |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index b7db361..c72552e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sonnet (5.41.0-1~) UNRELEASED; urgency=medium
+
+  * New upstream release (5.41.0).
+
+ -- Maximiliano Curia <maxy at debian.org>  Wed, 13 Dec 2017 09:44:08 -0300
+
 sonnet (5.41.0-0neon) xenial; urgency=medium
 
   * New release
@@ -16,12 +22,6 @@ sonnet (5.39.0-0neon) xenial; urgency=medium
 
  -- Neon CI <neon at kde.org>  Sun, 15 Oct 2017 11:48:01 +0000
 
-sonnet (5.38.0-1~) UNRELEASED; urgency=medium
-
-  * New upstream release (5.38.0).
-
- -- Maximiliano Curia <maxy at debian.org>  Mon, 18 Sep 2017 17:08:34 +0200
-
 sonnet (5.37.0-2) sid; urgency=medium
 
   * New revision
diff --git a/debian/libkf5sonnet-doc.install b/debian/libkf5sonnet-doc.install
index e69de29..a7f3384 100644
--- a/debian/libkf5sonnet-doc.install
+++ b/debian/libkf5sonnet-doc.install
@@ -0,0 +1,4 @@
+usr/share/qt5/doc/KF5SonnetCore.qch
+usr/share/qt5/doc/KF5SonnetCore.tags
+usr/share/qt5/doc/KF5SonnetUi.qch
+usr/share/qt5/doc/KF5SonnetUi.tags
diff --git a/debian/rules b/debian/rules
index 6bbb806..8689d1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_auto_configure:
-	$(overridden_command)
+	$(overridden_command) -- -DBUILD_QCH=ON
 
 override_dh_strip:
 	$(overridden_command) --dbgsym-migration='libkf5sonnet5-dbg (<= 5.19.0-1~~)'

-- 
sonnet packaging