[Pkg-owncloud-commits] [owncloud] 72/74: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Tue Dec 2 22:04:42 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit bbc2a92c511f0969faa4387309dc45ef3fd21abe
Author: David Prévot <taffit at debian.org>
Date: Mon Dec 1 18:18:05 2014 -0400
Refresh patches
---
debian/patches/0001-Disable-the-appstore.patch | 20 ++++++++++----------
debian/patches/0002-Fix-displayed-version.patch | 8 ++++----
debian/patches/0003-Improve-logfile-handling.patch | 8 ++++----
...Doctrine-Symphony-Patchwork-and-Pimple-path.patch | 2 +-
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 35e2c88..75dcb8a 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -23,21 +23,21 @@ 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 a7f92d9..fb48959 100644
+index c073d94..f237f9f 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -521,8 +521,9 @@ $CONFIG = array(
-
+@@ -523,8 +523,9 @@ $CONFIG = array(
/**
* When enabled, admins may install apps from the ownCloud app store.
-+ * Debian: disabled by default, see /usr/share/doc/owncloud/README.Debian
+ * The app store is disabled by default for ownCloud Enterprise Edition
++ * and for Debian, see /usr/share/doc/owncloud/README.Debian
*/
-'appstoreenabled' => true,
+'appstoreenabled' => false,
/**
* The URL of the appstore to use.
-@@ -536,12 +537,13 @@ $CONFIG = array(
+@@ -538,12 +539,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.
@@ -54,7 +54,7 @@ index a7f92d9..fb48959 100644
),
diff --git a/lib/base.php b/lib/base.php
-index 4cd9203..d39432a 100644
+index 27b1233..78f4968 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -157,7 +157,7 @@ class OC {
@@ -67,7 +67,7 @@ index 4cd9203..d39432a 100644
OC::$APPSROOTS[] = array(
'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
diff --git a/lib/private/app.php b/lib/private/app.php
-index 20c0f5f..ecfe180 100644
+index 9712775..f1984a9 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -487,7 +487,7 @@ class OC_App {
@@ -93,10 +93,10 @@ index dc147de..52db11c 100644
}
diff --git a/lib/private/setup.php b/lib/private/setup.php
-index 2d6cede..b4b9f0d 100644
+index a18c72d..e95c613 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
-@@ -186,6 +186,8 @@ class OC_Setup {
+@@ -189,6 +189,8 @@ class OC_Setup {
OC_Config::setValue('overwrite.cli.url', \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . OC::$WEBROOT);
OC_Config::setValue('dbtype', $dbtype);
OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
@@ -106,7 +106,7 @@ index 2d6cede..b4b9f0d 100644
$dbSetup->initialize($options);
$dbSetup->setupDatabase($username);
diff --git a/lib/private/util.php b/lib/private/util.php
-index 08de46b..484b84c 100644
+index 2642a71..fa6c12d 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -442,7 +442,7 @@ class OC_Util {
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index cb89ba8..00b714d 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 fb48959..df81faa 100644
+index f237f9f..d07aef1 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -406,7 +406,7 @@ $CONFIG = array(
+@@ -407,7 +407,7 @@ $CONFIG = array(
* Check if ownCloud is up-to-date and shows a notification if a new version is
* available.
*/
@@ -44,10 +44,10 @@ 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 484b84c..360b170 100644
+index fa6c12d..b87449c 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1309,7 +1309,7 @@ class OC_Util {
+@@ -1316,7 +1316,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 78712e0..e3c900b 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 df81faa..dfb774a 100644
+index d07aef1..f90313d 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -442,8 +442,9 @@ $CONFIG = array(
+@@ -443,8 +443,9 @@ $CONFIG = array(
/**
* Change the ownCloud logfile name from ``owncloud.log`` to something else.
@@ -29,10 +29,10 @@ index df81faa..dfb774a 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 d39432a..25992b2 100644
+index 78f4968..8e9686b 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -615,7 +615,7 @@ class OC {
+@@ -609,7 +609,7 @@ class OC {
if (OC_Config::getValue('installed', false) && OC_Config::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/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch b/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
index 77e8257..cde5b61 100644
--- a/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
+++ b/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
@@ -14,7 +14,7 @@ Gbp: Topic path
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/base.php b/lib/base.php
-index 25992b2..93eb6a6 100644
+index 8e9686b..c1217d5 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -431,12 +431,12 @@ class OC {
--
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