[Pkg-owncloud-commits] [owncloud] 213/215: Refresh patches

Tue May 5 01:01:54 UTC 2015

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit b88635af544d28aa94251d5c9b32995cb25a6643
Author: David Prévot <taffit at debian.org>
Date:   Mon May 4 18:52:30 2015 -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             |  4 ++--
 debian/patches/path/0005-Adapt-aws-sdk-path.patch              |  1 -
 .../patches/path/0006-Adapt-google-api-php-client-path.patch   |  1 -
 debian/patches/path/0007-Adapt-Dropbox-path.patch              |  1 -
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 34d8617..45dbcb4 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -21,7 +21,7 @@ Last-Update: 2014-04-22
  6 files changed, 10 insertions(+), 8 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index 61ae595..4e74381 100644
+index 45aaf6a..c79ed0b 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -568,8 +568,9 @@ $CONFIG = array(
@@ -52,7 +52,7 @@ index 61ae595..4e74381 100644
  ),
  
 diff --git a/lib/base.php b/lib/base.php
-index 7e61835..e0dae5d 100644
+index ec87548..97e6c3e 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -205,7 +205,7 @@ class OC {
@@ -78,7 +78,7 @@ index aec67e6..e94b891 100644
  		}
  
 diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
-index b00772f..a32b829 100644
+index f10a974..e1a4be5 100644
 --- a/lib/private/ocsclient.php
 +++ b/lib/private/ocsclient.php
 @@ -68,7 +68,7 @@ class OCSClient {
@@ -104,7 +104,7 @@ index 102dc8c..5f06787 100644
  				|| !is_writable(OC_App::getInstallPath())
  				|| !is_readable(OC_App::getInstallPath())
 diff --git a/settings/templates/apps.php b/settings/templates/apps.php
-index 31de7fa..452d7f3 100644
+index fb25917..ab829e1 100644
 --- a/settings/templates/apps.php
 +++ b/settings/templates/apps.php
 @@ -29,7 +29,7 @@ script(
@@ -114,5 +114,5 @@ index 31de7fa..452d7f3 100644
 -<?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
 +<?php if(OC_Config::getValue('appstoreenabled', false) === true): ?>
  	<li>
- 		<a class="app-external" target="_blank" href="https://apps.owncloud.com/?xsortmode=high"><?php p($l->t('More apps'));?> …</a>
+ 		<a class="app-external" target="_blank" href="https://owncloud.org/dev"><?php p($l->t('Developer documentation'));?> …</a>
  	</li>
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index c798dcf..a1cf61a 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, 3 insertions(+), 3 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index 4e74381..0532f27 100644
+index c79ed0b..252b0f1 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -430,7 +430,7 @@ $CONFIG = array(
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index 0ba2719..8d28e17 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -14,7 +14,7 @@ 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 0532f27..4f595bd 100644
+index 252b0f1..0e53e89 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -477,8 +477,9 @@ $CONFIG = array(
@@ -29,7 +29,7 @@ index 0532f27..4f595bd 100644
  /**
   * Loglevel to start logging at. Valid values are: 0 = Debug, 1 = Info, 2 =
 diff --git a/lib/base.php b/lib/base.php
-index e0dae5d..f4ca053 100644
+index 97e6c3e..6f630d2 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -744,7 +744,7 @@ class OC {
diff --git a/debian/patches/path/0005-Adapt-aws-sdk-path.patch b/debian/patches/path/0005-Adapt-aws-sdk-path.patch
index f261344..865c05c 100644
--- a/debian/patches/path/0005-Adapt-aws-sdk-path.patch
+++ b/debian/patches/path/0005-Adapt-aws-sdk-path.patch
@@ -6,7 +6,6 @@ The Debian package depends on the needed classes instead of embedding
 them, i.e. php-aws-sdk.
 Forwarded: not-needed
 Last-Update: 2014-01-02
-Gbp: Topic path
 ---
  apps/files_external/lib/amazons3.php | 4 ----
  1 file changed, 4 deletions(-)
diff --git a/debian/patches/path/0006-Adapt-google-api-php-client-path.patch b/debian/patches/path/0006-Adapt-google-api-php-client-path.patch
index bcdf2a3..797e580 100644
--- a/debian/patches/path/0006-Adapt-google-api-php-client-path.patch
+++ b/debian/patches/path/0006-Adapt-google-api-php-client-path.patch
@@ -7,7 +7,6 @@ them, i.e. php-google-api-php-client.
 
 Forwarded: not-needed
 Last-Update: 2014-10-09
-Gbp: Topic path
 ---
  apps/files_external/ajax/google.php | 2 --
  apps/files_external/lib/google.php  | 2 --
diff --git a/debian/patches/path/0007-Adapt-Dropbox-path.patch b/debian/patches/path/0007-Adapt-Dropbox-path.patch
index 82d42ab..2962570 100644
--- a/debian/patches/path/0007-Adapt-Dropbox-path.patch
+++ b/debian/patches/path/0007-Adapt-Dropbox-path.patch
@@ -7,7 +7,6 @@ them, i.e. php-dropbox.
 
 Forwarded: not-needed
 Last-Update: 2014-10-09
-Gbp: Topic path
 ---
  apps/files_external/ajax/dropbox.php | 2 +-
  apps/files_external/lib/dropbox.php  | 2 +-

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

