[Pkg-owncloud-commits] [owncloud] 87/90: 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 f0b11e0adf836ce8e160f3031d6282fa9b9a3e5c
Author: David Prévot <taffit at debian.org>
Date:   Fri Feb 6 12:25:21 2015 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 debian/patches/0001-Disable-the-appstore.patch                      | 4 ++--
 debian/patches/0002-Fix-displayed-version.patch                     | 2 +-
 debian/patches/0003-Improve-logfile-handling.patch                  | 6 +++---
 .../0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch    | 2 +-
 debian/patches/path/0007-Adapt-aws-sdk-path.patch                   | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 12ef5fc..5025b09 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -23,7 +23,7 @@ Last-Update: 2014-04-22
  8 files changed, 14 insertions(+), 10 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index 6da3a68..fa627c5 100644
+index 673cede..0691723 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -539,8 +539,9 @@ $CONFIG = array(
@@ -54,7 +54,7 @@ index 6da3a68..fa627c5 100644
  ),
  
 diff --git a/lib/base.php b/lib/base.php
-index d653e06..f6684e0 100644
+index 495d753..27084e4 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -157,7 +157,7 @@ class OC {
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index dafff31..79a3606 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -18,7 +18,7 @@ Last-Update: 2013-10-17
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index fa627c5..7e91a2e 100644
+index 0691723..130c4c0 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -414,7 +414,7 @@ $CONFIG = array(
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index 02984b7..3cf0831 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -14,7 +14,7 @@ Last-Update: 2013-10-23
  3 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index 7e91a2e..2508e2e 100644
+index 130c4c0..d6d7b88 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -459,8 +459,9 @@ $CONFIG = array(
@@ -29,10 +29,10 @@ index 7e91a2e..2508e2e 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 f6684e0..d7a9b0e 100644
+index 27084e4..d1eb4f6 100644
 --- a/lib/base.php
 +++ b/lib/base.php
-@@ -617,7 +617,7 @@ class OC {
+@@ -618,7 +618,7 @@ class OC {
  		if (OC_Config::getValue('installed', false) && OC_Config::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/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch b/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
index 1229946..0e62047 100644
--- a/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
+++ b/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
@@ -14,7 +14,7 @@ Gbp: Topic path
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/lib/base.php b/lib/base.php
-index d7a9b0e..1f82058 100644
+index d1eb4f6..37c4d40 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -439,12 +439,12 @@ class OC {
diff --git a/debian/patches/path/0007-Adapt-aws-sdk-path.patch b/debian/patches/path/0007-Adapt-aws-sdk-path.patch
index 5c1810d..0deef68 100644
--- a/debian/patches/path/0007-Adapt-aws-sdk-path.patch
+++ b/debian/patches/path/0007-Adapt-aws-sdk-path.patch
@@ -12,7 +12,7 @@ Gbp: Topic path
  1 file changed, 4 deletions(-)
 
 diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
-index a3fe183..7f88c4a 100644
+index bc1b56f..0c5ae87 100644
 --- a/apps/files_external/lib/amazons3.php
 +++ b/apps/files_external/lib/amazons3.php
 @@ -24,10 +24,6 @@

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