[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/3.0.3-30-g657996b

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 657996b85298781688e106dbaa64bcae7ce707f0
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Wed May 9 20:23:00 2012 +0200

    Add links and a depend for the jQuery jPlayer plugin

diff --git a/debian/TODO b/debian/TODO
index e4b54f3..1ffe815 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,5 +1,4 @@
 * dbconfig integration
-* bring the media app back using a depend on libjs-jquery-jplayer
 * get non-minified version for:
   - apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
   - apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
diff --git a/debian/changelog b/debian/changelog
index 22e4b40..8c144f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,13 +7,16 @@ owncloud (3.0.3-1) unstable; urgency=low
 
   [ Paul van Tilburg ]
   * debian/TODO: moved TODO items to this file.
+  * debian/control: add a depend on libjs-jquery-jplayer.
   * debian/copyright:
     - Fixed syntax errors.
     - Added more paragraphs for some upstream files.
+  * debian/links:
+    - Added links for the files in libjs-jquery-jplayer.
   * debian/rules:
-    * Made /var/lib/owncloud/data setgid so that the special permissions
+    - Made /var/lib/owncloud/data setgid so that the special permissions
       are preserved
-    * Fixed an issue that made all directories under
+    - Fixed an issue that made all directories under
       /usr/share/owncloud/apps not accessible.
 
  -- Paul van Tilburg <paulvt at debian.org>  Thu, 03 May 2012 12:21:29 +0200
diff --git a/debian/owncloud.links b/debian/owncloud.links
index 65159c4..5f8ea98 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -15,4 +15,7 @@ etc/owncloud var/lib/owncloud/config
 etc/owncloud/htaccess var/lib/owncloud/.htaccess
 
 usr/share/javascript/jquery/jquery.min.js usr/share/owncloud/core/js/jquery-1.6.4.min.js
+usr/share/javascript/jquery-jplayer/Jplayer.swf usr/share/owncloud/apps/media/js/Jplayer.swf
+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.8.16.custom.min.js
diff --git a/debian/rules b/debian/rules
index 5d076c5..11abb31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,10 +47,10 @@ override_dh_install:
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.js -o debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.min.js
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.js -o debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.min.js
 
-	# Kill the media app due to swf issue:  source code is available
-	# upstream, but we cannot compile Action Script 3 without depending
-	# on non-free tools.
-	rm -rf debian/owncloud/usr/share/owncloud/apps/media
+	# Clean up the media app so that jquery-jplayer can be linked.
+	rm -rf debian/owncloud/usr/share/owncloud/apps/media/js/jQuery.jPlayer.2.1.0.source
+	rm debian/owncloud/usr/share/owncloud/apps/media/js/Jplayer.swf
+	rm debian/owncloud/usr/share/owncloud/apps/media/js/jquery.jplayer.min.js
 
 override_dh_fixperms:
 	dh_fixperms -X var/lib/owncloud

-- 
owncloud.git