[Pkg-owncloud-commits] [owncloud] 06/08: Depend on php-opencloud

[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 f5a6fa7817c3f154554c2302a16b4268cd161b7e
Author: David Prévot <taffit at debian.org>
Date:   Wed Oct 30 17:54:06 2013 -0400

    Depend on php-opencloud
    
    Drop the embedded copy.
---
 debian/control                    |    1 +
 debian/patches/fix_opencloud.diff |   19 +++++++++++++++++++
 debian/patches/series             |    1 +
 debian/rules                      |    1 +
 4 files changed, 22 insertions(+)

diff --git a/debian/control b/debian/control
index 01648e6..5e1e5a1 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,7 @@ Depends: apache2 | httpd,
          php-getid3 (>= 1.9.5~),
          php-google-api-php-client,
          php-irods-prods,
+         php-opencloud,
          php-patchwork-utf8,
          php-pear,
          php-phpdocx,
diff --git a/debian/patches/fix_opencloud.diff b/debian/patches/fix_opencloud.diff
new file mode 100644
index 0000000..98e6c6b
--- /dev/null
+++ b/debian/patches/fix_opencloud.diff
@@ -0,0 +1,19 @@
+Description: Adapt php-opencloud path
+
+The Debian package depends on the needed classes instead of embedding
+them, i.e. php-opencloud.
+Author: David Prévot <taffit at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-10-30
+--- a/apps/files_external/lib/swift.php
++++ b/apps/files_external/lib/swift.php
+@@ -22,8 +22,7 @@
+ 
+ namespace OC\Files\Storage;
+ 
+-set_include_path(get_include_path() . PATH_SEPARATOR .
+-        \OC_App::getAppPath('files_external') . '/3rdparty/php-opencloud/lib');
++set_include_path(get_include_path() . PATH_SEPARATOR . 'php-opencloud');
+ require_once 'openstack.php';
+ 
+ use \OpenCloud;
diff --git a/debian/patches/series b/debian/patches/series
index fd12b04..8cc437c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ fix_dompdf.diff
 fix_doctrine.diff
 fix_dropbox.diff
 disable_documents.diff
+fix_opencloud.diff
diff --git a/debian/rules b/debian/rules
index eea539e..e7df570 100755
--- a/debian/rules
+++ b/debian/rules
@@ -148,6 +148,7 @@ override_dh_install:
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/aws-sdk-php
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/google-api-php-client
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/irodsphp
+	rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/php-opencloud
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/phpseclib
 
 	# Fix displayed version

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