[SCM] kio packaging branch, master, updated. debian/5.36.0-1-12-gf0c9593

Maximiliano Curia maxy at moszumanska.debian.org
Wed Aug 16 11:22:32 UTC 2017


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

The following commit has been merged in the master branch:
commit e55a05ccfd62d625b68875e51562fa45d21a6080
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Aug 15 20:03:11 2017 +0200

    Add a libkf5kio-doc package for the qch files
---
 debian/control               | 114 +++++++++++++++++++++++++------------------
 debian/libkf5kio-doc.install |   2 +
 debian/rules                 |   3 ++
 3 files changed, 71 insertions(+), 48 deletions(-)

diff --git a/debian/control b/debian/control
index ba3f43b..6321023 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,9 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 3.0~),
                debhelper (>= 9),
+               doxygen,
                extra-cmake-modules (>= 5.37.0~),
+               graphviz,
                libacl1-dev,
                libkf5archive-dev (>= 5.37.0~),
                libkf5bookmarks-dev (>= 5.37.0~),
@@ -29,18 +31,69 @@ Build-Depends: cmake (>= 3.0~),
                libkf5windowsystem-dev (>= 5.37.0~),
                libkf5xmlgui-dev (>= 5.37.0~),
                libkrb5-dev,
+               libqt5sql5-sqlite,
                libqt5x11extras5-dev (>= 5.7.0~),
                libxml2-dev,
                libxslt1-dev,
                pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev (>= 5.7.0~),
                qtscript5-dev (>= 5.7.0~),
-               zlib1g-dev
+               qttools5-dev-tools (>= 5.4),
+               zlib1g-dev,
 Standards-Version: 4.0.0
 Homepage: https://projects.kde.org/projects/frameworks/kio
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/frameworks/kio.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/frameworks/kio.git
 
+Package: kio
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: baloo-kf5 (<< 5.37),
+        kdesignerplugin (<< 5.37),
+        kinit (<< 5.37),
+        kio-extras (<< 4:5.0.95-0ubuntu1~ubuntu14.10~ppa6),
+        kio-extras-data (<< 4:5.0.95-0ubuntu1~ubuntu14.10~ppa6),
+        kross (<< 5.37),
+        libkf5declarative5 (<< 5.37),
+        libkf5kdelibs4support5 (<< 5.37),
+        libkf5kdelibs4support5-bin (<< 5.37),
+        libkf5khtml-bin (<< 5.37),
+        libkf5khtml5 (<< 5.37),
+        libkf5krossui5 (<< 5.37),
+        libkf5newstuff5 (<< 5.37),
+        libkf5newstuffcore5 (<< 5.37),
+        libkf5notifyconfig5 (<< 5.37),
+        libkf5parts5 (<< 5.37),
+        libkf5plasma5 (<< 5.37),
+        libkf5runner5 (<< 5.37),
+        libkf5texteditor5 (<< 5.37),
+        libkf5webkit5 (<< 5.37),
+        libkf5xmlrpcclient5 (<< 5.37),
+        plasma-framework (<< 5.37),
+        qml-module-org-kde-kio (<< 5.37),
+Replaces: kio-extras (<< 4:5.0.95-0ubuntu1~ubuntu14.10~ppa6),
+          kio-extras-data (<< 4:5.0.95-0ubuntu1~ubuntu14.10~ppa6),
+Description: Resource and network access abstraction
+ KDE Input/Output framework provides a single API for
+ operating on files, whether local or on a remote server.
+ Additionally, KIO Slaves provide support for individual
+ protocols. Some particularly useful ones are http, ftp,
+ sftp, smb, nfs, ssh (fish), man, tar and zip.
+
+Package: kio-dev
+Depends: libkf5kio-dev, ${misc:Depends}
+Architecture: any
+Priority: extra
+Section: oldlibs
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+Breaks: kross-dev (<< 5.37),
+        libkf5declarative-dev (<< 5.37),
+        libkf5khtml-dev (<< 5.37),
+        libkf5newstuff-dev (<< 5.37),
+        libkf5notifyconfig-dev (<< 5.37),
+        libkf5parts-dev (<< 5.37),
+
 Package: libkf5kio-dev
 Section: libdevel
 Architecture: any
@@ -58,9 +111,10 @@ Depends: kio (= ${binary:Version}),
          libkf5solid-dev (>= 5.37.0~),
          libkf5xmlgui-dev (>= 5.37.0~),
          qtbase5-dev (>= 5.7.0~),
-         ${misc:Depends}
+         ${misc:Depends},
 Breaks: kio-dev (<< 5.23.0-2~)
 Replaces: kio-dev (<< 5.23.0-2~)
+Recommends: libkf5kio-doc (= ${source:Version})
 Description: Resource and network access abstraction
  KDE Input/Output framework provides a single API for
  operating on files, whether local or on a remote server.
@@ -70,40 +124,18 @@ Description: Resource and network access abstraction
  .
  Contains development files for kio.
 
-Package: kio
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: baloo-kf5 (<< 5.37),
-        kdesignerplugin (<< 5.37),
-        kinit (<< 5.37),
-        kio-extras (<< 4:5.0.95-0ubuntu1~ubuntu14.10~ppa6),
-        kio-extras-data (<< 4:5.0.95-0ubuntu1~ubuntu14.10~ppa6),
-        kross (<< 5.37),
-        libkf5declarative5 (<< 5.37),
-        libkf5kdelibs4support5 (<< 5.37),
-        libkf5kdelibs4support5-bin (<< 5.37),
-        libkf5khtml-bin (<< 5.37),
-        libkf5khtml5 (<< 5.37),
-        libkf5krossui5 (<< 5.37),
-        libkf5newstuff5 (<< 5.37),
-        libkf5newstuffcore5 (<< 5.37),
-        libkf5notifyconfig5 (<< 5.37),
-        libkf5parts5 (<< 5.37),
-        libkf5plasma5 (<< 5.37),
-        libkf5runner5 (<< 5.37),
-        libkf5texteditor5 (<< 5.37),
-        libkf5webkit5 (<< 5.37),
-        libkf5xmlrpcclient5 (<< 5.37),
-        plasma-framework (<< 5.37),
-        qml-module-org-kde-kio (<< 5.37)
-Replaces: kio-extras (<< 4:5.0.95-0ubuntu1~ubuntu14.10~ppa6),
-          kio-extras-data (<< 4:5.0.95-0ubuntu1~ubuntu14.10~ppa6)
-Description: Resource and network access abstraction
+Package: libkf5kio-doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Description: Resource and network access abstraction (documentation)
  KDE Input/Output framework provides a single API for
  operating on files, whether local or on a remote server.
  Additionally, KIO Slaves provide support for individual
  protocols. Some particularly useful ones are http, ftp,
  sftp, smb, nfs, ssh (fish), man, tar and zip.
+ .
+ This package contains the qch documentation files.
 
 Package: libkf5kiocore5
 Architecture: any
@@ -131,7 +163,7 @@ Breaks: baloo-kf5 (<< 5.37),
         libkf5webkit5 (<< 5.37),
         libkf5xmlrpcclient5 (<< 5.37),
         plasma-framework (<< 5.37),
-        qml-module-org-kde-extensionplugin (<< 5.28)
+        qml-module-org-kde-extensionplugin (<< 5.28),
 
 Package: libkf5kiofilewidgets5
 Architecture: any
@@ -148,7 +180,7 @@ Description: Resource and network access abstraction
 Breaks: frameworkintegration (<< 5.28),
         kdesignerplugin (<< 5.37),
         kross (<< 5.37),
-        libkf5kdelibs4support5 (<< 5.37)
+        libkf5kdelibs4support5 (<< 5.37),
 
 Package: libkf5kiogui5
 Architecture: any
@@ -203,18 +235,4 @@ Breaks: frameworkintegration (<< 5.28),
         libkf5texteditor5 (<< 5.37),
         libkf5webkit5 (<< 5.37),
         plasma-framework (<< 5.37),
-        qml-module-org-kde-kio (<< 5.37)
-
-Package: kio-dev
-Depends: libkf5kio-dev, ${misc:Depends}
-Architecture: any
-Priority: extra
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-Breaks: kross-dev (<< 5.37),
-        libkf5declarative-dev (<< 5.37),
-        libkf5khtml-dev (<< 5.37),
-        libkf5newstuff-dev (<< 5.37),
-        libkf5notifyconfig-dev (<< 5.37),
-        libkf5parts-dev (<< 5.37)
+        qml-module-org-kde-kio (<< 5.37),
diff --git a/debian/libkf5kio-doc.install b/debian/libkf5kio-doc.install
new file mode 100644
index 0000000..fb1736a
--- /dev/null
+++ b/debian/libkf5kio-doc.install
@@ -0,0 +1,2 @@
+usr/share/qt5/doc/KF5KIO.qch
+usr/share/qt5/doc/KF5KIO.tags
diff --git a/debian/rules b/debian/rules
index 2719132..2c44bed 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_shlibdeps:
 	$(overridden_command) $(patsubst %,-p%,$(filter lib%,$(shell dh_listpackages))) -- -xkio
 	$(overridden_command) --remaining-packages

-- 
kio packaging



More information about the pkg-kde-commits mailing list