[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.6-41-g917e329

[David Prévot]

The following commit has been merged in the master branch:
commit a196a4826c550c0d84ac0e8a8622ce6a188059f6
Author: David Prévot <taffit at debian.org>
Date:   Sun Mar 24 12:11:02 2013 -0400

    Fix build errors (typos and so on)

diff --git a/debian/rules b/debian/rules
index 74af1af..d072b5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ override_dh_install:
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/_docs
 	rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/cachecore/README
 	rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/cachecore/_sql/README
-	rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/requestcore/README
+	rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/requestcore/README.md
 	rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/yaml/README.markdown
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fontawesome/README.md
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/README.md
@@ -49,7 +49,7 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/apps/files_antivirus/README.md
 	rm debian/owncloud/usr/share/owncloud/apps/updater/README
 	# TODO: build owncloud/core/doc, or drop it
-	rm debian/owncloud/usr/share/owncloud/core/doc/*/_sources
+	rm -r debian/owncloud/usr/share/owncloud/core/doc/*/_sources
 	rm debian/owncloud/usr/share/owncloud/core/img/filetypes/readme*.txt
 	rm debian/owncloud/usr/share/owncloud/core/js/oc-vcategories.txt
 	rm -r debian/owncloud/usr/share/owncloud/apps/user_ldap/tests
@@ -75,13 +75,12 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
 	rm debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/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.infieldlabel.min.js
 
 	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
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.js
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.proto.js -o debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.proto.min.js
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.proto.js
-	yui-compressor --type js debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.js -o fullcalendar/js/fullcalendar.min.js
+	yui-compressor --type js debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.js -o debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.min.js
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.js
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/3rdparty/miniColors/js/jquery.miniColors.js -o debian/owncloud/usr/share/owncloud/3rdparty/miniColors/js/jquery.miniColors.min.js
 	rm debian/owncloud/usr/share/owncloud/3rdparty/miniColors/js/jquery.miniColors.js
@@ -100,8 +99,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf-debug.js
 	yui-compressor --type js apps/files_videoviewer/js/mediaelement-and-player.js -o debian/owncloud/usr/share/owncloud/apps/files_videoviewer/js/mediaelement-and-player.min.js
 	rm apps/files_videoviewer/js/mediaelement-and-player.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
-	rm debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.js
 
 	# Move the MDB2 Sqlite driver to owncloud-sqlite.
 	mv debian/owncloud/usr/share/owncloud/lib/MDB2 debian/owncloud-sqlite/usr/share/php # php-mdb2-driver-sqlite (not yet)
@@ -111,10 +108,11 @@ 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 be linked.
-	rm -rf debian/owncloud/usr/share/owncloud/apps/media/js/jQuery.jPlayer.2.1.0.source
+	# Clean up the media app so that jquery-jplayer and zenframework be linked.
+	rm -r 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 -r debian/owncloud/usr/share/owncloud/apps/search_lucene/3rdparty/Zend
 
 override_dh_fixperms:
 	dh_fixperms -X var/lib/owncloud

-- 
owncloud.git