[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.1debian-2-23-g081cf12

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 081cf129b9518f00d2294cde6c35a655c813251f
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Wed Jun 13 22:46:23 2012 +0200

    Updated 05_no_app_store.diff to set "appstoreenabled" universally to false

diff --git a/debian/changelog b/debian/changelog
index 79d086a..3c54fc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ owncloud (4.0.2debian-1) UNRELEASED; urgency=low
     - Added fix_sabre_requires.diff to fix the require path for Sabre as well.
     - Updated 01_fix_data_path.diff for the new, real location of the
       config (/etc/owncloud).
+    - Updated 05_no_app_store.diff to set the "appstoreenabled" default in
+      the source (and configuration example) universally to "false".
   * debian/watch: updated to use the new releases page.
   * debian/rules, debian/owncloud.install, debian/owncloud.links,
     debian/owncloud.README.Debian, debian/config/:
diff --git a/debian/patches/01_fix_data_path.diff b/debian/patches/01_fix_data_path.diff
index d22c608..6383bc0 100644
--- a/debian/patches/01_fix_data_path.diff
+++ b/debian/patches/01_fix_data_path.diff
@@ -58,7 +58,7 @@ Last-Update: <2011-11-16>
  			$tmpl = new OC_Template( '', 'error', 'guest' );
  			$tmpl->assign('errors',array(1=>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")));
  			$tmpl->printPage();
-@@ -191,8 +191,8 @@
+@@ -200,8 +200,8 @@
  	 * @return array arrays with error messages and hints
  	 */
  	public static function checkServer(){
@@ -68,7 +68,7 @@ Last-Update: <2011-11-16>
 +		$CONFIG_BACKUPDIRECTORY = OC_Config::getValue( "backupdirectory", "/var/lib/owncloud/backup" );
  		$CONFIG_INSTALLED = OC_Config::getValue( "installed", false );
  		$errors=array();
-
+ 
 --- a/lib/setup.php
 +++ b/lib/setup.php
 @@ -3,7 +3,7 @@
diff --git a/debian/patches/05_no_app_store.diff b/debian/patches/05_no_app_store.diff
index 485e044..146d945 100644
--- a/debian/patches/05_no_app_store.diff
+++ b/debian/patches/05_no_app_store.diff
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/lib/setup.php
 +++ b/lib/setup.php
-@@ -77,6 +77,7 @@
+@@ -81,6 +81,7 @@
  			OC_Config::setValue('datadirectory', $datadir);
   			OC_Config::setValue('dbtype', $dbtype);
   			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
@@ -24,3 +24,25 @@ Forwarded: not-needed
  			$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",
+ "knowledgebaseenabled" => true,
+ "knowledgebaseurl" => "",
+-"appstoreenabled" => true,
++"appstoreenabled" => false,
+ "appstoreurl" => "",
+ "mail_smtpmode" => "sendmail",
+ "mail_smtphost" => "127.0.0.1",
+--- a/lib/ocsclient.php
++++ b/lib/ocsclient.php
+@@ -96,7 +96,7 @@
+ 	 * This function returns a list of all the applications on the OCS server
+ 	 */
+ 	public static function getApplications($categories,$page){
+-		if(OC_Config::getValue('appstoreenabled', true)==false){
++		if(OC_Config::getValue('appstoreenabled', false)==false){
+ 			return(array());
+ 		}
+ 

-- 
owncloud.git