[Pkg-owncloud-commits] [owncloud] 01/02: Adapt to aws-sdk new path

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit d3132ed602ba3db4c32ba4f40a89f1bab7f3ecda
Author: David Prévot <taffit at debian.org>
Date:   Thu Jan 2 16:11:01 2014 -0400

    Adapt to aws-sdk new path
---
 debian/control                                    |  2 +-
 debian/patches/path/0011-Adapt-aws-sdk-path.patch | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index c200901..dc84698 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,7 @@ Recommends: curl,
             libav-tools,
             liboauth-php,
             libreoffice,
-            php-aws-sdk (>= 2.4),
+            php-aws-sdk (>= 2.5.0-2~),
             php-crypt-blowfish,
             php-dropbox,
             php-google-api-php-client,
diff --git a/debian/patches/path/0011-Adapt-aws-sdk-path.patch b/debian/patches/path/0011-Adapt-aws-sdk-path.patch
index 69d3af7..a7b9f88 100644
--- a/debian/patches/path/0011-Adapt-aws-sdk-path.patch
+++ b/debian/patches/path/0011-Adapt-aws-sdk-path.patch
@@ -6,22 +6,25 @@ The Debian package depends on the needed classes instead of embedding
 them, i.e. php-aws-sdk.
 
 Forwarded: not-needed
-Last-Update: 2013-10-14
+Last-Update: 2014-01-02
+
+Gbp: Topic path
 ---
- apps/files_external/lib/amazons3.php | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
+ apps/files_external/lib/amazons3.php | 4 ----
+ 1 file changed, 4 deletions(-)
 
 diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
-index 00baacd..c9e8da8 100644
+index 00baacd..bff4472 100644
 --- a/apps/files_external/lib/amazons3.php
 +++ b/apps/files_external/lib/amazons3.php
-@@ -25,8 +25,7 @@
+@@ -24,10 +24,6 @@
+ 
  namespace OC\Files\Storage;
  
- set_include_path(get_include_path() . PATH_SEPARATOR .
+-set_include_path(get_include_path() . PATH_SEPARATOR .
 -        \OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
 -require 'aws-autoloader.php';
-+	'/usr/share/php/AWSSDKforPHP');
- 
+-
  use Aws\S3\S3Client;
  use Aws\S3\Exception\S3Exception;
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git