[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.6-41-g917e329

[David Prévot]

The following commit has been merged in the master branch:
commit dd2cae5e767c1119157bee11d42c1d99fe6b8cb4
Author: David Prévot <taffit at debian.org>
Date:   Sun Mar 24 13:29:51 2013 -0400

    Depend on libjs-underscore

diff --git a/debian/changelog b/debian/changelog
index ae8c97f..a1ea86d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ owncloud (5.0.0+dfsg-1) UNRELEASED; urgency=low
     - Add clamav or clamav-daemon to Recommends for Owncloud Antivirus App
     - Add zendframework to Recommends for Full Text Search
     - Add mediawiki to Depends, instead of shipping duplicated code
+    - Add libjs-underscore to Depends, instead of shipping duplicated code
   * debian/copyright: Document the new and updated licenses
   * debian/rules:
     - Trim duplicated and useless files from the package
@@ -16,6 +17,7 @@ owncloud (5.0.0+dfsg-1) UNRELEASED; urgency=low
   * debian/repack.sh:
     - Remove incompatible docs from Font Awesome
     - Remove incompatible PDF from pdfjs
+    - Remove sourceless JavaScript
     - Adapt to updated JQuery UI version
   * debian/patches/:
     - Refresh existing patches
@@ -25,6 +27,7 @@ owncloud (5.0.0+dfsg-1) UNRELEASED; urgency=low
   * debian/owncloud.links:
     - Link to Zend Framework instead of embedding a partial copy
     - Adapt to updated JQuery UI version
+    - Adapt to libjs-underscore
   * debian/owncloud.install: Update 3dparty list
 
  -- Paul van Tilburg <paulvt at debian.org>  Fri, 02 Nov 2012 22:20:35 +0100
diff --git a/debian/control b/debian/control
index 31c1b01..f219139 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Depends: ${misc:Depends},
  php5-curl,
  owncloud-mysql (= ${source:Version}) | owncloud-sqlite (= ${source:Version}),
  libjs-jquery (>= 1.7.2-1), libjs-jquery-ui, libjs-jquery-jplayer,
+ libjs-underscore,
  mediawiki
 Recommends: exim4 | mail-transport-agent,
  php-services-json, liboauth-php,
diff --git a/debian/owncloud.links b/debian/owncloud.links
index 6e7ae18..72ac998 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -13,4 +13,8 @@ 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/core/doc/user/_static/underscore.js
 usr/share/php/Zend usr/share/owncloud/apps/search_lucene/3rdparty/Zend
diff --git a/debian/repack.sh b/debian/repack.sh
index 0543699..be172f3 100755
--- a/debian/repack.sh
+++ b/debian/repack.sh
@@ -31,6 +31,10 @@ fi
 rm -vfr $UP_BASE/3rdparty/timepicker/css/include
 rm -vfr $UP_BASE/core/js/jquery-1.7.2.min.js
 rm -vfr $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
 # following contain incompatible license with Debian
 rm -vfr $UP_BASE/3rdparty/Console
 rm -vfr $UP_BASE/3rdparty/Crypt_Blowfish

-- 
owncloud.git