[Pkg-owncloud-commits] [owncloud] 163/165: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Thu Apr 23 04:07:01 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 814c4cc3f025d2b612527ccc6851dcb9f27b43b7
Author: David Prévot <taffit at debian.org>
Date: Wed Apr 22 23:06:40 2015 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 4 +-
debian/patches/0002-Fix-displayed-version.patch | 2 +-
debian/patches/0003-Improve-logfile-handling.patch | 6 +--
...lace-_method-requirement-by-g-s-etMethods.patch | 46 ----------------------
debian/patches/path/0007-Adapt-Dropbox-path.patch | 2 +-
debian/patches/series | 1 -
6 files changed, 7 insertions(+), 54 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index d6a1ef3..34d8617 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -21,7 +21,7 @@ Last-Update: 2014-04-22
6 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index e3b81f6..4c4d5cd 100644
+index 61ae595..4e74381 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -568,8 +568,9 @@ $CONFIG = array(
@@ -52,7 +52,7 @@ index e3b81f6..4c4d5cd 100644
),
diff --git a/lib/base.php b/lib/base.php
-index f0c5464..4f012a6 100644
+index 7e61835..e0dae5d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -205,7 +205,7 @@ class OC {
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index 762ca32..c798dcf 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 4c4d5cd..89ddcb2 100644
+index 4e74381..0532f27 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -430,7 +430,7 @@ $CONFIG = array(
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index d5e9719..0ba2719 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 89ddcb2..4644cb0 100644
+index 0532f27..4f595bd 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -477,8 +477,9 @@ $CONFIG = array(
@@ -29,10 +29,10 @@ index 89ddcb2..4644cb0 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 4f012a6..57eea17 100644
+index e0dae5d..f4ca053 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -760,7 +760,7 @@ class OC {
+@@ -744,7 +744,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/0010-Replace-_method-requirement-by-g-s-etMethods.patch b/debian/patches/0010-Replace-_method-requirement-by-g-s-etMethods.patch
deleted file mode 100644
index 3e1cfa3..0000000
--- a/debian/patches/0010-Replace-_method-requirement-by-g-s-etMethods.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Sun, 19 Apr 2015 12:00:58 -0400
-Subject: Replace `_method` requirement by {g,s}etMethods()
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-Make the call compatible with future Symfony version, and avoid
-E_USER_DEPRECATED as thrown by the current 2.7.0-beta1:
-
-The "_method" requirement is deprecated since version 2.2 and will be
-removed in 3.0. Use getMethods() instead. at
-…/Symfony/Component/Routing/Route.php#554
-
-The "_method" requirement is deprecated since version 2.2 and will be
-removed in 3.0. Use the setMethods() method instead or the "methods"
-option in the route definition. at
-…/Symfony/Component/Routing/Route.php#662
-
-Forwarded: https://github.com/owncloud/core/pull/15739
----
- lib/private/route/route.php | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/private/route/route.php b/lib/private/route/route.php
-index cb864d3..b33360f 100644
---- a/lib/private/route/route.php
-+++ b/lib/private/route/route.php
-@@ -37,7 +37,7 @@ class Route extends SymfonyRoute implements IRoute {
- * @return \OC\Route\Route
- */
- public function method($method) {
-- $this->setRequirement('_method', strtoupper($method));
-+ $this->setMethods($method);
- return $this;
- }
-
-@@ -109,7 +109,7 @@ class Route extends SymfonyRoute implements IRoute {
- * @return \OC\Route\Route
- */
- public function requirements($requirements) {
-- $method = $this->getRequirement('_method');
-+ $method = $this->getMethods();
- $this->setRequirements($requirements);
- if (isset($requirements['_method'])) {
- $method = $requirements['_method'];
diff --git a/debian/patches/path/0007-Adapt-Dropbox-path.patch b/debian/patches/path/0007-Adapt-Dropbox-path.patch
index 2d6bad2..82d42ab 100644
--- a/debian/patches/path/0007-Adapt-Dropbox-path.patch
+++ b/debian/patches/path/0007-Adapt-Dropbox-path.patch
@@ -27,7 +27,7 @@ index 495387b..c1d9be4 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 b685f63..f606490 100644
+index 78219f8..3b30836 100644
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -29,7 +29,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index 40ba465..8085f16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@ path/0006-Adapt-google-api-php-client-path.patch
path/0007-Adapt-Dropbox-path.patch
0008-use-JSqueeze-instead-of-JSMin-13052.patch
0009-updating-ZipStreamer.patch
-0010-Replace-_method-requirement-by-g-s-etMethods.patch
--
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