[Pkg-owncloud-commits] [owncloud] 01/01: Fix path in last patches

[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 de774b1a80a539827ab7fb539894a1525867bdc3
Author: David Prévot <taffit at debian.org>
Date:   Tue Sep 24 21:41:31 2013 -0400

    Fix path in last patches
    
    https://github.com/owncloud/core/issues/4952
---
 debian/patches/fix_google-api-php-client.diff |   15 +++++++--------
 debian/patches/fix_irods.diff                 |    9 ++++-----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/debian/patches/fix_google-api-php-client.diff b/debian/patches/fix_google-api-php-client.diff
index f6ea58f..1e76633 100644
--- a/debian/patches/fix_google-api-php-client.diff
+++ b/debian/patches/fix_google-api-php-client.diff
@@ -3,26 +3,25 @@ Description: Adapt Google API client library path
  of embedding it.
 Author: David Prévot <taffit at debian.org>
 Forwarded: not-needed
-Last-Update: 2013-09-14
+Last-Update: 2013-09-24
 --- a/apps/files_external/ajax/google.php
 +++ b/apps/files_external/ajax/google.php
-@@ -1,6 +1,5 @@
+@@ -1,6 +1,6 @@
  <?php
--set_include_path(get_include_path().PATH_SEPARATOR.
+ set_include_path(get_include_path().PATH_SEPARATOR.
 -	\OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src');
-+set_include_path(get_include_path().PATH_SEPARATOR.'google-api-php-client/src');
++	'/usr/share/php/google-api-php-client/src');
  require_once 'Google_Client.php';
  
  OCP\JSON::checkAppEnabled('files_external');
 --- a/apps/files_external/lib/google.php
 +++ b/apps/files_external/lib/google.php
-@@ -21,8 +21,7 @@
- 
+@@ -22,7 +22,7 @@
  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/google-api-php-client/src');
-+set_include_path(get_include_path().PATH_SEPARATOR.'google-api-php-client/src');
++	'/usr/share/php/google-api-php-client/src');
  require_once 'Google_Client.php';
  require_once 'contrib/Google_DriveService.php';
  
diff --git a/debian/patches/fix_irods.diff b/debian/patches/fix_irods.diff
index c5161eb..a52af5e 100644
--- a/debian/patches/fix_irods.diff
+++ b/debian/patches/fix_irods.diff
@@ -3,16 +3,15 @@ Description: Adapt iRODS PHP path
  of embedding it.
 Author: David Prévot <taffit at debian.org>
 Forwarded: not-needed
-Last-Update: 2013-09-08
+Last-Update: 2013-09-24
 --- a/apps/files_external/lib/irods.php
 +++ b/apps/files_external/lib/irods.php
-@@ -8,8 +8,7 @@
- 
+@@ -9,7 +9,7 @@
  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/irodsphp/prods/src');
-+set_include_path(get_include_path() . PATH_SEPARATOR . 'irods/prods/src');
++       '/usr/share/php/irods/prods/src');
  
  ob_start();
  require_once 'ProdsConfig.inc.php';

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