[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.8+dfsg-2-12-g8622459

[David Prévot]

The following commit has been merged in the master branch:
commit 206472583434cb9a95d1fb84c18236fd8a02c6c8
Author: David Prévot <taffit at debian.org>
Date:   Mon Jul 15 22:08:58 2013 -0400

    Revert "Make gallery app work under php 5.4"
    
    This reverts commit f4053e6c98ca2598a79ceddf2f5f52ad25692abb.

diff --git a/debian/patches/fix_gallery_php55.diff b/debian/patches/fix_gallery_php55.diff
deleted file mode 100644
index 9b16daf..0000000
--- a/debian/patches/fix_gallery_php55.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Replace shorttag
- Make gallery app work under php 5.4.
-Author: Victor Dubiniuk <victor.dubiniuk at gmail.com>
-Origin: upstream, https://github.com/owncloud/apps/commit/a81e840dd0de5af016065e58ec51a27edfbfa171
-Bug: https://github.com/owncloud/core/issues/4012
-Reviewed-by: David Prévot <taffit at debian.org>
-Last-Update: 2013-07-14
---- a/apps/gallery/templates/index.php
-+++ b/apps/gallery/templates/index.php
-@@ -6,7 +6,7 @@
- 		<a class="share" data-item-type="gallery" data-item="" title="<?php p($l->t("Share")); ?>"
- 		   data-possible-permissions="31"></a>
- 	</span>
--	<? endif; ?>
-+	<?php endif; ?>
- </div>
- <div id='gallery' class="hascontrols"></div>
- <div id='slideshow'>
diff --git a/debian/patches/series b/debian/patches/series
index 2d66bb5..8fd3802 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@ fix_displayed_version.diff
 fix_aws-sdk.diff
 fix_crypt_blowfish.diff
 fix_log_path.diff
-fix_gallery_php55.diff

-- 
owncloud.git