[Pkg-owncloud-commits] [owncloud] 68/70: 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 21a84232d4e7ec9d78dcab84a547bed511a0f397
Author: David Prévot <taffit at debian.org>
Date:   Mon Jul 14 12:39:26 2014 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 debian/patches/0001-Disable-the-appstore.patch                 | 10 +++++-----
 debian/patches/0002-Fix-displayed-version.patch                |  2 +-
 debian/patches/0003-Improve-logfile-handling.patch             |  2 +-
 ...005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch |  4 ++--
 debian/patches/path/0007-Adapt-aws-sdk-path.patch              |  2 +-
 5 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 185b2a8..390d35c 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -23,7 +23,7 @@ Last-Update: 2014-04-22
  8 files changed, 19 insertions(+), 14 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index e613609..53bc44a 100644
+index 1bfae36..2cf0ec5 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -84,8 +84,10 @@ $CONFIG = array(
@@ -55,10 +55,10 @@ index e613609..53bc44a 100644
  ),
  'user_backends'=>array(
 diff --git a/lib/base.php b/lib/base.php
-index b526840..71f6c31 100644
+index 840d904..07d25f0 100644
 --- a/lib/base.php
 +++ b/lib/base.php
-@@ -149,7 +149,7 @@ class OC {
+@@ -157,7 +157,7 @@ class OC {
  				}
  			}
  		} elseif (file_exists(OC::$SERVERROOT . '/apps')) {
@@ -68,7 +68,7 @@ index b526840..71f6c31 100644
  			OC::$APPSROOTS[] = array(
  				'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
 diff --git a/lib/private/app.php b/lib/private/app.php
-index 0ca2ca3..a5013d9 100644
+index 7bf04f1..994b312 100644
 --- a/lib/private/app.php
 +++ b/lib/private/app.php
 @@ -445,7 +445,7 @@ class OC_App {
@@ -160,7 +160,7 @@ index b68083f..844a43a 100644
  }
  
 diff --git a/settings/templates/apps.php b/settings/templates/apps.php
-index b35eda4..bf937e8 100644
+index 29fda0e..0d0724d 100644
 --- a/settings/templates/apps.php
 +++ b/settings/templates/apps.php
 @@ -9,7 +9,7 @@
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index 72f2225..b1d364c 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -18,7 +18,7 @@ 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 53bc44a..e1e6394 100644
+index 2cf0ec5..0123c61 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -156,8 +156,8 @@ $CONFIG = array(
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index 122157b..2aae110 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -13,7 +13,7 @@ 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 e1e6394..b13556f 100644
+index 0123c61..9e54c2e 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -171,7 +171,7 @@ $CONFIG = array(
diff --git a/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch b/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
index 3880741..ffafadf 100644
--- a/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
+++ b/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
@@ -15,10 +15,10 @@ Gbp: Topic path
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/lib/base.php b/lib/base.php
-index 71f6c31..c423852 100644
+index 07d25f0..a6e9ce0 100644
 --- a/lib/base.php
 +++ b/lib/base.php
-@@ -423,12 +423,12 @@ class OC {
+@@ -431,12 +431,12 @@ class OC {
  		// register autoloader
  		require_once __DIR__ . '/autoloader.php';
  		self::$loader = new \OC\Autoloader();
diff --git a/debian/patches/path/0007-Adapt-aws-sdk-path.patch b/debian/patches/path/0007-Adapt-aws-sdk-path.patch
index 0c39c28..d8d2ba0 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 7ff17f0..00294ad 100644
+index 10fc626..060c99e 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