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

[David Prévot]

The following commit has been merged in the master branch:
commit d98febee3eade224581633847ac32235a2d418f3
Author: David Prévot <taffit at debian.org>
Date:   Thu Mar 21 18:00:40 2013 -0400

    Recommend zendframework instead of embedding a partial copy

diff --git a/debian/changelog b/debian/changelog
index b1b1875..67bd3f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ owncloud (5.0.0+debian-1) UNRELEASED; urgency=low
   * debian/control:
     - Add php-services-json and liboauth-php to Recommends for Dropbox-php
     - Add clamav or clamav-daemon to Recommends for Owncloud Antivirus App
+    - Add zendframework to Recommends for Full Text Search
   * debian/{copyright,rules}: Document the new and updated licenses, and trim
     duplicated and useless files from the package.
   * debian/repack.sh:
@@ -14,6 +15,8 @@ owncloud (5.0.0+debian-1) UNRELEASED; urgency=low
     - Remove incompatible PDF from pdfjs
   * debian/patches/04_add_onfontresize.diff: Add missing jquery.onfontresize
     source
+  * debian/owncloud.links: Link to Zend Framework instead of embedding a
+    partial copy
 
  -- Paul van Tilburg <paulvt at debian.org>  Fri, 02 Nov 2012 22:20:35 +0100
 
diff --git a/debian/control b/debian/control
index d5c6739..8ffbf00 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,8 @@ Depends: ${misc:Depends},
  libjs-jquery (>= 1.7.2-1), libjs-jquery-ui, libjs-jquery-jplayer
 Recommends: exim4 | mail-transport-agent,
  php-services-json, liboauth-php,
- clamav | clamav-daemon
+ clamav | clamav-daemon,
+ zendframework
 Description: cloud storage for files, music, contacts, calendars and many more
  ownCloud gives you universal access to your files through a web interface
  or WebDAV.  It also provides a platform to easily view & sync your
diff --git a/debian/owncloud.links b/debian/owncloud.links
index 83ff0f0..29077d5 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -13,3 +13,4 @@ usr/share/javascript/jquery-jplayer/Jplayer.swf usr/share/owncloud/apps/media/js
 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
+usr/share/php/Zend usr/share/owncloud/apps/search_lucene/3rdparty/Zend
diff --git a/debian/rules b/debian/rules
index 18ece54..782645c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,10 +86,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 can be linked.
+	# Clean up the media app so that jquery-jplayer and zenframework 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
+	rm -rf apps/search_lucene/3rdparty/Zend
 
 override_dh_fixperms:
 	dh_fixperms -X var/lib/owncloud

-- 
owncloud.git