[SCM] kservice packaging branch, master, updated. debian/5.36.0-2-10-g61a1c2d

Maximiliano Curia maxy at moszumanska.debian.org
Wed Aug 16 11:21:26 UTC 2017


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

The following commit has been merged in the master branch:
commit 27f8a567776c9a4ff1a476c15503daf13b13fa46
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Aug 15 17:45:36 2017 +0200

    Add a libkf5service-doc package for the qch files
---
 debian/control                   | 101 ++++++++++++++++++++++-----------------
 debian/libkf5service-doc.install |   2 +
 debian/rules                     |   2 +-
 3 files changed, 61 insertions(+), 44 deletions(-)

diff --git a/debian/control b/debian/control
index 0f67b81..d4b93ee 100644
--- a/debian/control
+++ b/debian/control
@@ -9,57 +9,29 @@ Build-Depends: bison,
                debhelper (>= 9),
                docbook-xml,
                docbook-xsl,
+               doxygen,
                extra-cmake-modules (>= 5.37.0~),
                flex,
+               graphviz,
                libkf5config-dev (>= 5.37.0~),
                libkf5coreaddons-dev (>= 5.37.0~),
                libkf5crash-dev (>= 5.37.0~),
                libkf5dbusaddons-dev (>= 5.37.0~),
                libkf5doctools-dev (>= 5.37.0~),
                libkf5i18n-dev (>= 5.37.0~),
+               libqt5sql5-sqlite,
                libxml2-utils,
                pkg-kde-tools (>= 0.15.15ubuntu1~),
-               qtbase5-dev (>= 5.7.0~)
+               qtbase5-dev (>= 5.7.0~),
+               qttools5-dev-tools (>= 5.4),
 Standards-Version: 4.0.0
 Homepage: https://projects.kde.org/projects/frameworks/kservice
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/frameworks/kservice.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/frameworks/kservice.git
 
-Package: libkf5service-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends: libkf5config-dev (>= 5.37.0~),
-         libkf5coreaddons-dev (>= 5.37.0~),
-         libkf5dbusaddons-dev (>= 5.37.0~),
-         libkf5i18n-dev (>= 5.37.0~),
-         libkf5service5 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: development files for kservice
- Application framework for file type association
- and plugin locating.
- .
- Contains development files for kservice.
-Breaks: kded5-dev (<< 5.37),
-        kio-dev (<< 5.28),
-        libkf5emoticons-dev (<< 5.37),
-        libkf5kcmutils-dev (<< 5.37),
-        libkf5kio-dev (<< 5.37),
-        libkf5plasma-dev (<< 5.37),
-        libkf5textwidgets-dev (<< 5.37),
-        plasma-framework-dev (<< 5.28)
-
-Package: libkf5service5
+Package: libkf5service-bin
 Architecture: any
-Multi-Arch: same
-Depends: libkf5service-data (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: libkf5service-bin (= ${binary:Version})
-Description: Advanced plugin and service introspection
- Application framework for file type association
- and plugin locating.
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: kded5 (<< 5.37),
         kinit (<< 5.37),
         kio (<< 5.37),
@@ -77,12 +49,19 @@ Breaks: kded5 (<< 5.37),
         libkf5plasma5 (<< 5.37),
         libkf5plasmaquick5 (<< 5.37),
         libkf5runner5 (<< 5.37),
+        libkf5service5 (<= 5.15),
         libkf5su5 (<< 5.37),
         libkf5textwidgets5 (<< 5.37),
         libkf5wallet-bin (<< 5.37),
         libkf5webkit5 (<< 5.37),
         plasma-framework (<< 5.37),
-        qml-module-org-kde-kio (<< 5.37)
+        qml-module-org-kde-kio (<< 5.37),
+Replaces: libkf5service5 (<= 5.15)
+Description: Advanced plugin and service introspection
+ Application framework for file type association
+ and plugin locating.
+ .
+ This package contains kbuildsycoca5.
 
 Package: libkf5service-data
 Architecture: all
@@ -94,9 +73,42 @@ Description: Advanced plugin and service introspection
  .
  This package contains shared data files.
 
-Package: libkf5service-bin
+Package: libkf5service-dev
+Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
+Depends: libkf5config-dev (>= 5.37.0~),
+         libkf5coreaddons-dev (>= 5.37.0~),
+         libkf5dbusaddons-dev (>= 5.37.0~),
+         libkf5i18n-dev (>= 5.37.0~),
+         libkf5service5 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: libkf5service5-doc (= ${source:Version})
+Description: development files for kservice
+ Application framework for file type association
+ and plugin locating.
+ .
+ Contains development files for kservice.
+Breaks: kded5-dev (<< 5.37),
+        kio-dev (<< 5.28),
+        libkf5emoticons-dev (<< 5.37),
+        libkf5kcmutils-dev (<< 5.37),
+        libkf5kio-dev (<< 5.37),
+        libkf5plasma-dev (<< 5.37),
+        libkf5textwidgets-dev (<< 5.37),
+        plasma-framework-dev (<< 5.28),
+
+Package: libkf5service5
+Architecture: any
+Multi-Arch: same
+Depends: libkf5service-data (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: libkf5service-bin (= ${binary:Version})
+Description: Advanced plugin and service introspection
+ Application framework for file type association
+ and plugin locating.
 Breaks: kded5 (<< 5.37),
         kinit (<< 5.37),
         kio (<< 5.37),
@@ -114,16 +126,19 @@ Breaks: kded5 (<< 5.37),
         libkf5plasma5 (<< 5.37),
         libkf5plasmaquick5 (<< 5.37),
         libkf5runner5 (<< 5.37),
-        libkf5service5 (<= 5.15),
         libkf5su5 (<< 5.37),
         libkf5textwidgets5 (<< 5.37),
         libkf5wallet-bin (<< 5.37),
         libkf5webkit5 (<< 5.37),
         plasma-framework (<< 5.37),
-        qml-module-org-kde-kio (<< 5.37)
-Replaces: libkf5service5 (<= 5.15)
-Description: Advanced plugin and service introspection
+        qml-module-org-kde-kio (<< 5.37),
+
+Package: libkf5service-doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Description: Advanced plugin and service introspection (documentation)
  Application framework for file type association
  and plugin locating.
  .
- This package contains kbuildsycoca5.
+ This package contains the qch documentation files.
diff --git a/debian/libkf5service-doc.install b/debian/libkf5service-doc.install
new file mode 100644
index 0000000..0e7422d
--- /dev/null
+++ b/debian/libkf5service-doc.install
@@ -0,0 +1,2 @@
+usr/share/qt5/doc/KF5Service.qch
+usr/share/qt5/doc/KF5Service.tags
diff --git a/debian/rules b/debian/rules
index 221b52c..eacd957 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_auto_configure:
-	$(overridden_command) -- -DAPPLICATIONS_MENU_NAME="kf5-applications.menu"
+	$(overridden_command) -- -DAPPLICATIONS_MENU_NAME="kf5-applications.menu" -DBUILD_QCH=ON
 
 override_dh_strip:
 	$(overridden_command) --dbgsym-migration='libkf5service5-dbg (<= 5.19.0-1~~)'

-- 
kservice packaging



More information about the pkg-kde-commits mailing list