[Pkg-owncloud-commits] [owncloud] 32/34: 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 fe4e52062928c27acb66a0e3a648652c59ecea1a
Author: David Prévot <taffit at debian.org>
Date:   Thu Nov 6 17:02:28 2014 -0400

    Refresh patches
---
 debian/patches/0001-Disable-the-appstore.patch     | 8 ++++----
 debian/patches/0002-Fix-displayed-version.patch    | 4 ++--
 debian/patches/0003-Improve-logfile-handling.patch | 4 ++--
 debian/patches/path/0007-Adapt-aws-sdk-path.patch  | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index a04d228..35e2c88 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -23,10 +23,10 @@ Last-Update: 2014-04-22
  8 files changed, 14 insertions(+), 10 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index 54958ce..c09e3cb 100644
+index a7f92d9..fb48959 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -512,8 +512,9 @@ $CONFIG = array(
+@@ -521,8 +521,9 @@ $CONFIG = array(
  
  /**
   * When enabled, admins may install apps from the ownCloud app store.
@@ -37,7 +37,7 @@ index 54958ce..c09e3cb 100644
  
  /**
   * The URL of the appstore to use.
-@@ -527,12 +528,13 @@ $CONFIG = array(
+@@ -536,12 +537,13 @@ $CONFIG = array(
   * file system path to the app folder. The key ``url`` defines the HTTP web path
   * to that folder, starting from the ownCloud web root. The key ``writable``
   * indicates if a web server can write files to that folder.
@@ -93,7 +93,7 @@ index dc147de..52db11c 100644
  		}
  
 diff --git a/lib/private/setup.php b/lib/private/setup.php
-index 1a3ae58..9921018 100644
+index 2d6cede..b4b9f0d 100644
 --- a/lib/private/setup.php
 +++ b/lib/private/setup.php
 @@ -186,6 +186,8 @@ class OC_Setup {
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index 80b4111..cb89ba8 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, 3 insertions(+), 3 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index c09e3cb..80f539f 100644
+index fb48959..df81faa 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -397,7 +397,7 @@ $CONFIG = array(
+@@ -406,7 +406,7 @@ $CONFIG = array(
   * Check if ownCloud is up-to-date and shows a notification if a new version is
   * available.
   */
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index bdafd54..78712e0 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -14,10 +14,10 @@ Last-Update: 2013-10-23
  3 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index 80f539f..a0dc030 100644
+index df81faa..dfb774a 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -433,8 +433,9 @@ $CONFIG = array(
+@@ -442,8 +442,9 @@ $CONFIG = array(
  
  /**
   * Change the ownCloud logfile name from ``owncloud.log`` to something else.
diff --git a/debian/patches/path/0007-Adapt-aws-sdk-path.patch b/debian/patches/path/0007-Adapt-aws-sdk-path.patch
index 62c3809..5c1810d 100644
--- a/debian/patches/path/0007-Adapt-aws-sdk-path.patch
+++ b/debian/patches/path/0007-Adapt-aws-sdk-path.patch
@@ -12,7 +12,7 @@ Gbp: Topic path
  1 file changed, 4 deletions(-)
 
 diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
-index 77c5f82..cd2bab5 100644
+index a3fe183..7f88c4a 100644
 --- a/apps/files_external/lib/amazons3.php
 +++ b/apps/files_external/lib/amazons3.php
 @@ -24,10 +24,6 @@

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