[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.4+dfsg-1-7-g8c62bf1

[David Prévot]

The following commit has been merged in the master branch:
commit 147c5ca2b948cafea4aa46f116d9c2c54281f99a
Author: David Prévot <taffit at debian.org>
Date:   Sun Apr 14 23:56:38 2013 -0400

    Adapt upcoming owncloud-doc improvements

diff --git a/debian/control b/debian/control
index 77c7735..58ac320 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,8 @@ 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),
diff --git a/debian/copyright b/debian/copyright
index b8e3693..a0f94a4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -943,22 +943,20 @@ Files: apps/search_lucene/3rdparty/pdf2text.php
 Copyright: 2009, Philip Norton
 License: Expat
 
-Files: core/doc/admin/_static/*
-       core/doc/user/_static/*
+Files: core/doc/*/_static/*
 Copyright: 2007-2011, the Sphinx team
 License: BSD-2-clause
 
-Files: core/doc/admin/_static/bootstrap*
-       core/doc/user/_static/bootstrap*
+Files: core/doc/*/_static/bootstrap*
 Copyright: 2012 Twitter, Inc
 License: Apache-2.0
+Comment: Sourceless minified files stripped out of the source package
 
-Files: core/doc/admin/_static/jquery.js
-       core/doc/user/_static/jquery.js
+Files: core/doc/*/_static/jquery.js
        core/js/jquery-*.js
 Copyright: 2005-2011, John Resig, Brandon Aaron & Jörn Zaefferer
 License: Expat or GPL-2
-Comment: Expat license referred to as MIT license.
+Comment: Sourceless minified files stripped out of the source package
 
 Files: core/js/jquery-showpassword.js
 Copyright: Jan Jarfalk
diff --git a/debian/owncloud.links b/debian/owncloud.links
index b8bb123..e7404d3 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -21,3 +21,17 @@ 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/repack.sh b/debian/repack.sh
index fda8c6f..e0bf21d 100755
--- a/debian/repack.sh
+++ b/debian/repack.sh
@@ -31,10 +31,12 @@ fi
 rm -vr $UP_BASE/3rdparty/timepicker/css/include
 rm -v $UP_BASE/core/js/jquery-1.7.2.min.js
 rm -v $UP_BASE/core/js/jquery-ui-1.10.0.custom.js
-rm -v $UP_BASE/core/doc/admin/_static/jquery.js
-rm -v $UP_BASE/core/doc/user/_static/jquery.js
-rm -v $UP_BASE/core/doc/admin/_static/underscore.js
-rm -v $UP_BASE/core/doc/user/_static/underscore.js
+rm -v  $UP_BASE/core/doc/*/_static/bootstrap.css
+rm -v  $UP_BASE/core/doc/*/_static/bootstrap.js
+rm -v  $UP_BASE/core/doc/*/_static/bootstrap-responsive.css
+rm -v  $UP_BASE/core/doc/*/_static/jquery.js
+rm -v  $UP_BASE/core/doc/*/_static/underscore.js
+
 # following contain incompatible license with Debian
 rm -vr $UP_BASE/3rdparty/Console
 rm -vr $UP_BASE/3rdparty/Crypt_Blowfish

-- 
owncloud.git