[Pkg-owncloud-commits] [owncloud] 47/49: Refresh patches

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 2e2acbe2f3d10fef6d0cfb91b996be63ee5bdfe1
Author: David Prévot <taffit at debian.org>
Date:   Thu Dec 5 11:01:25 2013 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 debian/patches/0001-Disable-the-appstore.patch     | 6 +++---
 debian/patches/0002-Fix-displayed-version.patch    | 8 ++++----
 debian/patches/0003-Improve-logfile-handling.patch | 4 ++--
 debian/patches/path/0011-Adapt-aws-sdk-path.patch  | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index f8ad675..2b52041 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -22,7 +22,7 @@ Last-Update: 2013-10-23
  7 files changed, 18 insertions(+), 13 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index 7b533a8..bf323c5 100644
+index ba06896..ff3ab1c 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -71,8 +71,10 @@ $CONFIG = array(
@@ -38,7 +38,7 @@ index 7b533a8..bf323c5 100644
  
  /* URL of the appstore to use, server should understand OCS */
  "appstoreurl" => "http://api.apps.owncloud.com/v1",
-@@ -197,11 +199,12 @@ $CONFIG = array(
+@@ -200,11 +202,12 @@ $CONFIG = array(
   key 'path' is for the fs path and the key 'url' is for the http path to your
   applications paths. 'writable' indicates whether 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
@@ -135,7 +135,7 @@ index b5c530a..595495d 100644
  			$dbSetup->initialize($options);
  			$dbSetup->setupDatabase($username);
 diff --git a/lib/private/util.php b/lib/private/util.php
-index 38de07a..c0aba82 100644
+index a73564b..790280c 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
 @@ -322,7 +322,7 @@ class OC_Util {
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index c408d74..ee89992 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -18,10 +18,10 @@ Last-Update: 2013-10-17
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index bf323c5..22624d6 100644
+index ff3ab1c..369d679 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -125,8 +125,8 @@ $CONFIG = array(
+@@ -128,8 +128,8 @@ $CONFIG = array(
  /* Check 3rdparty apps for malicious code fragments */
  "appcodechecker" => "",
  
@@ -46,10 +46,10 @@ index 625f342..ed21f88 100644
  				if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array() && OC_User::isAdminUser(OC_User::getUser())) {
  					$this->assign('updateAvailable', true);
 diff --git a/lib/private/util.php b/lib/private/util.php
-index c0aba82..6c24b6b 100644
+index 790280c..13a7618 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
-@@ -1117,7 +1117,7 @@ class OC_Util {
+@@ -1125,7 +1125,7 @@ class OC_Util {
  	 * @return string
  	 */
  	public static function getHumanVersion() {
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index 610675e..e0205fa 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -13,10 +13,10 @@ Last-Update: 2013-10-23
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index 22624d6..673976f 100644
+index 369d679..d3a8efd 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -140,7 +140,7 @@ $CONFIG = array(
+@@ -143,7 +143,7 @@ $CONFIG = array(
  /* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
  "log_type" => "owncloud",
  
diff --git a/debian/patches/path/0011-Adapt-aws-sdk-path.patch b/debian/patches/path/0011-Adapt-aws-sdk-path.patch
index 994cc07..69d3af7 100644
--- a/debian/patches/path/0011-Adapt-aws-sdk-path.patch
+++ b/debian/patches/path/0011-Adapt-aws-sdk-path.patch
@@ -12,7 +12,7 @@ Last-Update: 2013-10-14
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
-index 9a682fb..4d98cd4 100644
+index 00baacd..c9e8da8 100644
 --- a/apps/files_external/lib/amazons3.php
 +++ b/apps/files_external/lib/amazons3.php
 @@ -25,8 +25,7 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git