[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.6_rc2+dfsg-1-4-g29d78a8

Tue May 14 15:07:29 UTC 2013

The following commit has been merged in the master branch:
commit b73e8c7b6dc549320baafe6aef99fdb1a7eaf537
Author: David Prévot <taffit at debian.org>
Date:   Tue May 14 10:56:07 2013 -0400

    Revert "Fix upgrade to 5.0.6 RC2"
    
    This reverts commit 568c223e9e2dcdd8e13c05022d768bc0351fbbae.

diff --git a/debian/patches/fix_3321.diff b/debian/patches/fix_3321.diff
deleted file mode 100644
index 9094fca..0000000
--- a/debian/patches/fix_3321.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix failing upgrade to 5.0.6 RC2
-Author: Lukas Reschke <lukas at statuscode.ch>
-Bug: https://github.com/owncloud/core/pull/3326
-Applied-Upstream: https://github.com/owncloud/core/commit/f2911e76bcbb88e1da5caa2ee4cebd2d78725999
-Reviewed-by: David Prévot <taffit at debian.org>
-Last-Update: 2013-05-13
---- a/core/templates/layout.guest.php
-+++ b/core/templates/layout.guest.php
-@@ -5,7 +5,7 @@
- <!--[if IE 9]><html class="ng-csp ie ie9 lte9"><![endif]-->
- <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
- <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
--	<head>
-+	<head data-requesttoken="<?php p($_['requesttoken']); ?>">
- 		<title>ownCloud</title>
- 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- 		<meta name="apple-itunes-app" content="app-id=543672169">
diff --git a/debian/patches/series b/debian/patches/series
index b4d70b4..7b3c532 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ fix_mediawiki.diff
 fix_upgrade.diff
 fix_displayed_version.diff
 fix_aws-sdk.diff
-fix_3321.diff

-- 
owncloud.git

