[Pkg-owncloud-commits] [SCM] Debian packaging of owncloud-doc branch, master, updated. debian/0_20130531-1-1-gdc98c7b

[David Prévot]

The following commit has been merged in the master branch:
commit dc98c7b3f45c9e772cb7653e50db2de85a644fa6
Author: David Prévot <taffit at debian.org>
Date:   Sat Jun 15 15:03:39 2013 -0400

    Build --with sphinxdoc

diff --git a/debian/control b/debian/control
index a3e4ee3..d0420de 100644
--- a/debian/control
+++ b/debian/control
@@ -14,11 +14,9 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/owncloud-doc.git
 
 Package: owncloud-doc
 Architecture: all
-Depends: libjs-jquery,
-         libjs-sphinxdoc,
-         libjs-twitter-bootstrap,
-         libjs-underscore,
-         ${misc:Depends}
+Depends: libjs-twitter-bootstrap,
+         ${misc:Depends},
+         ${sphinxdoc:Depends}
 Replaces: owncloud (<< 5.0.5)
 Breaks: owncloud (<< 5.0.5)
 Description: documentation for ownCloud
diff --git a/debian/links b/debian/links
index ddbdba9..2e3aebe 100644
--- a/debian/links
+++ b/debian/links
@@ -1,13 +1,3 @@
-usr/share/javascript/jquery/jquery.min.js				usr/share/owncloud/core/doc/admin/_static/jquery.js
-usr/share/javascript/jquery/jquery.min.js				usr/share/owncloud/core/doc/user/_static/jquery.js
-usr/share/javascript/underscore/underscore.min.js			usr/share/owncloud/core/doc/admin/_static/underscore.js
-usr/share/javascript/underscore/underscore.min.js			usr/share/owncloud/core/doc/user/_static/underscore.js
-
-usr/share/javascript/sphinxdoc/1.0/doctools.js				usr/share/owncloud/core/doc/admin/_static/doctools.js
-usr/share/javascript/sphinxdoc/1.0/doctools.js				usr/share/owncloud/core/doc/user/_static/doctools.js
-usr/share/javascript/sphinxdoc/1.0/searchtools.js			usr/share/owncloud/core/doc/admin/_static/searchtools.js
-usr/share/javascript/sphinxdoc/1.0/searchtools.js			usr/share/owncloud/core/doc/user/_static/searchtools.js
-
 usr/share/twitter-bootstrap/files/css/bootstrap.min.css			usr/share/owncloud/core/doc/admin/_static/bootstrap.css
 usr/share/twitter-bootstrap/files/css/bootstrap.min.css			usr/share/owncloud/core/doc/user/_static/bootstrap.css
 usr/share/twitter-bootstrap/files/css/bootstrap-responsive.min.css	usr/share/owncloud/core/doc/admin/_static/bootstrap-responsive.css
diff --git a/debian/rules b/debian/rules
index 779ffa1..198eac8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 %:
-	dh $@
+	dh $@ --with sphinxdoc
 
 override_dh_auto_build:
 	cd admin_manual	&& make html-release
@@ -9,3 +9,6 @@ override_dh_auto_build:
 override_dh_auto_clean:
 	cd admin_manual	&& make clean
 	cd user_manual	&& make clean
+
+override_dh_sphinxdoc:
+	dh_sphinxdoc --exclude=bootstrap.js usr/share/owncloud/core/doc/user usr/share/owncloud/core/doc/admin

-- 
Debian packaging of owncloud-doc