[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.5_rc1+dfsg-1-13-g4bf08ce

[David Prévot]

The following commit has been merged in the master branch:
commit ed758d77a03edfc341a85a13de0c7f11eee63edb
Author: David Prévot <taffit at debian.org>
Date:   Mon May 6 21:44:15 2013 -0400

    Refresh patches

diff --git a/debian/patches/01_fix_data_path.diff b/debian/patches/01_fix_data_path.diff
index 42ad55e..a6f36fd 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-04-17
+Last-Update: 2013-05-06
 --- a/lib/config.php
 +++ b/lib/config.php
 @@ -130,12 +130,12 @@
@@ -283,7 +283,7 @@ Last-Update: 2013-04-17
  			self::$logFile = $defaultLogFile;
 --- a/lib/setup.php
 +++ b/lib/setup.php
-@@ -836,8 +836,8 @@
+@@ -840,8 +840,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 cb7ccfc..76be7c4 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-04-01
+Last-Update: 2013-05-06
 --- a/lib/setup.php
 +++ b/lib/setup.php
 @@ -87,6 +87,8 @@
@@ -30,7 +30,7 @@ Last-Update: 2013-04-01
  
  /* URL of the appstore to use, server should understand OCS */
  "appstoreurl" => "http://api.apps.owncloud.com/v1",
-@@ -152,11 +154,12 @@
+@@ -156,11 +158,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

-- 
owncloud.git