[SCM] solid packaging branch, master, updated. debian/5.36.0-1-10-g0baa6d9

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit c9279cb2b8499e712cc1a387da52adeb5d6d441e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Aug 15 18:02:07 2017 +0200

    Add a libkf5solid-doc package for the qch files
---
 debian/control                 | 60 ++++++++++++++++++++++++++----------------
 debian/libkf5solid-doc.install |  2 ++
 debian/rules                   |  3 +++
 3 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/debian/control b/debian/control
index ed16a5f..612fbfd 100644
--- a/debian/control
+++ b/debian/control
@@ -6,25 +6,41 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: bison,
                cmake (>= 3.0~),
                debhelper (>= 9),
+               doxygen,
                extra-cmake-modules (>= 5.37.0~),
                flex,
+               graphviz,
+               libqt5sql5-sqlite,
                libudev-dev [linux-any],
                pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev (>= 5.7.0~),
                qtdeclarative5-dev (>= 5.7.0~),
                qttools5-dev (>= 5.4),
-               qttools5-dev-tools (>= 5.4)
+               qttools5-dev-tools (>= 5.4),
 Standards-Version: 4.0.0
 Homepage: https://projects.kde.org/projects/frameworks/solid
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/frameworks/solid.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/frameworks/solid.git
 
+Package: libkf5solid-bin
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: udisks2 [linux-any], upower
+Description: Qt library to query and control hardware
+ Solid is a device integration framework. It provides a way of querying and
+ interacting with hardware independently of the underlying operating system.
+ .
+ Solid is part of KDE Frameworks 5.
+ .
+ This package contains the solid-hardware5 tool.
+
 Package: libkf5solid-dev
 Section: libdevel
 Architecture: any
 Depends: libkf5solid5 (= ${binary:Version}),
          qtbase5-dev (>= 5.7.0~),
-         ${misc:Depends}
+         ${misc:Depends},
+Recommends: libkf5solid5-doc (= ${source:Version})
 Description: Qt library to query and control hardware
  Solid is a device integration framework. It provides a way of querying and
  interacting with hardware independently of the underlying operating system.
@@ -34,12 +50,24 @@ Description: Qt library to query and control hardware
  This package contains the development files.
 Breaks: kio-dev (<< 5.28), libkf5kio-dev (<< 5.37)
 
+Package: libkf5solid-doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Description: Qt library to query and control hardware (documentation)
+ Solid is a device integration framework. It provides a way of querying and
+ interacting with hardware independently of the underlying operating system.
+ .
+ Solid is part of KDE Frameworks 5.
+ .
+ This package contains the qch documentation files.
+
 Package: libkf5solid5
 Architecture: any
 Multi-Arch: same
 Depends: libkf5solid5-data (= ${source:Version}),
          ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
 Recommends: media-player-info [linux-any]
 Description: Qt library to query and control hardware
  Solid is a device integration framework. It provides a way of querying and
@@ -51,7 +79,7 @@ Breaks: baloo-kf5 (<< 5.37),
         libkf5baloo5 (<< 5.37),
         libkf5kdelibs4support5 (<< 5.37),
         libkf5kiofilewidgets5 (<< 5.37),
-        libkf5runner5 (<< 5.37)
+        libkf5runner5 (<< 5.37),
 
 Package: libkf5solid5-data
 Architecture: all
@@ -65,17 +93,17 @@ Description: Qt library to query and control hardware
  .
  This package contains shared data files.
 
-Package: libkf5solid-bin
+Package: qml-module-org-kde-solid
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: udisks2 [linux-any], upower
-Description: Qt library to query and control hardware
+Replaces: qtdeclarative5-kf5solid (<< 5.0.0-0ubuntu2)
+Breaks: qtdeclarative5-kf5solid (<< 5.0.0-0ubuntu2)
+Description: Qt library to query and control hardware plugin
  Solid is a device integration framework. It provides a way of querying and
  interacting with hardware independently of the underlying operating system.
  .
- Solid is part of KDE Frameworks 5.
- .
- This package contains the solid-hardware5 tool.
+ This package is part of KDE Frameworks 5.
 
 Package: qtdeclarative5-kf5solid
 Section: oldlibs
@@ -87,15 +115,3 @@ Description: transitional package to renamed qml-module-org-kde-solid
  safe to remove.
  .
  This package is part of KDE Frameworks 5.
-
-Package: qml-module-org-kde-solid
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: qtdeclarative5-kf5solid (<< 5.0.0-0ubuntu2)
-Breaks: qtdeclarative5-kf5solid (<< 5.0.0-0ubuntu2)
-Description: Qt library to query and control hardware plugin
- Solid is a device integration framework. It provides a way of querying and
- interacting with hardware independently of the underlying operating system.
- .
- This package is part of KDE Frameworks 5.
diff --git a/debian/libkf5solid-doc.install b/debian/libkf5solid-doc.install
new file mode 100644
index 0000000..b17c8bb
--- /dev/null
+++ b/debian/libkf5solid-doc.install
@@ -0,0 +1,2 @@
+usr/share/qt5/doc/KF5Solid.qch
+usr/share/qt5/doc/KF5Solid.tags
diff --git a/debian/rules b/debian/rules
index 4089cec..03a73db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
+override_dh_auto_configure:
+	$(overridden_command) -- -DBUILD_QCH=ON
+
 override_dh_strip:
 	dh_strip --dbgsym-migration='libkf5solid5-dbg (<= 5.19.0-1~~)'
 

-- 
solid packaging