[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.7+dfsg-2-19-g53f1965
David Prévot
taffit at debian.org
Wed Jul 10 18:54:24 UTC 2013
The following commit has been merged in the master branch:
commit 023afb9bd0bbad1ffa7c89a1dd206e74118f24b0
Author: David Prévot <taffit at debian.org>
Date: Wed Jul 10 13:13:59 2013 -0400
Refresh patches
Git-Dch: Ignore
diff --git a/debian/patches/01_fix_data_path.diff b/debian/patches/01_fix_data_path.diff
index 63b69dc..68925aa 100644
--- a/debian/patches/01_fix_data_path.diff
+++ b/debian/patches/01_fix_data_path.diff
@@ -8,7 +8,7 @@ Author: Thomas Mueller <thomas.mueller at tmit.eu>
Bug-Debian: http://bugs.debian.org/648674
Forwarded: not-needed
Reviewed-by: David Prévot <taffit at debian.org>
-Last-Update: 2013-06-03
+Last-Update: 2013-07-10
--- a/lib/config.php
+++ b/lib/config.php
@@ -130,12 +130,12 @@
@@ -26,7 +26,7 @@ Last-Update: 2013-06-03
if( isset( $CONFIG ) && is_array( $CONFIG )) {
self::$cache = $CONFIG;
}
-@@ -159,7 +159,7 @@
+@@ -161,7 +161,7 @@
$content .= var_export(self::$cache, true);
$content .= ";\n";
@@ -46,17 +46,17 @@ Last-Update: 2013-06-03
//first set up the local "root" storage
if(!self::$rootMounted) {
\OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir'=>$CONFIG_DATADIRECTORY), '/');
-@@ -183,7 +183,7 @@
- .' to the ownCloud directory';
+@@ -186,7 +186,7 @@
+ .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the root directory</a>.';
// Check if config folder is writable.
- if(!is_writable(OC::$SERVERROOT."/config/") or !is_readable(OC::$SERVERROOT."/config/")) {
+ if(!is_writable("/etc/owncloud/") or !is_readable("/etc/owncloud/")) {
- $errors[]=array('error'=>"Can't write into config directory 'config'",
- 'hint'=>'You can usually fix this by giving the webserver user write access'
- .' to the config directory in owncloud');
-@@ -199,7 +199,7 @@
- .' to the apps directory in owncloud or disabling the appstore in the config file.');
+ $errors[] = array(
+ 'error' => "Can't write into config directory",
+ 'hint' => 'This can usually be fixed by '
+@@ -207,7 +207,7 @@
+ );
}
}
- $CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
@@ -64,7 +64,7 @@ Last-Update: 2013-06-03
// Create root dir.
if(!is_dir($CONFIG_DATADIRECTORY)) {
$success=@mkdir($CONFIG_DATADIRECTORY);
-@@ -536,7 +536,7 @@
+@@ -545,7 +545,7 @@
$testcontent='testcontent';
// creating a test file
@@ -125,9 +125,9 @@ Last-Update: 2013-06-03
- and !is_writable(OC::$SERVERROOT . "/config/config.php")) {
+ if (file_exists("/etc/owncloud/config.php")
+ and !is_writable("/etc/owncloud/config.php")) {
+ $defaults = new OC_Defaults();
$tmpl = new OC_Template('', 'error', 'guest');
$tmpl->assign('errors', array(1 => array(
- 'error' => "Can't write into config directory 'config'",
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -466,7 +466,7 @@
@@ -283,7 +283,7 @@ Last-Update: 2013-06-03
self::$logFile = $defaultLogFile;
--- a/lib/setup.php
+++ b/lib/setup.php
-@@ -840,8 +840,8 @@
+@@ -851,8 +851,8 @@
public static function protectDataDirectory() {
$content = "deny from all\n";
$content.= "IndexIgnore *";
diff --git a/debian/patches/05_no_app_store.diff b/debian/patches/05_no_app_store.diff
index 0624b62..3fbd001 100644
--- a/debian/patches/05_no_app_store.diff
+++ b/debian/patches/05_no_app_store.diff
@@ -3,7 +3,7 @@ Description: Disable the app store
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Forwarded: not-needed
Reviewed-by: David Prévot <taffit at debian.org>
-Last-Update: 2013-06-03
+Last-Update: 2013-07-10
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -87,6 +87,8 @@
@@ -30,7 +30,7 @@ Last-Update: 2013-06-03
/* URL of the appstore to use, server should understand OCS */
"appstoreurl" => "http://api.apps.owncloud.com/v1",
-@@ -156,11 +158,12 @@
+@@ -159,11 +161,12 @@
key 'path' is for the fs path and the key 'url' is for the http path to your
applications paths. 'writable' indicate if the user can install apps in this folder.
You must have at least 1 app folder writable or you must set the parameter : appstoreenabled to false
@@ -85,7 +85,7 @@ Last-Update: 2013-06-03
$url=OC_OCSClient::getAppStoreURL().'/content/download/'.urlencode($id).'/'.urlencode($item);
--- a/lib/app.php
+++ b/lib/app.php
-@@ -433,7 +433,7 @@
+@@ -444,7 +444,7 @@
* Get the path where to install apps
*/
public static function getInstallPath() {
@@ -107,7 +107,7 @@ Last-Update: 2013-06-03
--- a/lib/util.php
+++ b/lib/util.php
-@@ -190,7 +190,7 @@
+@@ -195,7 +195,7 @@
}
// Check if there is a writable install folder.
diff --git a/debian/patches/fix_displayed_version.diff b/debian/patches/fix_displayed_version.diff
index 29bd507..6e8e8fe 100644
--- a/debian/patches/fix_displayed_version.diff
+++ b/debian/patches/fix_displayed_version.diff
@@ -4,7 +4,7 @@ Description: Fix displayed version
displayed version fixed to make it clear that’s a Debian package.
Author: David Prévot <taffit at debian.org>
Forwarded: not-needed
-Last-Update: 2013-06-03
+Last-Update: 2013-07-10
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -71,7 +71,7 @@
@@ -18,23 +18,23 @@ Last-Update: 2013-06-03
$txt='<span style="color:#AA0000; font-weight:bold;">'
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
-@@ -228,7 +228,7 @@
+@@ -229,7 +229,7 @@
<fieldset class="personalblock">
<legend><strong><?php p($l->t('Version'));?></strong></legend>
-- <strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?> <?php p(OC_Util::getEditionString()); ?>
-+ <strong>ownCloud</strong> @VERSION@ <?php p(OC_Util::getEditionString()); ?>
+- <strong><?php p($defaults->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?>
++ <strong><?php p($defaults->getName()); ?></strong> @VERSION@
+ <?php if (OC_Util::getEditionString() === ''): ?>
(<?php print_unescaped(OC_Updater::ShowUpdatingHint()); ?>)<br/>
<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
- </fieldset>
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
-@@ -106,7 +106,7 @@
+@@ -111,7 +111,7 @@
<fieldset class="personalblock">
<legend><strong><?php p($l->t('Version'));?></strong></legend>
-- <strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?>
-+ <strong>ownCloud</strong> @VERSION@
- <?php p(OC_Util::getEditionString()); ?> <br />
+- <strong><?php p($defaults->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?><br/>
++ <strong><?php p($defaults->getName()); ?></strong> @VERSION@<br/>
+ <?php if (OC_Util::getEditionString() === ''): ?>
<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
- </fieldset>
+ <?php endif; ?>
--
owncloud.git
More information about the Pkg-owncloud-commits
mailing list