[Pkg-owncloud-commits] [owncloud] 02/02: Depend on php-google-api-php-client

[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 a9e06dacce6048c3ac6b94cadc97c83ab16a5d0c
Author: David Prévot <taffit at debian.org>
Date:   Sun Sep 15 13:13:16 2013 -0400

    Depend on php-google-api-php-client
---
 debian/control                                |    2 +-
 debian/owncloud.links                         |    3 ---
 debian/patches/fix_google-api-php-client.diff |   28 +++++++++++++++++++++++++
 debian/patches/series                         |    3 ++-
 debian/rules                                  |    6 +-----
 5 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index cb605c3..90e07dd 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/owncloud.git
 Package: owncloud
 Architecture: all
 Depends: apache2 | httpd,
-         ca-certificates,
          fonts-font-awesome,
          libjs-chosen,
          libjs-jquery (>= 1.7.2-1),
@@ -32,6 +31,7 @@ Depends: apache2 | httpd,
          php-aws-sdk (<< 2~),
          php-crypt-blowfish,
          php-getid3 (>= 1.9.3-1),
+         php-google-api-php-client,
          php-irods-prods,
          php-mdb2,
          php-mdb2-schema,
diff --git a/debian/owncloud.links b/debian/owncloud.links
index 87edefc..47d3c27 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -47,6 +47,3 @@ usr/share/javascript/jquery-timepicker/jquery-ui-sliderAccess.js	usr/share/owncl
 usr/share/javascript/jquery-timepicker/jquery-ui-timepicker-addon.css	usr/share/owncloud/3rdparty/timepicker/css/jquery.ui.timepicker.css
 usr/share/javascript/jquery-timepicker/jquery-ui-timepicker-addon.js	usr/share/owncloud/3rdparty/timepicker/js/jquery.ui.timepicker.js
 usr/share/javascript/jquery-timepicker/localization			usr/share/owncloud/3rdparty/timepicker/js/localization
-
-# Use certificates from ca-certificates
-etc/ssl/certs/ca-certificates.crt	usr/share/owncloud/apps/files_external/3rdparty/google-api-php-client/src/io/cacerts.pem
diff --git a/debian/patches/fix_google-api-php-client.diff b/debian/patches/fix_google-api-php-client.diff
new file mode 100644
index 0000000..f6ea58f
--- /dev/null
+++ b/debian/patches/fix_google-api-php-client.diff
@@ -0,0 +1,28 @@
+Description: Adapt Google API client library 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-14
+--- a/apps/files_external/ajax/google.php
++++ b/apps/files_external/ajax/google.php
+@@ -1,6 +1,5 @@
+ <?php
+-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');
+ 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 @@
+ 
+ namespace OC\Files\Storage;
+ 
+-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');
+ require_once 'Google_Client.php';
+ require_once 'contrib/Google_DriveService.php';
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 435ea07..79246cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,5 @@ fix_log_path.diff
 fix_symphony.diff
 fix_chosen.diff
 fix_fancybox.diff
-fix_irods.php
+fix_irods.diff
+fix_google-api-php-client.diff
diff --git a/debian/rules b/debian/rules
index 2c2e1bd..fb6d33c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/3rdparty/Google/LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/*-LICENSE.txt
 	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_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
@@ -35,7 +33,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/Changelog
 	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/updater/README
 	rm debian/owncloud/usr/share/owncloud/core/img/filetypes/readme*.txt
 	rm debian/owncloud/usr/share/owncloud/core/js/oc-vcategories.txt
@@ -98,8 +95,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_external/3rdparty
 	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