[SCM] libaccounts-qt packaging branch, master, updated. 516e6f826a799103685f32b7d9d247acde19e061

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 16:15:12 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libaccounts-qt.git;a=commitdiff;h=91be10b

The following commit has been merged in the master branch:
commit 91be10bcb66d4eceafe5ba4b8e84a8b20b5b9c01
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jul 13 15:18:55 2017 +0200

    Build docs
---
 debian/control | 26 +++++++++++++-------------
 debian/rules   |  8 ++++++++
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/debian/control b/debian/control
index 503255b..aaf6499 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,20 @@ Source: libaccounts-qt
 Section: libs
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Maximiliano Curia <maxy at debian.org>,
- Diane Trout <diane at debian.org>
+Uploaders: Maximiliano Curia <maxy at debian.org>, Diane Trout <diane at debian.org>
 Build-Depends: debhelper (>= 9),
                doxygen,
-               libjs-jquery,
-               pkg-config,
+               libaccounts-glib-dev (>= 1.23),
                libglib2.0-dev,
+               libjs-jquery,
                libqt4-dev,
+               pkg-config,
                qt4-dev-tools,
-               qtchooser,
                qt4-qmake,
                qt5-qmake,
                qtbase5-dev,
-               libaccounts-glib-dev (>= 1.23)
+               qtchooser
+Build-Depends-Indep: graphviz, qttools5-dev-tools
 Standards-Version: 4.0.0
 Homepage: https://gitlab.com/accounts-sso/libaccounts-qt
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/kde-extras/libaccounts-qt.git
@@ -25,8 +25,8 @@ Package: libaccounts-qt-dev
 Section: libdevel
 Architecture: any
 Depends: libaccounts-qt1 (= ${binary:Version}),
-         ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: libaccounts-qt5-dev (<< 1.11+14.04.20140410)
 Replaces: libaccounts-qt5-dev (<< 1.11+14.04.20140410)
 Description: Accounts database access Qt version - development files
@@ -39,7 +39,7 @@ Description: Accounts database access Qt version - development files
 Package: libaccounts-qt1
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Accounts database access Qt4 version - shared library
  Accounts and SSO (Single Sign-On) framework for Linux and POSIX based
  platforms.
@@ -50,8 +50,8 @@ Package: libaccounts-qt5-dev
 Section: libdevel
 Architecture: any
 Depends: libaccounts-qt5-1 (= ${binary:Version}),
-         ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Accounts database access Qt version - Qt5 development files
  Accounts and SSO (Single Sign-On) framework for Linux and POSIX based
  platforms.
@@ -62,7 +62,7 @@ Description: Accounts database access Qt version - Qt5 development files
 Package: libaccounts-qt5-1
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Accounts database access Qt version - Qt5 shared library
  Accounts and SSO (Single Sign-On) framework for Linux and POSIX based
  platforms.
@@ -72,7 +72,7 @@ Description: Accounts database access Qt version - Qt5 shared library
 Package: libaccounts-qt-doc
 Section: doc
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Accounts database access Qt version - documentation
  Accounts and SSO (Single Sign-On) framework for Linux and POSIX based
  platforms.
diff --git a/debian/rules b/debian/rules
index cf81230..e66bd43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,10 @@ override_dh_auto_configure:
 		"QMAKE_CXXFLAGS=$(CFLAGS)" \
 		accounts-qt.pro
 
+override_dh_auto_install:
+	dh_auto_install
+	dh_auto_install -- install_documentation
+
 override_dh_install:
 	rm -f debian/tmp/usr/share/doc/accounts-qt/html/jquery.js
 	ln -s usr/share/javascript/jquery.js debian/tmp/usr/share/doc/accounts-qt/html/jquery.js
@@ -22,5 +26,9 @@ override_dh_auto_test:
 	# Disable unittests
 	:
 
+override_dh_auto_clean:
+	dh_auto_clean -- cleandocs
+	dh_auto_clean
+
 %:
 	dh $@

-- 
libaccounts-qt packaging



More information about the pkg-kde-commits mailing list