[Pkg-owncloud-commits] [owncloud] 03/07: Update requirements for files_external

[David Prévot]

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

taffit pushed a commit to branch wip/stable8
in repository owncloud.

commit 68f238b68588c4e9c16b22a06f62e0f9de6cbc3a
Author: David Prévot <taffit at debian.org>
Date:   Thu Apr 16 19:35:39 2015 -0400

    Update requirements for files_external
    
    Recommend php-smb instead of smbclient.
    
    Git-Dch: Full
---
 debian/README.Debian               |  2 +-
 debian/autoload.php                |  3 ---
 debian/control                     |  4 ++--
 debian/copyright                   |  6 ++----
 debian/files_external/autoload.php |  4 ++++
 debian/rules                       | 10 +++++-----
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 85be994..b4a60c8 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -76,7 +76,7 @@ Some apps, not enabled by default, need the following dependencies:
 	- files_external:	php-aws-sdk
 				php-dropbox
 				php-google-api-php-client
-				smbclient
+				php-smb
 	- user_ldap		php5-ldap
 
 Improve performance:		php5-apcu | php5-xcache
diff --git a/debian/autoload.php b/debian/autoload.php
index c015917..069d454 100644
--- a/debian/autoload.php
+++ b/debian/autoload.php
@@ -23,9 +23,6 @@ require_once 'Icewind/Streams/autoload.php';
 require_once 'Swift/swift_required.php';
 require_once 'GuzzleHttp/autoload.php';
 require_once 'Patchwork/JSqueeze.autoload.php';
-if (stream_resolve_include_path('Aws/autoload.php')){
-    include_once 'Aws/autoload.php';
-}
 
 // Load bantu/ini-get-wrapper, pear/archive_tar, and pear/pear_exception,
 // as generated via phpab:
diff --git a/debian/control b/debian/control
index de40fb1..7a4c19f 100644
--- a/debian/control
+++ b/debian/control
@@ -53,15 +53,15 @@ Depends: libjs-handlebars,
          ${misc:Depends}
 Recommends: exim4 | mail-transport-agent,
             php-aws-sdk (<< 3),
-            php-aws-sdk (>= 2.7.27),
+            php-aws-sdk (>= 2.8),
             php-dropbox,
             php-google-api-php-client (>= 1),
+            php-smb,
             php5-apcu | php5-xcache,
             php5-curl,
             php5-intl,
             php5-ldap,
             php5-mcrypt,
-            smbclient,
             ${misc:Recommends}
 Suggests: libapache2-mod-xsendfile,
           libav-tools,
diff --git a/debian/copyright b/debian/copyright
index 38b439d..4f00df2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -123,6 +123,8 @@ Files: 3rdparty/bantu/ini-get-wrapper/*
        apps/files_external/3rdparty/Dropbox/*
        apps/files_external/3rdparty/aws-sdk-php/Guzzle/*
        apps/files_external/3rdparty/aws-sdk-php/Symfony/*
+       apps/files_external/3rdparty/composer/*
+       apps/files_external/3rdparty/icewind/*
        apps/files_pdfviewer/vendor/pdfjs/web/l10n.js
        apps/files_texteditor/js/vendor/ace/src-noconflict/mode-r.js
        apps/files_texteditor/js/vendor/ace/src-noconflict/mode-rdoc.js
@@ -293,11 +295,7 @@ Copyright: 1997-2010, Vincent Blavet <vincent at phpconcept.net>
 License: BSD-2-clause
 
 Files: 3rdparty/phpmailer/phpmailer/language/phpmailer.lang-vi.php
-       apps/files_external/3rdparty/smb4php/*
 Copyright: VINADES.,JSC <contact at vinades.vn>
-           2007, Victor M. Varela <vmvarela at gmail.com>
-           2012, Frank Karlitschek <frank at owncloud.org>
-           2014, Robin McCorkell <rmccorkell at karoshi.org.uk>
 License: GPL-2+ or LGPL-2.1+
 
 Files: 3rdparty/punic/punic/code/data/*
diff --git a/debian/files_external/autoload.php b/debian/files_external/autoload.php
new file mode 100644
index 0000000..c2d830c
--- /dev/null
+++ b/debian/files_external/autoload.php
@@ -0,0 +1,4 @@
+<?php
+require_once 'Icewind/SMB/autoload.php';
+// require_once 'Icewind/Streams/autoload.php';  (already required by SMB)
+require_once 'Aws/autoload.php';
diff --git a/debian/rules b/debian/rules
index 4950a02..e0df3aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,20 +8,20 @@ VERSION := $(shell head -1 debian/changelog | sed 's/.*(//;s/).*//')
 override_dh_install:
 	# Remove useless licences, documentation, tests, scripts and sources
 	dh_install \
-		-Xapps/updater -Xaws-sdk-php \
+		-Xapps/updater \
 		-Xbower.json \
 		-Xcomposer.json -XCOPYING -Xcore/doc \
-		-XDropbox \
+		-Xfiles_external/3rdparty \
 		-Xfiles_videoviewer/src \
-		-Xgoogle-api-php-client \
 		-Xignorelist -Ximage-optimization.sh -Ximg/skin \
 		-Xjcrop \
 		-XLICEN -XLicense.txt \
 		-Xpdfjs \
 		-XREADME. \
-		-Xspec.txt \
 		-Xtests \
-		-Xxgettextfiles
+		-Xxgettextfiles \
+		debian/files_external/autoload.php \
+		usr/share/owncloud/apps/files_external/3rdparty
 
 	# Minify JavaScript files.
 	uglifyjs -o \

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