[Pkg-owncloud-commits] [owncloud] 07/09: Depend on php-irods-prods

[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 0eec2f0df8d267d9b796f99132ec7029a398d129
Author: David Prévot <taffit at debian.org>
Date:   Sun Sep 8 09:16:52 2013 -0400

    Depend on php-irods-prods
---
 debian/control               |    1 +
 debian/patches/fix_irods.php |   18 ++++++++++++++++++
 debian/patches/series        |    1 +
 debian/rules                 |    8 +-------
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 717818e..cb605c3 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,7 @@ Depends: apache2 | httpd,
          php-aws-sdk (<< 2~),
          php-crypt-blowfish,
          php-getid3 (>= 1.9.3-1),
+         php-irods-prods,
          php-mdb2,
          php-mdb2-schema,
          php-patchwork-utf8,
diff --git a/debian/patches/fix_irods.php b/debian/patches/fix_irods.php
new file mode 100644
index 0000000..c5161eb
--- /dev/null
+++ b/debian/patches/fix_irods.php
@@ -0,0 +1,18 @@
+Description: Adapt iRODS PHP path
+ The Debian package depends on the packaged PHP client API instead
+ of embedding it.
+Author: David Prévot <taffit at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-09-08
+--- a/apps/files_external/lib/irods.php
++++ b/apps/files_external/lib/irods.php
+@@ -8,8 +8,7 @@
+ 
+ namespace OC\Files\Storage;
+ 
+-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');
+ 
+ ob_start();
+ require_once 'ProdsConfig.inc.php';
diff --git a/debian/patches/series b/debian/patches/series
index 9fa33aa..435ea07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ fix_log_path.diff
 fix_symphony.diff
 fix_chosen.diff
 fix_fancybox.diff
+fix_irods.php
diff --git a/debian/rules b/debian/rules
index 065f397..2c2e1bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/COPYING
 	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/google-api-php-client/LICENSE
 	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/google-api-php-client/NOTICE
-	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/irodsphp/LICENSE.txt
-	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/irodsphp/prods/src/LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/LICENSE
 	rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/css/DroidSansMono/Google\ Android\ License.txt
 	rm debian/owncloud/usr/share/owncloud/apps/updater/COPYING-AGPL
@@ -38,10 +36,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/apps/files_antivirus/README.md
 	rm debian/owncloud/usr/share/owncloud/apps/files_encryption/appinfo/spec.txt
 	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/google-api-php-client/README
-	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/irodsphp/prods/doc_config.ini
-	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/irodsphp/prods/release_notes.txt
-	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/irodsphp/release_notes.txt
-	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/irodsphp/prods/src/release_notes.txt
 	rm debian/owncloud/usr/share/owncloud/apps/updater/README
 	rm debian/owncloud/usr/share/owncloud/core/img/filetypes/readme*.txt
 	rm debian/owncloud/usr/share/owncloud/core/js/oc-vcategories.txt
@@ -53,7 +47,6 @@ override_dh_install:
 	rm -r debian/owncloud/usr/share/owncloud/apps/calendar/tests
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_encryption/tests
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_external/tests
-	rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/irodsphp/prods/utilities
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_odfviewer/src
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_videoviewer/mediaelement
 	rm -r debian/owncloud/usr/share/owncloud/apps/media/tests
@@ -105,6 +98,7 @@ override_dh_install:
 
 	# Remove third party provided by external package
 	rmdir debian/owncloud/usr/share/owncloud/apps/files_encryption/3rdparty
+	rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/irodsphp
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/phpseclib
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_imageviewer/css
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_imageviewer/img

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