[Pkg-owncloud-commits] [owncloud] 03/07: 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 e0848360475ca18c8a9b3134ac69d659e496a86d
Author: David Prévot <taffit at debian.org>
Date:   Tue Aug 11 19:47:30 2015 +0200

    Refresh patches
    
    Git-Dch: Ignore
---
 debian/patches/0001-Disable-the-appstore.patch     | 16 ++++++++--------
 debian/patches/0002-Fix-displayed-version.patch    |  2 +-
 debian/patches/0003-Improve-logfile-handling.patch |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index ab0ccb5..c8589b3 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -21,21 +21,21 @@ Last-Update: 2014-04-22
  6 files changed, 10 insertions(+), 8 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index 19e7843..564062e 100644
+index deecbec..cd49a49 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -588,8 +588,9 @@ $CONFIG = array(
+@@ -587,8 +587,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
-+ * and for Debian, see /usr/share/doc/owncloud/README.Debian
++ * Debian: disabled by default, see /usr/share/doc/owncloud/README.Debian
   */
 -'appstoreenabled' => true,
 +'appstoreenabled' => false,
  
  /**
   * The URL of the appstore to use.
-@@ -612,12 +613,13 @@ $CONFIG = array(
+@@ -611,12 +612,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.
@@ -52,7 +52,7 @@ index 19e7843..564062e 100644
  ),
  
 diff --git a/lib/base.php b/lib/base.php
-index 829c2bc..81081b9 100644
+index 8812d56..c484a70 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -205,7 +205,7 @@ class OC {
@@ -65,7 +65,7 @@ index 829c2bc..81081b9 100644
  			OC::$APPSROOTS[] = array(
  				'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
 diff --git a/lib/private/app.php b/lib/private/app.php
-index c506be1..cbf239a 100644
+index ab3430b..baa9253 100644
 --- a/lib/private/app.php
 +++ b/lib/private/app.php
 @@ -501,7 +501,7 @@ class OC_App {
@@ -104,7 +104,7 @@ index 9c78ad3..6c4cd32 100644
  				|| !is_writable(OC_App::getInstallPath())
  				|| !is_readable(OC_App::getInstallPath())
 diff --git a/settings/templates/apps.php b/settings/templates/apps.php
-index c88efb8..8969429 100644
+index 3ee8044..a3b9844 100644
 --- a/settings/templates/apps.php
 +++ b/settings/templates/apps.php
 @@ -29,7 +29,7 @@ script(
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index 1786494..0fe2b66 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 564062e..3914762 100644
+index cd49a49..f80d2fd 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -429,7 +429,7 @@ $CONFIG = array(
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index f28e4a6..4431255 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 3914762..d1df425 100644
+index f80d2fd..7807cd8 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -476,8 +476,9 @@ $CONFIG = array(
@@ -29,10 +29,10 @@ index 3914762..d1df425 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 81081b9..a2cc6d2 100644
+index c484a70..11653a8 100644
 --- a/lib/base.php
 +++ b/lib/base.php
-@@ -758,7 +758,7 @@ class OC {
+@@ -764,7 +764,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

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