[Pkg-owncloud-commits] [owncloud] 01/02: Revert "Ship embedded libjs-jquery-ui copy"

David Prévot taffit at moszumanska.debian.org
Sun May 18 21:22:10 UTC 2014


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

taffit pushed a commit to branch master
in repository owncloud.

commit d60772aabf54292e1a791450452f2cbff9d2b18b
Author: David Prévot <taffit at debian.org>
Date:   Sun May 18 17:18:21 2014 -0400

    Revert "Ship embedded libjs-jquery-ui copy"
    
    This reverts commit b9b5f17dc51eacebf640aac4de28ff84f630df0a.
    
    Conflicts:
    	debian/control
    	debian/owncloud.links
---
 debian/control | 1 +
 debian/links   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index 64919b9..b244a51 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Depends: apache2 | httpd,
          libjs-jquery-minicolors (<< 2~),
          libjs-jquery-mousewheel,
          libjs-jquery-timepicker,
+         libjs-jquery-ui,
          libjs-pdf (>= 1.0.21),
          libjs-underscore,
          libphp-phpmailer,
diff --git a/debian/links b/debian/links
index d43a4e8..4b18c68 100644
--- a/debian/links
+++ b/debian/links
@@ -16,6 +16,7 @@ usr/share/javascript/dojox		usr/share/owncloud/apps/documents/js/3rdparty/resour
 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/jquery-ui/jquery-ui.min.js			usr/share/owncloud/core/js/jquery-ui-1.10.0.custom.js
 usr/share/javascript/underscore/underscore.js			usr/share/owncloud/core/js/underscore.js
 
 # pdf.js is mostly taken from the external package

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



More information about the Pkg-owncloud-commits mailing list