[Pkg-owncloud-commits] [owncloud] 02/02: Use php-zipstreamer instead of embedded copy

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 5375a7727ba90fd1d56722ac35cc680e6e6aa4ef
Author: David Prévot <taffit at debian.org>
Date:   Tue Mar 31 15:18:42 2015 -0400

    Use php-zipstreamer instead of embedded copy
---
 debian/changelog                               |  1 +
 debian/control                                 |  1 +
 debian/install                                 |  1 -
 debian/patches/0009-updating-ZipStreamer.patch | 38 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 5 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ac98af2..6d7d457 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ owncloud (8.0.3~rc1+dfsg-1) UNRELEASED; urgency=medium
     - php-patchwork-jsqueeze
     - php-punic
     - php-randomlib
+    - php-zipstreamer
     - libjs-handlebars (core/vendor)
   * Use JSqueeze instead of JSMin
   * Update copyright
diff --git a/debian/control b/debian/control
index e122482..fcc766e 100644
--- a/debian/control
+++ b/debian/control
@@ -39,6 +39,7 @@ Depends: libjs-handlebars,
          php-symfony-class-loader,
          php-symfony-console,
          php-symfony-routing,
+         php-zipstreamer,
          php5 (>= 5.5.0),
          php5-cli,
          php5-gd,
diff --git a/debian/install b/debian/install
index 665f49a..96f5cdd 100644
--- a/debian/install
+++ b/debian/install
@@ -8,7 +8,6 @@ themes		var/lib/owncloud
 
 # Third party
 3rdparty/bantu/ini-get-wrapper/src/IniGetWrapper.php	usr/share/owncloud/3rdparty/bantu/IniGetWrapper
-3rdparty/mcnetic/phpzipstreamer/ZipStreamer.php		usr/share/owncloud/3rdparty/mcnetic/phpzipstreamer
 debian/autoload.php					usr/share/owncloud/3rdparty
 
 # Files
diff --git a/debian/patches/0009-updating-ZipStreamer.patch b/debian/patches/0009-updating-ZipStreamer.patch
new file mode 100644
index 0000000..5a6176f
--- /dev/null
+++ b/debian/patches/0009-updating-ZipStreamer.patch
@@ -0,0 +1,38 @@
+From: =?utf-8?q?Thomas_M=C3=BCller?= <thomas.mueller at tmit.eu>
+Date: Wed, 6 Aug 2014 12:04:11 +0200
+Subject: updating ZipStreamer
+
+Origin: upstream, https://github.com/owncloud/core/commit/ca55c10d668904ed350dffd81494496de48c6827
+---
+ lib/private/files.php | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/lib/private/files.php b/lib/private/files.php
+index 496ba1b..eb2e410 100644
+--- a/lib/private/files.php
++++ b/lib/private/files.php
+@@ -1,4 +1,5 @@
+ <?php
++use ZipStreamer\ZipStreamer;
+ 
+ /**
+  * ownCloud
+@@ -21,9 +22,6 @@
+  *
+  */
+ 
+-// TODO: get rid of this using proper composer packages
+-require_once 'mcnetic/phpzipstreamer/ZipStreamer.php';
+-
+ /**
+  * Class for file server access
+  *
+@@ -105,7 +103,7 @@ class OC_Files {
+ 				$xsendfile = false;
+ 			}
+ 		} else {
+-			$zip = new ZipStreamer(false);
++			$zip = new ZipStreamer();
+ 		}
+ 		OC_Util::obEnd();
+ 		if ($zip or \OC\Files\Filesystem::isReadable($filename)) {
diff --git a/debian/patches/series b/debian/patches/series
index f5e57ea..8085f16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ path/0005-Adapt-aws-sdk-path.patch
 path/0006-Adapt-google-api-php-client-path.patch
 path/0007-Adapt-Dropbox-path.patch
 0008-use-JSqueeze-instead-of-JSMin-13052.patch
+0009-updating-ZipStreamer.patch

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