[Pkg-owncloud-commits] [owncloud] 27/28: Refresh patches

[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 7af50f23888931dda0a1892508d7ee06918a4144
Author: David Prévot <taffit at debian.org>
Date:   Fri Dec 6 21:55:27 2013 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 debian/patches/0001-Disable-the-appstore.patch     |  2 +-
 .../patches/0017-Fixed-file-not-found-issue.patch  | 43 ----------------------
 ...octrine-Symphony-Sabre-and-Patchwork-path.patch |  2 +-
 debian/patches/series                              |  1 -
 4 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 2b52041..dc236ee 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -54,7 +54,7 @@ index ba06896..ff3ab1c 100644
  ),
  'user_backends'=>array(
 diff --git a/lib/base.php b/lib/base.php
-index 2feedd8..68690ae 100644
+index baf73b2..50fbd8c 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -144,8 +144,8 @@ class OC {
diff --git a/debian/patches/0017-Fixed-file-not-found-issue.patch b/debian/patches/0017-Fixed-file-not-found-issue.patch
deleted file mode 100644
index 3b3c8d2..0000000
--- a/debian/patches/0017-Fixed-file-not-found-issue.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Vincent Petry <PVince81 at yahoo.fr>
-Date: Thu, 5 Dec 2013 12:18:06 +0100
-Subject: Fixed file not found issue
-
-This fixes an issue where the second call would miss the "/files" part.
-
-The path attribute must keep "files" so that the next call to the File
-instance will still have the correct one.
-
-Fixes #155
-
-Bugs: https://github.com/owncloud/documents/issues/155
-Origin: upstream, https://github.com/owncloud/documents/commit/aed7ed77d276fcf7e028ff9ae0930a1ba8f1a131
----
- apps/documents/lib/file.php | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/apps/documents/lib/file.php b/apps/documents/lib/file.php
-index 265e6c7..84125bd 100644
---- a/apps/documents/lib/file.php
-+++ b/apps/documents/lib/file.php
-@@ -177,17 +177,18 @@ class File {
- 		/* to emit hooks properly, view root should contain /user/files */
- 		
- 		if (strpos($this->path, 'files') === 0){
--			$this->path = preg_replace('|^files|', '', $this->path);
-+			$path = preg_replace('|^files|', '', $this->path);
- 			$view = new View('/' . $this->owner . '/files');
- 		} else {
-+			$path = $this->path;
- 			$view = new View('/' . $this->owner);
- 		}
- 		
--		if (!$view->file_exists($this->path)){
-+		if (!$view->file_exists($path)){
- 			throw new \Exception($this->path . ' doesn\'t exist');
- 		}
- 		
--		return array($view, $this->path);
-+		return array($view, $path);
- 	}
- 
- 	public function getOwner(){
diff --git a/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch b/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch
index 3725b6a..36380fc 100644
--- a/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch
+++ b/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch
@@ -20,7 +20,7 @@ Last-Update: 2013-11-11
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/lib/base.php b/lib/base.php
-index 68690ae..b468a62 100644
+index 50fbd8c..9e1609d 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -393,13 +393,13 @@ class OC {
diff --git a/debian/patches/series b/debian/patches/series
index 66ff053..04b28e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,3 @@ path/0013-Adapt-google-api-php-client-path.patch
 path/0014-Adapt-Dropbox-path.patch
 path/0015-Adapt-php-opencloud-path.patch
 path/0016-Adapt-Zend-path.patch
-0017-Fixed-file-not-found-issue.patch

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