[Pkg-owncloud-commits] [owncloud] 05/07: Refresh patches

[David Prévot]

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

taffit pushed a commit to branch 5.0
in repository owncloud.

commit b794a20841de9ee191f885a99de607b4df98ab96
Author: David Prévot <taffit at debian.org>
Date:   Thu Oct 31 23:31:00 2013 -0400

    Refresh patches
---
 debian/patches/fix_displayed_version.diff |    6 +++---
 debian/patches/fix_log_path.diff          |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/fix_displayed_version.diff b/debian/patches/fix_displayed_version.diff
index 88c59a4..e678bfc 100644
--- a/debian/patches/fix_displayed_version.diff
+++ b/debian/patches/fix_displayed_version.diff
@@ -4,17 +4,17 @@ Description: Fix displayed version
  displayed version fixed to make it clear that’s a Debian package.
 Author: David Prévot <taffit at debian.org>
 Forwarded: not-needed
-Last-Update: 2013-08-20
+Last-Update: 2013-10-31
 --- a/lib/updater.php
 +++ b/lib/updater.php
-@@ -73,7 +73,7 @@
+@@ -72,7 +72,7 @@
  	public static function ShowUpdatingHint() {
  		$l = OC_L10N::get('lib');
  
 -		if(OC_Config::getValue('updatechecker', true)==true) {
 +		if(OC_Config::getValue('updatechecker', false)==true) {
  			$data=OC_Updater::check();
- 			if(isset($data['version']) and $data['version']<>'') {
+ 			if(isset($data['version']) && !empty($data['version'])) {
  				$txt='<span style="color:#AA0000; font-weight:bold;">'
 --- a/settings/templates/admin.php
 +++ b/settings/templates/admin.php
diff --git a/debian/patches/fix_log_path.diff b/debian/patches/fix_log_path.diff
index 046276d..5eee9c1 100644
--- a/debian/patches/fix_log_path.diff
+++ b/debian/patches/fix_log_path.diff
@@ -3,7 +3,7 @@ Description: Improve logfile handling
 Author: David Prévot <taffit at debian.org>
 Bug-Debian: http://bugs.debian.org/715484
 Forwarded: not-needed
-Last-Update: 2013-08-20
+Last-Update: 2013-10-31
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -131,7 +131,7 @@
@@ -24,5 +24,5 @@ Last-Update: 2013-08-20
 -		$defaultLogFile = OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data').'/owncloud.log';
 +		$defaultLogFile = '/var/log/owncloud.log';
  		self::$logFile = OC_Config::getValue("logfile", $defaultLogFile);
- 		if (!file_exists(self::$logFile)) {
- 			self::$logFile = $defaultLogFile;
+ 
+ 		/*

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