[Pkg-owncloud-commits] [owncloud] 128/129: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Thu Nov 5 01:04:31 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 87c463739935db2d3808d9cbba9ceac9ab314a49
Author: David Prévot <taffit at debian.org>
Date: Tue Nov 3 20:59:53 2015 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 14 +++++++-------
debian/patches/0002-Fix-displayed-version.patch | 6 +++---
debian/patches/0003-Improve-logfile-handling.patch | 6 +++---
debian/patches/0008-Drop-useless-fallback.patch | 2 +-
debian/patches/path/0007-Adapt-Dropbox-path.patch | 2 +-
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index b51debb..447f07d 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 743d76a..40cfea1 100644
+index 288e3a0..a913ddd 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -617,8 +617,9 @@ $CONFIG = array(
+@@ -625,8 +625,9 @@ $CONFIG = array(
/**
* When enabled, admins may install apps from the ownCloud app store.
@@ -36,7 +36,7 @@ index 743d76a..40cfea1 100644
/**
* The URL of the appstore to use.
-@@ -641,12 +642,13 @@ $CONFIG = array(
+@@ -649,12 +650,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,10 +53,10 @@ index 743d76a..40cfea1 100644
),
diff --git a/lib/base.php b/lib/base.php
-index 12c23f5..51343e9 100644
+index 065a9f8..724475c 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -193,7 +193,7 @@ class OC {
+@@ -205,7 +205,7 @@ class OC {
}
}
} elseif (file_exists(OC::$SERVERROOT . '/apps')) {
@@ -92,7 +92,7 @@ index e2973f8..172657e 100644
/**
diff --git a/lib/private/util.php b/lib/private/util.php
-index 9ea355f..151aca6 100644
+index e51edaf..63107be 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -649,7 +649,7 @@ class OC_Util {
@@ -105,7 +105,7 @@ index 9ea355f..151aca6 100644
|| !is_writable(OC_App::getInstallPath())
|| !is_readable(OC_App::getInstallPath())
diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php
-index 2ff55fc..15c5b58 100644
+index bd0737a..34c95bc 100644
--- a/settings/controller/checksetupcontroller.php
+++ b/settings/controller/checksetupcontroller.php
@@ -163,7 +163,7 @@ class CheckSetupController extends Controller {
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index c65d31e..788d603 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 40cfea1..b72e2c6 100644
+index a913ddd..57b0fe6 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -456,7 +456,7 @@ $CONFIG = array(
@@ -44,10 +44,10 @@ index 7d16823..ae26162 100644
$updater = new \OC\Updater(\OC::$server->getHTTPHelper(),
\OC::$server->getConfig(), \OC::$server->getLogger());
diff --git a/lib/private/util.php b/lib/private/util.php
-index 151aca6..1b82fdd 100644
+index 63107be..a428609 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1452,7 +1452,7 @@ class OC_Util {
+@@ -1454,7 +1454,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 5430e63..be374da 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -15,7 +15,7 @@ Last-Update: 2013-10-23
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index b72e2c6..43bacee 100644
+index 57b0fe6..c9dae6d 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -503,7 +503,7 @@ $CONFIG = array(
@@ -41,10 +41,10 @@ index 6200a8b..28295a9 100644
$rotateSize = $this->config->getSystemValue('log_rotate_size', 0);
diff --git a/lib/base.php b/lib/base.php
-index 51343e9..0157fde 100644
+index 724475c..12fa1ea 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -719,7 +719,7 @@ class OC {
+@@ -739,7 +739,7 @@ class OC {
if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !self::checkUpgrade(false)) {
//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/0008-Drop-useless-fallback.patch b/debian/patches/0008-Drop-useless-fallback.patch
index f0f9030..8d20c1b 100644
--- a/debian/patches/0008-Drop-useless-fallback.patch
+++ b/debian/patches/0008-Drop-useless-fallback.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
1 file changed, 1 deletion(-)
diff --git a/apps/encryption/lib/crypto/crypt.php b/apps/encryption/lib/crypto/crypt.php
-index c55fb00..6e506f2 100644
+index 53a78c2..39690da 100644
--- a/apps/encryption/lib/crypto/crypt.php
+++ b/apps/encryption/lib/crypto/crypt.php
@@ -29,7 +29,6 @@ use OC\Encryption\Exceptions\DecryptionFailedException;
diff --git a/debian/patches/path/0007-Adapt-Dropbox-path.patch b/debian/patches/path/0007-Adapt-Dropbox-path.patch
index c65a067..7abd0b3 100644
--- a/debian/patches/path/0007-Adapt-Dropbox-path.patch
+++ b/debian/patches/path/0007-Adapt-Dropbox-path.patch
@@ -26,7 +26,7 @@ index 3d6736b..6a9ec8a 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 4ab14d4..a297366 100644
+index 6a822c3..acae0ba 100644
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -31,7 +31,7 @@ namespace OC\Files\Storage;
--
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