[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 4a3efca26b315f36d2312d4e402dcd625f061e26
Author: David Prévot <taffit at debian.org>
Date:   Thu Oct 30 14:46:32 2014 -0400

    Refresh patches
---
 debian/patches/0001-Disable-the-appstore.patch               | 12 ++++++------
 debian/patches/0002-Fix-displayed-version.patch              |  6 +++---
 debian/patches/0003-Improve-logfile-handling.patch           |  4 ++--
 ...5-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch |  2 +-
 4 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 62034bd..a04d228 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 9b70ede..66c7a02 100644
+index 54958ce..c09e3cb 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -512,8 +512,9 @@ $CONFIG = array(
@@ -54,7 +54,7 @@ index 9b70ede..66c7a02 100644
  ),
  
 diff --git a/lib/base.php b/lib/base.php
-index 7335be0..4bace86 100644
+index 4cd9203..d39432a 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -157,7 +157,7 @@ class OC {
@@ -93,10 +93,10 @@ index dc147de..52db11c 100644
  		}
  
 diff --git a/lib/private/setup.php b/lib/private/setup.php
-index 2ad569c..5d27e371 100644
+index 1a3ae58..9921018 100644
 --- a/lib/private/setup.php
 +++ b/lib/private/setup.php
-@@ -85,6 +85,8 @@ class OC_Setup {
+@@ -186,6 +186,8 @@ class OC_Setup {
  		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()));
@@ -106,10 +106,10 @@ index 2ad569c..5d27e371 100644
  			$dbSetup->initialize($options);
  			$dbSetup->setupDatabase($username);
 diff --git a/lib/private/util.php b/lib/private/util.php
-index 502cf8b..3324fa4 100644
+index 08de46b..484b84c 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
-@@ -444,7 +444,7 @@ class OC_Util {
+@@ -442,7 +442,7 @@ class OC_Util {
  		}
  
  		// Check if there is a writable install folder.
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index c8a8e3d..80b4111 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 66c7a02..362c790 100644
+index c09e3cb..80f539f 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -397,7 +397,7 @@ $CONFIG = array(
@@ -44,10 +44,10 @@ index 1f2f3eb..b1a61c7 100644
  				if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array() && OC_User::isAdminUser(OC_User::getUser())) {
  					$this->assign('updateAvailable', true);
 diff --git a/lib/private/util.php b/lib/private/util.php
-index 3324fa4..9a22244 100644
+index 484b84c..360b170 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
-@@ -1311,7 +1311,7 @@ class OC_Util {
+@@ -1309,7 +1309,7 @@ class OC_Util {
  	 * @return string
  	 */
  	public static function getHumanVersion() {
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index 2f04047..bdafd54 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 362c790..cd5ab36 100644
+index 80f539f..a0dc030 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -433,8 +433,9 @@ $CONFIG = array(
@@ -29,7 +29,7 @@ index 362c790..cd5ab36 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 4bace86..32224f9 100644
+index d39432a..25992b2 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -615,7 +615,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 cf9791c..77e8257 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 25992b2..93eb6a6 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