[Pkg-owncloud-commits] [owncloud] 31/38: Refresh patches

David Prévot taffit at moszumanska.debian.org
Wed Mar 11 15:16:31 UTC 2015


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

taffit pushed a commit to branch master
in repository owncloud.

commit c96c6ed7ce577fc98e9fdd003f04421e076b89aa
Author: David Prévot <taffit at debian.org>
Date:   Sat Feb 21 10:52:45 2015 -0400

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

diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 5025b09..54adaaf 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 673cede..0691723 100644
+index 3ddf0a6..0b22049 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -539,8 +539,9 @@ $CONFIG = array(
@@ -106,10 +106,10 @@ index a958aba..216d313 100644
  			$dbSetup->initialize($options);
  			$dbSetup->setupDatabase($username);
 diff --git a/lib/private/util.php b/lib/private/util.php
-index 2642a71..fa6c12d 100644
+index f02a990..50e3d60 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
-@@ -442,7 +442,7 @@ class OC_Util {
+@@ -437,7 +437,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 79a3606..7e33cd4 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 0691723..130c4c0 100644
+index 0b22049..b5988f5 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -414,7 +414,7 @@ $CONFIG = array(
@@ -44,7 +44,7 @@ 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 fa6c12d..b87449c 100644
+index 50e3d60..151f9f8 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
 @@ -1316,7 +1316,7 @@ class OC_Util {
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index 3cf0831..8803e1d 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 130c4c0..d6d7b88 100644
+index b5988f5..5104050 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -459,8 +459,9 @@ $CONFIG = array(

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



More information about the Pkg-owncloud-commits mailing list