[Pkg-owncloud-commits] [owncloud] 116/118: Refresh patches

Fri Mar 27 22:13:21 UTC 2015

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit fb04cce435dc8013a5d8fbb3619b2244ee708e85
Author: David Prévot <taffit at debian.org>
Date:   Fri Mar 27 15:50:48 2015 -0400

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

diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 4330ebb..92c699c 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -22,10 +22,10 @@ Last-Update: 2014-04-22
  7 files changed, 11 insertions(+), 9 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index c98ce25..2da6a54 100644
+index 0423adc..bd61a75 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -556,8 +556,9 @@ $CONFIG = array(
+@@ -557,8 +557,9 @@ $CONFIG = array(
  /**
   * When enabled, admins may install apps from the ownCloud app store.
   * The app store is disabled by default for ownCloud Enterprise Edition
@@ -36,7 +36,7 @@ index c98ce25..2da6a54 100644
  
  /**
   * The URL of the appstore to use.
-@@ -571,12 +572,13 @@ $CONFIG = array(
+@@ -572,12 +573,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.
@@ -53,7 +53,7 @@ index c98ce25..2da6a54 100644
  ),
  
 diff --git a/lib/base.php b/lib/base.php
-index ae9a7b2..42283f6 100644
+index 8609743..55adf0b 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -157,7 +157,7 @@ class OC {
@@ -92,7 +92,7 @@ index 7ce6723..b779836 100644
  		}
  
 diff --git a/lib/private/util.php b/lib/private/util.php
-index 4e69bf2..e0f3363 100644
+index 9454d9f..3b4ca13 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
 @@ -515,7 +515,7 @@ class OC_Util {
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index d9acd8c..1e5a863 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 2da6a54..d1cad75 100644
+index bd61a75..1908918 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -429,7 +429,7 @@ $CONFIG = array(
+@@ -430,7 +430,7 @@ $CONFIG = array(
   * Check if ownCloud is up-to-date and shows a notification if a new version is
   * available.
   */
@@ -44,7 +44,7 @@ index f8cee15..99b10e4 100644
  				$updater = new \OC\Updater(\OC::$server->getHTTPHelper(),
  					\OC::$server->getConfig());
 diff --git a/lib/private/util.php b/lib/private/util.php
-index e0f3363..2e1d96c 100644
+index 3b4ca13..912ad27 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
 @@ -1337,7 +1337,7 @@ class OC_Util {
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index 99e6bb7..18af032 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 d1cad75..5e5894f 100644
+index 1908918..f71ee84 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -476,8 +476,9 @@ $CONFIG = array(
+@@ -477,8 +477,9 @@ $CONFIG = array(
  
  /**
   * Change the ownCloud logfile name from ``owncloud.log`` to something else.
@@ -29,10 +29,10 @@ index d1cad75..5e5894f 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 42283f6..666639a 100644
+index 55adf0b..5be7de6 100644
 --- a/lib/base.php
 +++ b/lib/base.php
-@@ -660,7 +660,7 @@ class OC {
+@@ -675,7 +675,7 @@ class OC {
  		if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !\OCP\Util::needUpgrade()) {
  			//don't try to do this before we are properly setup
  			//use custom logfile path if defined, otherwise use default of owncloud.log in data directory
diff --git a/debian/patches/path/0006-Adapt-Dropbox-path.patch b/debian/patches/path/0006-Adapt-Dropbox-path.patch
index f62dd37..5e1a3ed 100644
--- a/debian/patches/path/0006-Adapt-Dropbox-path.patch
+++ b/debian/patches/path/0006-Adapt-Dropbox-path.patch
@@ -26,7 +26,7 @@ index db417de..0fba990 100644
  OCP\JSON::checkAppEnabled('files_external');
  OCP\JSON::checkLoggedIn();
 diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
-index cc1e628..b7c0978 100644
+index 30ca431..89340f7 100644
 --- a/apps/files_external/lib/dropbox.php
 +++ b/apps/files_external/lib/dropbox.php
 @@ -22,7 +22,7 @@

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

