[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0-104-g03dcc29

[Thomas Mueller]

The following commit has been merged in the master branch:
commit 03dcc296ce1dc4bb3c2de8215c7dbe0e285d268d
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Tue May 22 16:05:24 2012 +0200

    fixing files_odfviewer and broken images

diff --git a/debian/changelog b/debian/changelog
index b12124c..989dfb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ owncloud (4.0.0-1) UNRELEASED; urgency=low
   * debian/postrm: remove /etc/owncloud/config.php.
   * debian/rules: remove fullcalendar.min.js & jquery.Jcrop.min.js; they
     are not used.
+  * debian/patches:04_fix_odfviewer.diff added
 
   [ Paul van Tilburg ]
   * debian/control:
diff --git a/debian/patches/04_fix_odfviewer.diff b/debian/patches/04_fix_odfviewer.diff
new file mode 100644
index 0000000..16d74d6
--- /dev/null
+++ b/debian/patches/04_fix_odfviewer.diff
@@ -0,0 +1,15 @@
+Description: patch to remove closing php tag
+  This closing php tag causes multiple issues - e.g. thumbnail are not loaded.
+  This patch was taken from upstream.
+Author: Thomas Mueller <thomas.mueller at tmit.eu>
+Origin: upstream, https://gitorious.org/owncloud/apps/commit/07d7f438ca1da5d8488618bb26c57287360abc32c
+Forwarded: not-needed
+
+--- a/apps/files_odfviewer/appinfo/app.php
++++ b/apps/files_odfviewer/appinfo/app.php
+@@ -3,5 +3,3 @@
+ OCP\Util::addStyle( 'files_odfviewer', 'odfviewer' );
+ OCP\Util::addScript('files_odfviewer', 'viewer' );
+ OCP\Util::addScript('files_odfviewer', 'webodf');
+-?>
+-
diff --git a/debian/patches/series b/debian/patches/series
index ed0dbed..688fdcd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_fix_data_path.diff
 02_fix_crypt.diff
 03_fix_phpmailer.diff
+04_fix_odfviewer.diff

-- 
owncloud.git