[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.6+dfsg-1-5-g87266d0

[David Prévot]

The following commit has been merged in the master branch:
commit 87266d0a580b245a846e1ba9bde8288ebb71add9
Author: David Prévot <taffit at debian.org>
Date:   Mon Jun 3 12:18:38 2013 -0400

    Refresh patches

diff --git a/debian/patches/01_fix_data_path.diff b/debian/patches/01_fix_data_path.diff
index a6f36fd..63b69dc 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-05-06
+Last-Update: 2013-06-03
 --- a/lib/config.php
 +++ b/lib/config.php
 @@ -130,12 +130,12 @@
@@ -46,7 +46,7 @@ Last-Update: 2013-05-06
  		//first set up the local "root" storage
  		if(!self::$rootMounted) {
  			\OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir'=>$CONFIG_DATADIRECTORY), '/');
-@@ -182,7 +182,7 @@
+@@ -183,7 +183,7 @@
  			.' to the ownCloud directory';
  
  		// Check if config folder is writable.
@@ -55,7 +55,7 @@ Last-Update: 2013-05-06
  			$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');
-@@ -198,7 +198,7 @@
+@@ -199,7 +199,7 @@
  					.' to the apps directory in owncloud or disabling the appstore in the config file.');
  			}
  		}
@@ -64,7 +64,7 @@ Last-Update: 2013-05-06
  		// Create root dir.
  		if(!is_dir($CONFIG_DATADIRECTORY)) {
  			$success=@mkdir($CONFIG_DATADIRECTORY);
-@@ -530,7 +530,7 @@
+@@ -536,7 +536,7 @@
  		$testcontent='testcontent';
  
  		// creating a test file
@@ -150,7 +150,7 @@ Last-Update: 2013-05-06
  
  			// Emit and exit
  			OC_Hook::emit( "OC_User", "post_deleteUser", array( "uid" => $uid ));
-@@ -495,7 +495,7 @@
+@@ -496,7 +496,7 @@
  				}
  			}
  		}
@@ -214,7 +214,7 @@ Last-Update: 2013-05-06
  	$vulnerableToNullByte = true;
 --- a/cron.php
 +++ b/cron.php
-@@ -76,7 +76,7 @@
+@@ -75,7 +75,7 @@
  
  if( OC::$CLI ) {
  	// Create lock file first
diff --git a/debian/patches/05_no_app_store.diff b/debian/patches/05_no_app_store.diff
index 76be7c4..0624b62 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-05-06
+Last-Update: 2013-06-03
 --- a/lib/setup.php
 +++ b/lib/setup.php
 @@ -87,6 +87,8 @@
@@ -107,7 +107,7 @@ Last-Update: 2013-05-06
  
 --- a/lib/util.php
 +++ b/lib/util.php
-@@ -189,7 +189,7 @@
+@@ -190,7 +190,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 7e9ac35..29bd507 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-04-10
+Last-Update: 2013-06-03
 --- a/lib/updater.php
 +++ b/lib/updater.php
 @@ -71,7 +71,7 @@
@@ -29,7 +29,7 @@ Last-Update: 2013-04-10
  </fieldset>
 --- a/settings/templates/personal.php
 +++ b/settings/templates/personal.php
-@@ -100,7 +100,7 @@
+@@ -106,7 +106,7 @@
  
  <fieldset class="personalblock">
  	<legend><strong><?php p($l->t('Version'));?></strong></legend>

-- 
owncloud.git