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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit c499b2b2604bd0016e6ec0047885dd35f33c1980
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jul 13 16:46:51 2017 +0200

    Build docs on arch:all build
---
 debian/control |  3 +--
 debian/rules   | 11 +++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 077e430..6dc22be 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ 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>
 Build-Depends: debhelper (>= 9),
-               doxygen,
                libaccounts-glib-dev (>= 1.23),
                libglib2.0-dev,
                libjs-jquery,
@@ -13,7 +12,7 @@ Build-Depends: debhelper (>= 9),
                qt5-qmake,
                qtbase5-dev,
                qtchooser
-Build-Depends-Indep: graphviz, qttools5-dev-tools
+Build-Depends-Indep: doxygen, 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
diff --git a/debian/rules b/debian/rules
index e66bd43..010a0fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,13 +11,16 @@ override_dh_auto_configure:
 		"QMAKE_CXXFLAGS=$(CFLAGS)" \
 		accounts-qt.pro
 
+ddoverride_dh_auto_build-indep:
+	dh_auto_build -i -- docs
+
 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
+	-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
 	rm -f debian/tmp/usr/share/libaccounts-qt-tests/*
 	rm -f debian/tmp/usr/bin/*
 	dh_install --fail-missing
@@ -27,7 +30,7 @@ override_dh_auto_test:
 	:
 
 override_dh_auto_clean:
-	dh_auto_clean -- cleandocs
+	-dh_auto_clean -- cleandocs
 	dh_auto_clean
 
 %:

-- 
libaccounts-qt packaging