[Pkg-owncloud-commits] [owncloud] 121/123: Refresh patches

[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 f59c4fdb75e887efd01663077e6dfeb4a08dbc04
Author: David Prévot <taffit at debian.org>
Date:   Tue May 19 19:02:30 2015 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 debian/patches/0001-Disable-the-appstore.patch     | 6 +++---
 debian/patches/0003-Improve-logfile-handling.patch | 4 ++--
 debian/patches/0009-updating-ZipStreamer.patch     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 1b50a8a..e51e877 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -52,7 +52,7 @@ index 45aaf6a..c79ed0b 100644
  ),
  
 diff --git a/lib/base.php b/lib/base.php
-index a9d582d..a7264f0 100644
+index b7f19c9..ca088e7 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -205,7 +205,7 @@ class OC {
@@ -65,10 +65,10 @@ index a9d582d..a7264f0 100644
  			OC::$APPSROOTS[] = array(
  				'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
 diff --git a/lib/private/app.php b/lib/private/app.php
-index aec67e6..e94b891 100644
+index a4dd513..69e0865 100644
 --- a/lib/private/app.php
 +++ b/lib/private/app.php
-@@ -495,7 +495,7 @@ class OC_App {
+@@ -501,7 +501,7 @@ class OC_App {
  	 * @return string|false
  	 */
  	public static function getInstallPath() {
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index 5d5e686..bb8651f 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -29,10 +29,10 @@ index 252b0f1..0e53e89 100644
  /**
   * Loglevel to start logging at. Valid values are: 0 = Debug, 1 = Info, 2 =
 diff --git a/lib/base.php b/lib/base.php
-index a7264f0..506f894 100644
+index ca088e7..d8fb361 100644
 --- a/lib/base.php
 +++ b/lib/base.php
-@@ -751,7 +751,7 @@ class OC {
+@@ -753,7 +753,7 @@ class OC {
  		if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !\OCP\Util::needUpgrade()) {
  			//don't try to do this before we are properly setup
  			//use custom logfile path if defined, otherwise use default of owncloud.log in data directory
diff --git a/debian/patches/0009-updating-ZipStreamer.patch b/debian/patches/0009-updating-ZipStreamer.patch
index c58555a..51cf31d 100644
--- a/debian/patches/0009-updating-ZipStreamer.patch
+++ b/debian/patches/0009-updating-ZipStreamer.patch
@@ -8,7 +8,7 @@ Origin: upstream, https://github.com/owncloud/core/commit/ca55c10d668904ed350dff
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/lib/private/files.php b/lib/private/files.php
-index 97f9d81..0b516e3 100644
+index 6a739fc..c3bfe77 100644
 --- a/lib/private/files.php
 +++ b/lib/private/files.php
 @@ -39,9 +39,7 @@
@@ -30,4 +30,4 @@ index 97f9d81..0b516e3 100644
 +			$zip = new ZipStreamer();
  		}
  		OC_Util::obEnd();
- 		if ($zip or \OC\Files\Filesystem::isReadable($filename)) {
+ 

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