[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.5_rc1+dfsg-1-5-gee32112

[David Prévot]

The following commit has been merged in the master branch:
commit 409d10f3aaa877742799120a4e03b500f7b2229e
Author: David Prévot <taffit at debian.org>
Date:   Sun May 5 21:30:17 2013 -0400

    Depend on owncloud-doc

diff --git a/debian/control b/debian/control
index e38ae03..b9b21da 100644
--- a/debian/control
+++ b/debian/control
@@ -17,11 +17,9 @@ Depends: apache2 | httpd,
          libjs-jquery (>= 1.7.2-1),
          libjs-jquery-jplayer,
          libjs-jquery-ui,
-         libjs-sphinxdoc,
-         libjs-twitter-bootstrap,
-         libjs-underscore,
          libphp-phpmailer,
          mediawiki (>= 1:1.19),
+         owncloud-doc,
          owncloud-mysql (= ${source:Version}) | owncloud-sqlite (= ${source:Version}),
          php-crypt-blowfish,
          php-getid3 (>= 1.9.3-1),
diff --git a/debian/owncloud.links b/debian/owncloud.links
index e7404d3..e835fe2 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -13,25 +13,7 @@ usr/share/javascript/jquery-jplayer/Jplayer.swf usr/share/owncloud/apps/media/js
 usr/share/javascript/jquery-jplayer/jquery.jplayer.min.js usr/share/owncloud/apps/media/js/jquery.jplayer.min.js
 usr/share/javascript/jquery-jplayer/add-on usr/share/owncloud/apps/media/js/add-on
 usr/share/javascript/jquery-ui/jquery-ui.min.js	usr/share/owncloud/core/js/jquery-ui-1.10.0.custom.js
-usr/share/javascript/jquery/jquery.min.js	usr/share/owncloud/core/doc/admin/_static/jquery.js
-usr/share/javascript/underscore/underscore.js	usr/share/owncloud/core/doc/admin/_static/underscore.js
-usr/share/javascript/jquery/jquery.min.js	usr/share/owncloud/core/doc/user/_static/jquery.js
-usr/share/javascript/underscore/underscore.js	usr/share/owncloud/core/doc/user/_static/underscore.js
 usr/share/php/Zend usr/share/owncloud/apps/search_lucene/3rdparty/Zend
 
 # Use local cacert instead of embedded one
 etc/ssl/certs/ca-certificates.crt	/usr/share/owncloud/3rdparty/aws-sdk/lib/requestcore/cacert.pem
-
-# Will soon be handled in owncloud-doc
-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
-usr/share/twitter-bootstrap/files/css/bootstrap-responsive.min.css      usr/share/owncloud/core/doc/user/_static/bootstrap-responsive.css
-
-usr/share/twitter-bootstrap/files/js/bootstrap.min.js                   usr/share/owncloud/core/doc/admin/_static/bootstrap.js
-usr/share/twitter-bootstrap/files/js/bootstrap.min.js                   usr/share/owncloud/core/doc/user/_static/bootstrap.js
diff --git a/debian/rules b/debian/rules
index 01865e3..bf8b318 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,6 +101,9 @@ override_dh_install:
 	# Remove the Updater app since upgrade must be made via the package
 	rm -r debian/owncloud/usr/share/owncloud/apps/updater
 
+	# Remove the doc, shipped in owncloud-doc
+	rm -r debian/owncloud/usr/share/owncloud/core/doc
+
 	# Fix displayed version
 	sed -i "s/@VERSION@/$(VERSION) (Debian)/" \
 		debian/owncloud/usr/share/owncloud/settings/templates/admin.php \

-- 
owncloud.git