[Pkg-owncloud-commits] [owncloud] 82/85: Refresh patches

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch 6.0
in repository owncloud.

commit a56aa8756da420f1ce53fd0e3c809f7ae62fbcea
Author: David Prévot <taffit at debian.org>
Date:   Tue Jun 17 13:10:37 2014 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 debian/patches/0001-Disable-the-appstore.patch                    | 8 ++++----
 debian/patches/0002-Fix-displayed-version.patch                   | 6 +++---
 debian/patches/0003-Improve-logfile-handling.patch                | 6 +++---
 .../0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch   | 4 ++--
 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 99de775..5ebfbaa 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, 19 insertions(+), 14 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index 0cf8611..a518c3f 100644
+index 6acfb16..d75c94a 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -74,8 +74,10 @@ $CONFIG = array(
@@ -55,7 +55,7 @@ index 0cf8611..a518c3f 100644
  ),
  'user_backends'=>array(
 diff --git a/lib/base.php b/lib/base.php
-index 5a83a69..efaeb4b 100644
+index 3c06cc1..a566296 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -145,7 +145,7 @@ class OC {
@@ -134,10 +134,10 @@ index 8ef563b..6af35dc 100644
  			$dbSetup->initialize($options);
  			$dbSetup->setupDatabase($username);
 diff --git a/lib/private/util.php b/lib/private/util.php
-index 6db1727..c519ed5 100644
+index 5700e98..b36ee90 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
-@@ -332,7 +332,7 @@ class OC_Util {
+@@ -335,7 +335,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 7e567ab..eb5cedd 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, 4 insertions(+), 4 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index a518c3f..ec36f6d 100644
+index d75c94a..576a46c 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -134,8 +134,8 @@ $CONFIG = array(
@@ -46,10 +46,10 @@ index 625f342..ed21f88 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 c519ed5..44fdd92 100644
+index b36ee90..b43dff0 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
-@@ -1162,7 +1162,7 @@ class OC_Util {
+@@ -1200,7 +1200,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 6e26bdb..3f859e0 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -13,7 +13,7 @@ Last-Update: 2013-10-23
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index ec36f6d..dbfd75d 100644
+index 576a46c..3431515 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -149,7 +149,7 @@ $CONFIG = array(
@@ -26,10 +26,10 @@ index ec36f6d..dbfd75d 100644
  
  /* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
 diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php
-index 3590bbd..b76d75e 100644
+index 08d0b7d..da9df3e 100644
 --- a/lib/private/log/owncloud.php
 +++ b/lib/private/log/owncloud.php
-@@ -33,7 +33,7 @@ class OC_Log_Owncloud {
+@@ -34,7 +34,7 @@ class OC_Log_Owncloud {
  	 * Init class data
  	 */
  	public static function init() {
diff --git a/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch b/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch
index 5d991a5..ed55027 100644
--- a/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch
+++ b/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch
@@ -16,10 +16,10 @@ Gbp: Topic path
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/lib/base.php b/lib/base.php
-index efaeb4b..853c994 100644
+index a566296..95ad5ed 100644
 --- a/lib/base.php
 +++ b/lib/base.php
-@@ -435,13 +435,13 @@ class OC {
+@@ -443,13 +443,13 @@ class OC {
  		// register autoloader
  		require_once __DIR__ . '/autoloader.php';
  		self::$loader = new \OC\Autoloader();

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