[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.2debian-1-6-g82737dc

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 3585b92a58e1df47524d1b2293adf0b62d83fcec
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri Jun 22 15:36:39 2012 +0200

    Update 05_no_app_store.diff to deal with the 'writable_appsdir' option

diff --git a/debian/changelog b/debian/changelog
index 644001c..682c598 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-owncloud (4.0.2debian-2) UNRELEASED; urgency=low
+owncloud (4.0.3debian-1) UNRELEASED; urgency=medium
 
+  * New upstream bugfix release.
   * debian/config/lighttpd, debian/owncloud.examples:  add and install
     lighttpd example config file.
+  * debian/patches:
+    - Updated 05_no_app_store.diff for new upstream and also to also take
+      the new "writable_appsdir" option into account.
 
  -- Paul van Tilburg <paulvt at debian.org>  Sun, 17 Jun 2012 14:39:50 +0200
 
diff --git a/debian/patches/05_no_app_store.diff b/debian/patches/05_no_app_store.diff
index 146d945..fc8f4e6 100644
--- a/debian/patches/05_no_app_store.diff
+++ b/debian/patches/05_no_app_store.diff
@@ -5,11 +5,12 @@ Forwarded: not-needed
 
 --- a/lib/setup.php
 +++ b/lib/setup.php
-@@ -81,6 +81,7 @@
+@@ -81,6 +81,8 @@
  			OC_Config::setValue('datadirectory', $datadir);
   			OC_Config::setValue('dbtype', $dbtype);
   			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
 +			OC_Config::setValue('appstoreenabled', false);
++			OC_Config::setValue('writable_appsdir', false);
  			if($dbtype == 'mysql') {
  				$dbuser = $options['dbuser'];
  				$dbpass = $options['dbpass'];
@@ -19,22 +20,37 @@ Forwarded: not-needed
  		}
  
  		// Check if apps folder is writable.
--		if(!is_writable(OC::$SERVERROOT."/apps/")) {
-+		if(OC_Config::getValue( "appstoreenabled", false ) && !is_writable(OC::$SERVERROOT."/apps/")) {
+-		if(OC_Config::getValue('writable_appsdir', true) && !is_writable(OC::$SERVERROOT."/apps/")) {
++		if(OC_Config::getValue('writable_appsdir', false) && !is_writable(OC::$SERVERROOT."/apps/")) {
  			$tmpl = new OC_Template( '', 'error', 'guest' );
  			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into apps directory 'apps'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
  			$tmpl->printPage();
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -18,7 +18,7 @@
- "defaultapp" => "files",
+@@ -31,8 +31,10 @@
  "knowledgebaseenabled" => true,
- "knowledgebaseurl" => "",
+ /* URL to use for the help page, server should understand OCS */
+ "knowledgebaseurl" => "http://api.apps.owncloud.com/v1",
+-/* Enable installing apps from the appstore */
 -"appstoreenabled" => true,
++/* Enable installing apps from the appstore
++ * DEBIAN: disabled by default, see /usr/share/doc/owncloud/README.Debian
++ */
 +"appstoreenabled" => false,
- "appstoreurl" => "",
- "mail_smtpmode" => "sendmail",
- "mail_smtphost" => "127.0.0.1",
+ /* URL of the appstore to use, server should understand OCS */
+ "appstoreurl" => "http://api.apps.owncloud.com/v1",
+ /* Mode to use for sending mail, can be sendmail, smtp, qmail or php, see PHPMailer docs */
+@@ -60,8 +62,9 @@
+ /* Set this to false to disable the check for writable apps dir.
+  * If the apps dir is not writable, you can't download&install extra apps
+  * in the admin apps menu.
++ * DEBIAN: disabled by default, see /usr/share/doc/owncloud/README.Debian
+  */
+-"writable_appsdir" => true,
++"writable_appsdir" => false,
+ /* The directory where the user data is stored, default to data in the owncloud
+  * directory. The sqlite database is also stored here, when sqlite is used.
+  */
 --- a/lib/ocsclient.php
 +++ b/lib/ocsclient.php
 @@ -96,7 +96,7 @@

-- 
owncloud.git