[Pkg-owncloud-commits] [owncloud] 84/85: Adapt phpseclib path

[David Prévot]

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

taffit pushed a commit to branch 6.0
in repository owncloud.

commit 7656d497df9c172c36c73fb6817fb55e016ed20e
Author: David Prévot <taffit at debian.org>
Date:   Tue Jun 17 14:21:07 2014 -0400

    Adapt phpseclib path
    
    Git-Dch: Ignore
---
 ...18-Disable-Flash-and-Silverlight-plugins.patch} |  0
 .../patches/path/0017-Adapt-phpseclib-path.patch   | 43 ++++++++++++++++++++++
 debian/patches/series                              |  3 +-
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0017-Disable-Flash-and-Silverlight-plugins.patch b/debian/patches/0018-Disable-Flash-and-Silverlight-plugins.patch
similarity index 100%
rename from debian/patches/0017-Disable-Flash-and-Silverlight-plugins.patch
rename to debian/patches/0018-Disable-Flash-and-Silverlight-plugins.patch
diff --git a/debian/patches/path/0017-Adapt-phpseclib-path.patch b/debian/patches/path/0017-Adapt-phpseclib-path.patch
new file mode 100644
index 0000000..c59af52
--- /dev/null
+++ b/debian/patches/path/0017-Adapt-phpseclib-path.patch
@@ -0,0 +1,43 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
+Date: Tue, 17 Jun 2014 13:48:20 -0400
+Subject: Adapt phpseclib path
+
+The Debian package depends on the needed classes instead of embedding
+them, i.e. php-seclib.
+
+Forwarded: not-needed
+Gbp: Topic path
+---
+ apps/files_external/lib/config.php | 5 -----
+ apps/files_external/lib/sftp.php   | 2 --
+ 2 files changed, 7 deletions(-)
+
+diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
+index a20a2a0..a25a38f 100644
+--- a/apps/files_external/lib/config.php
++++ b/apps/files_external/lib/config.php
+@@ -20,11 +20,6 @@
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+-set_include_path(
+-	get_include_path() . PATH_SEPARATOR .
+-	\OC_App::getAppPath('files_external') . '/3rdparty/phpseclib/phpseclib'
+-);
+-
+ /**
+  * Class to configure mount.json globally and for users
+  */
+diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php
+index 95e0cef..727fc4f 100644
+--- a/apps/files_external/lib/sftp.php
++++ b/apps/files_external/lib/sftp.php
+@@ -7,8 +7,6 @@
+  */
+ namespace OC\Files\Storage;
+ 
+-set_include_path(get_include_path() . PATH_SEPARATOR .
+-	\OC_App::getAppPath('files_external') . '/3rdparty/phpseclib/phpseclib');
+ require 'Net/SFTP.php';
+ 
+ class SFTP extends \OC\Files\Storage\Common {
diff --git a/debian/patches/series b/debian/patches/series
index e32664f..4a7eebb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,5 @@ path/0013-Adapt-Dropbox-path.patch
 path/0014-Adapt-php-opencloud-path.patch
 path/0015-Adapt-Zend-path.patch
 path/0016-Adapt-Pimple-path.patch
-0017-Disable-Flash-and-Silverlight-plugins.patch
+path/0017-Adapt-phpseclib-path.patch
+0018-Disable-Flash-and-Silverlight-plugins.patch

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