[Pkg-owncloud-commits] [owncloud] 453/457: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Sun Jun 28 20:07:08 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 b4d83210225d1f0e9520ea3de8c9081e4b5295f8
Author: David Prévot <taffit at debian.org>
Date: Fri Jun 26 09:50:42 2015 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 18 +++++++++---------
debian/patches/0002-Fix-displayed-version.patch | 10 +++++-----
debian/patches/0003-Improve-logfile-handling.patch | 10 +++++-----
.../0008-use-JSqueeze-instead-of-JSMin-13052.patch | 4 ++--
debian/patches/0009-updating-ZipStreamer.patch | 2 +-
debian/patches/path/0005-Adapt-aws-sdk-path.patch | 2 +-
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index e51e877..677278d 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -21,10 +21,10 @@ 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 45aaf6a..c79ed0b 100644
+index 87ca678..a978cf6 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -568,8 +568,9 @@ $CONFIG = array(
+@@ -588,8 +588,9 @@ $CONFIG = array(
/**
* When enabled, admins may install apps from the ownCloud app store.
* The app store is disabled by default for ownCloud Enterprise Edition
@@ -35,7 +35,7 @@ index 45aaf6a..c79ed0b 100644
/**
* The URL of the appstore to use.
-@@ -592,12 +593,13 @@ $CONFIG = array(
+@@ -612,12 +613,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.
@@ -52,7 +52,7 @@ index 45aaf6a..c79ed0b 100644
),
diff --git a/lib/base.php b/lib/base.php
-index b7f19c9..ca088e7 100644
+index b9f2e4a..d2cee88 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -205,7 +205,7 @@ class OC {
@@ -65,7 +65,7 @@ index b7f19c9..ca088e7 100644
OC::$APPSROOTS[] = array(
'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
diff --git a/lib/private/app.php b/lib/private/app.php
-index a4dd513..69e0865 100644
+index 4814561..1dddbc4 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -501,7 +501,7 @@ class OC_App {
@@ -91,10 +91,10 @@ index f10a974..e1a4be5 100644
/**
diff --git a/lib/private/util.php b/lib/private/util.php
-index 367199f..8eee9e1 100644
+index 59408c0..5197dfe 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -590,7 +590,7 @@ class OC_Util {
+@@ -601,7 +601,7 @@ class OC_Util {
}
// Check if there is a writable install folder.
@@ -104,7 +104,7 @@ index 367199f..8eee9e1 100644
|| !is_writable(OC_App::getInstallPath())
|| !is_readable(OC_App::getInstallPath())
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
-index 6bbde71..c6e189e 100644
+index c88efb8..8969429 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -29,7 +29,7 @@ script(
@@ -114,5 +114,5 @@ index 6bbde71..c6e189e 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://owncloud.org/dev"><?php p($l->t('Developer documentation'));?> …</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 a0bb472..766e818 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 c79ed0b..252b0f1 100644
+index a978cf6..ae98473 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -430,7 +430,7 @@ $CONFIG = array(
+@@ -429,7 +429,7 @@ $CONFIG = array(
* Check if ownCloud is up-to-date and shows a notification if a new version is
* available.
*/
@@ -31,7 +31,7 @@ index c79ed0b..252b0f1 100644
/**
* Is ownCloud connected to the Internet or running in a closed network?
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
-index 0e1a8f3..af9ba0d 100644
+index 998a683..14d9b02 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -75,7 +75,7 @@ class OC_TemplateLayout extends OC_Template {
@@ -44,10 +44,10 @@ index 0e1a8f3..af9ba0d 100644
$updater = new \OC\Updater(\OC::$server->getHTTPHelper(),
\OC::$server->getConfig());
diff --git a/lib/private/util.php b/lib/private/util.php
-index 8eee9e1..2596917 100644
+index 5197dfe..760647f 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1380,7 +1380,7 @@ class OC_Util {
+@@ -1391,7 +1391,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 bb8651f..5349e10 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 252b0f1..0e53e89 100644
+index ae98473..fe18e6c 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -477,8 +477,9 @@ $CONFIG = array(
+@@ -476,8 +476,9 @@ $CONFIG = array(
/**
* Change the ownCloud logfile name from ``owncloud.log`` to something else.
@@ -29,10 +29,10 @@ index 252b0f1..0e53e89 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 ca088e7..d8fb361 100644
+index d2cee88..faeb098 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -753,7 +753,7 @@ class OC {
+@@ -758,7 +758,7 @@ class OC {
if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !\OCP\Util::needUpgrade()) {
//don't try to do this before we are properly setup
//use custom logfile path if defined, otherwise use default of owncloud.log in data directory
@@ -42,7 +42,7 @@ index ca088e7..d8fb361 100644
}
diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php
-index 049b8db..44ca078 100644
+index 0125164..c17da55 100644
--- a/lib/private/log/owncloud.php
+++ b/lib/private/log/owncloud.php
@@ -45,7 +45,7 @@ class OC_Log_Owncloud {
diff --git a/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch b/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch
index 43fc109..70943d1 100644
--- a/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch
+++ b/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch
@@ -124,7 +124,7 @@ index 0000000..fc17944
+ }
+}
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
-index af9ba0d..6253911 100644
+index 14d9b02..52498eb 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -37,7 +37,7 @@ use Assetic\AssetWriter;
@@ -136,7 +136,7 @@ index af9ba0d..6253911 100644
use OC\Assetic\SeparatorFilter; // waiting on upstream
/**
-@@ -210,7 +210,7 @@ class OC_TemplateLayout extends OC_Template {
+@@ -219,7 +219,7 @@ class OC_TemplateLayout extends OC_Template {
), $root, $file);
}
return new FileAsset($root . '/' . $file, array(
diff --git a/debian/patches/0009-updating-ZipStreamer.patch b/debian/patches/0009-updating-ZipStreamer.patch
index 51cf31d..d2f88eb 100644
--- a/debian/patches/0009-updating-ZipStreamer.patch
+++ b/debian/patches/0009-updating-ZipStreamer.patch
@@ -8,7 +8,7 @@ Origin: upstream, https://github.com/owncloud/core/commit/ca55c10d668904ed350dff
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/private/files.php b/lib/private/files.php
-index 6a739fc..c3bfe77 100644
+index 5a3e102..8c0f7ee 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -39,9 +39,7 @@
diff --git a/debian/patches/path/0005-Adapt-aws-sdk-path.patch b/debian/patches/path/0005-Adapt-aws-sdk-path.patch
index 865c05c..e368ae4 100644
--- a/debian/patches/path/0005-Adapt-aws-sdk-path.patch
+++ b/debian/patches/path/0005-Adapt-aws-sdk-path.patch
@@ -11,7 +11,7 @@ Last-Update: 2014-01-02
1 file changed, 4 deletions(-)
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
-index acf976e..b22080a 100644
+index 763cf59..f919162 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -34,10 +34,6 @@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list