[Pkg-owncloud-commits] [owncloud] 33/34: 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 5e8cd8f0e5088f31d773f7c9fbf14b81b94b94ad
Author: David Prévot <taffit at debian.org>
Date:   Thu Oct 16 10:55:59 2014 -0400

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

diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index f6e89bb..6bd5158 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 ffbcbea..d200357 100644
+index d86d46a..659b647 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -492,8 +492,9 @@ $CONFIG = array(
+@@ -499,8 +499,9 @@ $CONFIG = array(
  
  /**
   * When enabled, admins may install apps from the ownCloud app store.
@@ -37,7 +37,7 @@ index ffbcbea..d200357 100644
  
  /**
   * The URL of the appstore to use.
-@@ -507,12 +508,13 @@ $CONFIG = array(
+@@ -514,12 +515,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.
@@ -93,11 +93,11 @@ index dc147de..52db11c 100644
  		}
  
 diff --git a/lib/private/setup.php b/lib/private/setup.php
-index 2747922..377cf6a 100644
+index 2ad569c..5d27e371 100644
 --- a/lib/private/setup.php
 +++ b/lib/private/setup.php
 @@ -85,6 +85,8 @@ class OC_Setup {
- 		OC_Config::setValue('overwritewebroot', OC::$WEBROOT);
+ 		OC_Config::setValue('overwrite.cli.url', \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . OC::$WEBROOT);
  		OC_Config::setValue('dbtype', $dbtype);
  		OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
 +		OC_Config::setValue('appstoreenabled', false);
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index 2563e41..7624181 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 d200357..0b12bed 100644
+index 659b647..c72e4dd 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -377,7 +377,7 @@ $CONFIG = array(
+@@ -384,7 +384,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 0610f07..22c2824 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 0b12bed..4da99bb 100644
+index c72e4dd..2fe50b6 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -413,8 +413,9 @@ $CONFIG = array(
+@@ -420,8 +420,9 @@ $CONFIG = array(
  
  /**
   * Change the ownCloud logfile name from ``owncloud.log`` to something else.
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 cf9791c..fc8560d 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 32224f9..1e77f4d8 100644
+index 32224f9..1e77f4d 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