[Pkg-owncloud-commits] [owncloud] 01/01: Depend on libjs-mediaelement instead of the embeded library

David Prévot taffit at moszumanska.debian.org
Tue Sep 2 23:04:24 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 30c546dd29ee1b51e9fe835ccd4aebfcb2df9fde
Author: David Prévot <taffit at debian.org>
Date:   Tue Sep 2 18:01:28 2014 -0400

    Depend on libjs-mediaelement instead of the embeded library
---
 debian/control                                     |  1 +
 debian/copyright                                   |  1 -
 debian/links                                       | 11 +++++++++
 debian/lintian-overrides                           |  8 +++++++
 ...010-Disable-Flash-and-Silverlight-plugins.patch | 27 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       |  6 +----
 7 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/debian/control b/debian/control
index 2d224a4..1b48c36 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Depends: apache2 | httpd,
          libjs-jquery-minicolors (<< 2~),
          libjs-jquery-mousewheel,
          libjs-jquery-timepicker,
+         libjs-mediaelement,
          libjs-pdf,
          libphp-phpmailer,
          owncloud-doc,
diff --git a/debian/copyright b/debian/copyright
index b7ef9ce..ee39d0f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -432,7 +432,6 @@ Copyright: 2009-2011, RStudio, Inc.
 License: AGPL-3+
 
 Files: apps/files_videoviewer/js/*
-       apps/files_videoviewer/mediaelement/*
        apps/files_videoviewer/src/*
 Copyright: 2010-2014, John Dyer (http://j.hn)
            2011, Dustin Diaz
diff --git a/debian/links b/debian/links
index 218ca3d..373f1ac 100644
--- a/debian/links
+++ b/debian/links
@@ -63,5 +63,16 @@ usr/share/javascript/jquery-timepicker/jquery-ui-timepicker-addon.css	usr/share/
 usr/share/javascript/jquery-timepicker/jquery-ui-timepicker-addon.js	usr/share/owncloud/3rdparty/timepicker/js/jquery.ui.timepicker.js
 usr/share/javascript/jquery-timepicker/localization			usr/share/owncloud/3rdparty/timepicker/js/localization
 
+# Use MediaElement from libjs-mediaelement
+usr/share/javascript/mediaelement/mediaelementplayer.css		usr/share/owncloud/apps/files_videoviewer/css/mediaelementplayer.css
+usr/share/javascript/mediaelement/background.png			usr/share/owncloud/apps/files_videoviewer/css/background.png
+usr/share/javascript/mediaelement/bigplay.png				usr/share/owncloud/apps/files_videoviewer/css/bigplay.png
+usr/share/javascript/mediaelement/bigplay.svg				usr/share/owncloud/apps/files_videoviewer/css/bigplay.svg
+usr/share/javascript/mediaelement/controls.png				usr/share/owncloud/apps/files_videoviewer/css/controls.png
+usr/share/javascript/mediaelement/controls.svg				usr/share/owncloud/apps/files_videoviewer/css/controls.svg
+usr/share/javascript/mediaelement/loading.gif				usr/share/owncloud/apps/files_videoviewer/css/loading.gif
+usr/share/javascript/mediaelement/mediaelement-and-player.js		usr/share/owncloud/apps/files_videoviewer/js/mediaelement-and-player.js
+usr/share/javascript/mediaelement/mediaelement-and-player.min.js	usr/share/owncloud/apps/files_videoviewer/js/mediaelement-and-player.min.js
+
 # Use the PDF from owncloud-doc
 usr/share/owncloud/core/doc/user/ownCloudUserManual.pdf			usr/share/owncloud/core/skeleton/ownCloudUserManual.pdf
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 1b47691..1341a64 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -29,3 +29,11 @@ package-contains-broken-symlink usr/share/owncloud/apps/files_pdfviewer/3rdparty
 package-contains-broken-symlink usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/viewer.orig.css ../../../../../javascript/pdf/web/viewer.css
 # This symlink points to a file provided by owncloud-doc, which is a dependency.
 package-contains-broken-symlink usr/share/owncloud/core/skeleton/ownCloudUserManual.pdf ../doc/user/ownCloudUserManual.pdf
+# These symlinks point to files provided by libjs-mediaelement, which is a dependency.
+package-contains-broken-symlink usr/share/owncloud/apps/files_videoviewer/css/background.png ../../../../javascript/mediaelement/background.png
+package-contains-broken-symlink usr/share/owncloud/apps/files_videoviewer/css/bigplay.png ../../../../javascript/mediaelement/bigplay.png
+package-contains-broken-symlink usr/share/owncloud/apps/files_videoviewer/css/bigplay.svg ../../../../javascript/mediaelement/bigplay.svg
+package-contains-broken-symlink usr/share/owncloud/apps/files_videoviewer/css/controls.png ../../../../javascript/mediaelement/controls.png
+package-contains-broken-symlink usr/share/owncloud/apps/files_videoviewer/css/controls.svg ../../../../javascript/mediaelement/controls.svg
+package-contains-broken-symlink usr/share/owncloud/apps/files_videoviewer/css/loading.gif ../../../../javascript/mediaelement/loading.gif
+package-contains-broken-symlink usr/share/owncloud/apps/files_videoviewer/css/mediaelementplayer.css ../../../../javascript/mediaelement/mediaelementplayer.css
diff --git a/debian/patches/0010-Disable-Flash-and-Silverlight-plugins.patch b/debian/patches/0010-Disable-Flash-and-Silverlight-plugins.patch
deleted file mode 100644
index 9bd0c13..0000000
--- a/debian/patches/0010-Disable-Flash-and-Silverlight-plugins.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Thu, 2 Jan 2014 16:36:58 -0400
-Subject: Disable Flash and Silverlight plugins
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-We’re not yet building those binaries from source.
-
-Forwarded: not-needed
----
- apps/files_videoviewer/js/mediaelement-and-player.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/apps/files_videoviewer/js/mediaelement-and-player.js b/apps/files_videoviewer/js/mediaelement-and-player.js
-index 7b52c33..ee4778f 100644
---- a/apps/files_videoviewer/js/mediaelement-and-player.js
-+++ b/apps/files_videoviewer/js/mediaelement-and-player.js
-@@ -859,7 +859,7 @@ mejs.MediaElementDefaults = {
- 	// none: forces fallback view
- 	mode: 'auto',
- 	// remove or reorder to change plugin priority and availability
--	plugins: ['flash','silverlight','youtube','vimeo'],
-+	plugins: ['youtube','vimeo'],
- 	// shows debug errors on screen
- 	enablePluginDebug: false,
- 	// use plugin for browsers that have trouble with Basic Authentication on HTTPS sites
diff --git a/debian/patches/series b/debian/patches/series
index 15e8dcf..230b514 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@ path/0006-Adapt-Crypt_Blowfish-path.patch
 path/0007-Adapt-aws-sdk-path.patch
 path/0008-Adapt-google-api-php-client-path.patch
 path/0009-Adapt-Dropbox-path.patch
-0010-Disable-Flash-and-Silverlight-plugins.patch
diff --git a/debian/rules b/debian/rules
index d8400cc..802cbbc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ override_dh_install:
 		-XChangelog -Xcomposer.json -XCOPYING \
 		-Xdocuments/src \
 		-Xfiles_videoviewer/src -Xfonts/index.html \
-		-Xignorelist -Ximage-optimization.sh \
+		-Xignorelist -Ximage-optimization.sh -Ximg/skin \
 		-Xjquery.inview.txt \
 		-Xl10n.pl -XLICENSE -XLicense.txt \
 		-Xphpass/c -Xphpass/test.php \
@@ -31,7 +31,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/webodf/dojo-amalgamation.js
 	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
 
@@ -65,9 +64,6 @@ override_dh_install:
 		debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/webodf/webodf.js \
 		debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/webodf/webodf-debug.js
 	uglifyjs -o \
-		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 \

-- 
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