[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.5-31-gb265ece

[David Prévot]

The following commit has been merged in the master branch:
commit 87531365f0105403e1634bb82eb3efc8804720c9
Author: David Prévot <taffit at debian.org>
Date:   Sat Mar 23 21:05:54 2013 -0400

    3rdparty inclusion is actually opt-in

diff --git a/debian/rules b/debian/rules
index 3070c6b..48dd44f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,6 @@ override_dh_install:
 	# Remove redundant license files as it is already captured in debian/copyright.
 	rm debian/owncloud/usr/share/owncloud/3rdparty/Dropbox/LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/Google/LICENSE.txt
-	rm debian/owncloud/usr/share/owncloud/3rdparty/LICENSE\ INFO
 	rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/cachecore/LICENSE
 	rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/requestcore/LICENSE
 	rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/yaml/LICENSE
@@ -112,11 +111,10 @@ override_dh_install:
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor/ace-uncompressed.js -o debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor/ace.js
 	rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor/ace-uncompressed.js
 
-	# Clean up the media app so that jquery-jplayer and zenframework can be linked.
+	# Clean up the media app so that jquery-jplayer 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
-	rm -rf apps/search_lucene/3rdparty/Zend
 
 override_dh_fixperms:
 	dh_fixperms -X var/lib/owncloud

-- 
owncloud.git