[Pkg-owncloud-commits] [owncloud] 15/16: 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 1568b714dcd53fcceecb77c30570074c12b60b3f
Author: David Prévot <taffit at debian.org>
Date:   Sat Dec 6 01:32:06 2014 -0400

    Refresh patches
---
 debian/patches/0001-Disable-the-appstore.patch                 | 10 +++++-----
 debian/patches/0002-Fix-displayed-version.patch                |  4 ++--
 debian/patches/0003-Improve-logfile-handling.patch             |  6 +++---
 ...005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 75dcb8a..3c161ae 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -23,10 +23,10 @@ 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 c073d94..f237f9f 100644
+index 6da3a68..fa627c5 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -523,8 +523,9 @@ $CONFIG = array(
+@@ -539,8 +539,9 @@ $CONFIG = array(
  /**
   * When enabled, admins may install apps from the ownCloud app store.
   * The app store is disabled by default for ownCloud Enterprise Edition
@@ -37,7 +37,7 @@ index c073d94..f237f9f 100644
  
  /**
   * The URL of the appstore to use.
-@@ -538,12 +539,13 @@ $CONFIG = array(
+@@ -554,12 +555,13 @@ $CONFIG = array(
   * file system path to the app folder. The key ``url`` defines the HTTP web path
   * to that folder, starting from the ownCloud web root. The key ``writable``
   * indicates if a web server can write files to that folder.
@@ -54,7 +54,7 @@ index c073d94..f237f9f 100644
  ),
  
 diff --git a/lib/base.php b/lib/base.php
-index 27b1233..78f4968 100644
+index e99159d..2c20932 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -157,7 +157,7 @@ class OC {
@@ -93,7 +93,7 @@ index dc147de..52db11c 100644
  		}
  
 diff --git a/lib/private/setup.php b/lib/private/setup.php
-index a18c72d..e95c613 100644
+index a958aba..216d313 100644
 --- a/lib/private/setup.php
 +++ b/lib/private/setup.php
 @@ -189,6 +189,8 @@ class OC_Setup {
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index 00b714d..dafff31 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -18,10 +18,10 @@ 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 f237f9f..d07aef1 100644
+index fa627c5..7e91a2e 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -407,7 +407,7 @@ $CONFIG = array(
+@@ -414,7 +414,7 @@ $CONFIG = array(
   * Check if ownCloud is up-to-date and shows a notification if a new version is
   * available.
   */
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index e3c900b..4751c96 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -14,10 +14,10 @@ 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 d07aef1..f90313d 100644
+index 7e91a2e..2508e2e 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -443,8 +443,9 @@ $CONFIG = array(
+@@ -459,8 +459,9 @@ $CONFIG = array(
  
  /**
   * Change the ownCloud logfile name from ``owncloud.log`` to something else.
@@ -29,7 +29,7 @@ index d07aef1..f90313d 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 78f4968..8e9686b 100644
+index 2c20932..a8060f2 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -609,7 +609,7 @@ class OC {
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 cde5b61..41027bf 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 8e9686b..c1217d5 100644
+index a8060f2..4367ea2 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -431,12 +431,12 @@ class OC {

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