[Pkg-owncloud-commits] [owncloud] 01/01: Use embedded jQuery instead of the packaged one

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit dd653bf5a63a1466e62851e36c6f87bc40996f06
Author: David Prévot <taffit at debian.org>
Date:   Tue Jul 8 21:30:08 2014 -0400

    Use embedded jQuery instead of the packaged one
    
    Contacts needs a more recent version than the packaged one.
    
    Closes: #750772
    Git-Dch: Full
---
 debian/control | 1 -
 debian/links   | 1 -
 debian/rules   | 4 ++++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 4500206..01cbfea 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,6 @@ Depends: apache2 | httpd,
          libjs-chosen,
          libjs-dojo-dojox,
          libjs-jcrop,
-         libjs-jquery (>= 1.7.2-1),
          libjs-jquery-minicolors (<< 2~),
          libjs-jquery-mousewheel,
          libjs-jquery-timepicker,
diff --git a/debian/links b/debian/links
index 9651282..98c13e8 100644
--- a/debian/links
+++ b/debian/links
@@ -15,7 +15,6 @@ usr/share/javascript/dijit		usr/share/owncloud/apps/documents/js/3rdparty/resour
 usr/share/javascript/dojo		usr/share/owncloud/apps/documents/js/3rdparty/resources/dojo
 usr/share/javascript/dojox		usr/share/owncloud/apps/documents/js/3rdparty/resources/dojox
 usr/share/javascript/jcrop		usr/share/owncloud/3rdparty/Jcrop
-usr/share/javascript/jquery/jquery.min.js			usr/share/owncloud/core/js/jquery-1.10.0.min.js
 usr/share/javascript/jquery-mousewheel/jquery.mousewheel.js	usr/share/owncloud/apps/gallery/js/jquery.mousewheel-3.1.1.js
 usr/share/javascript/underscore/underscore.js			usr/share/owncloud/core/js/underscore.js
 
diff --git a/debian/rules b/debian/rules
index 05acb8c..7337511 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,6 +56,7 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/webodf/editor/nls/dojobundle.js
 	rm debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/webodf/webodf.js
 	rm debian/owncloud/usr/share/owncloud/apps/files_videoviewer/js/mediaelement-and-player.min.js
+	rm debian/owncloud/usr/share/owncloud/core/js/jquery-1.10.0.min.js
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery-migrate-1.2.1.min.js
 
 	uglifyjs -o \
@@ -91,6 +92,9 @@ override_dh_install:
 		debian/owncloud/usr/share/owncloud/apps/files_videoviewer/js/mediaelement-and-player.min.js \
 		debian/owncloud/usr/share/owncloud/apps/files_videoviewer/js/mediaelement-and-player.js
 	uglifyjs -o \
+		debian/owncloud/usr/share/owncloud/core/js/jquery-1.10.0.min.js \
+		debian/owncloud/usr/share/owncloud/core/js/jquery-1.10.0.js
+	uglifyjs -o \
 		debian/owncloud/usr/share/owncloud/core/js/jquery-migrate-1.2.1.min.js \
 		debian/owncloud/usr/share/owncloud/core/js/jquery-migrate-1.2.1.js
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git