[Pkg-owncloud-commits] [owncloud] 47/63: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Tue Dec 22 16:51:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch stable8.0
in repository owncloud.
commit a4c2085dadb2bad57cd21ff54e49720c75d1f1ae
Author: David Prévot <taffit at debian.org>
Date: Mon Dec 21 19:40:50 2015 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 22 +++++++++++-----------
debian/patches/0002-Fix-displayed-version.patch | 8 ++++----
debian/patches/0003-Improve-logfile-handling.patch | 8 ++++----
debian/patches/0009-updating-ZipStreamer.patch | 2 +-
debian/patches/path/0005-Adapt-aws-sdk-path.patch | 1 -
.../0006-Adapt-google-api-php-client-path.patch | 3 +--
debian/patches/path/0007-Adapt-Dropbox-path.patch | 1 -
7 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 92c699c..296dd76 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -22,21 +22,21 @@ Last-Update: 2014-04-22
7 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 0423adc..bd61a75 100644
+index d4b47ce..95f6966 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -557,8 +557,9 @@ $CONFIG = array(
+@@ -555,8 +555,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
-+ * and for Debian, see /usr/share/doc/owncloud/README.Debian
++ * Debian: disabled by default, see /usr/share/doc/owncloud/README.Debian
*/
-'appstoreenabled' => true,
+'appstoreenabled' => false,
/**
* The URL of the appstore to use.
-@@ -572,12 +573,13 @@ $CONFIG = array(
+@@ -570,12 +571,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.
@@ -53,7 +53,7 @@ index 0423adc..bd61a75 100644
),
diff --git a/lib/base.php b/lib/base.php
-index 8609743..55adf0b 100644
+index a5ee361..f6f90d2 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -157,7 +157,7 @@ class OC {
@@ -66,7 +66,7 @@ index 8609743..55adf0b 100644
OC::$APPSROOTS[] = array(
'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
diff --git a/lib/private/app.php b/lib/private/app.php
-index d3dcf1f..54fbaad 100644
+index b942b29..ab6e6dd 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -502,7 +502,7 @@ class OC_App {
@@ -79,7 +79,7 @@ index d3dcf1f..54fbaad 100644
}
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
-index 7ce6723..b779836 100644
+index fe881be..1ef7876 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -33,7 +33,7 @@ class OC_OCSClient{
@@ -92,7 +92,7 @@ index 7ce6723..b779836 100644
}
diff --git a/lib/private/util.php b/lib/private/util.php
-index 9454d9f..3b4ca13 100644
+index 6b5905f..3e6667e 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -515,7 +515,7 @@ class OC_Util {
@@ -105,7 +105,7 @@ index 9454d9f..3b4ca13 100644
|| !is_writable(OC_App::getInstallPath())
|| !is_readable(OC_App::getInstallPath())
diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php
-index 7240343..8ff68ea 100644
+index e118e5a..57caec2 100644
--- a/settings/controller/appsettingscontroller.php
+++ b/settings/controller/appsettingscontroller.php
@@ -63,7 +63,7 @@ class AppSettingsController extends Controller {
@@ -116,7 +116,7 @@ index 7240343..8ff68ea 100644
+ if($this->config->getSystemValue('appstoreenabled', false)) {
$categories[] = ['id' => 2, 'displayName' => (string)$this->l10n->t('Recommended')];
// apps from external repo via OCS
- $ocs = \OC_OCSClient::getCategories();
+ $ocs = \OC_OCSClient::getCategories(\OC_Util::getVersion());
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 02cab16..ca2c374 100644
--- a/settings/templates/apps.php
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index 1e5a863..cbb4aac 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 bd61a75..1908918 100644
+index 95f6966..8f5d82c 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.
*/
@@ -44,10 +44,10 @@ index f8cee15..99b10e4 100644
$updater = new \OC\Updater(\OC::$server->getHTTPHelper(),
\OC::$server->getConfig());
diff --git a/lib/private/util.php b/lib/private/util.php
-index 3b4ca13..912ad27 100644
+index 3e6667e..e245243 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1337,7 +1337,7 @@ class OC_Util {
+@@ -1318,7 +1318,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 18af032..89eeb7a 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 1908918..f71ee84 100644
+index 8f5d82c..f9dfdd0 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 1908918..f71ee84 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 55adf0b..5be7de6 100644
+index f6f90d2..8e977b8 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -675,7 +675,7 @@ class OC {
+@@ -684,7 +684,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
diff --git a/debian/patches/0009-updating-ZipStreamer.patch b/debian/patches/0009-updating-ZipStreamer.patch
index 5a6176f..61f14e8 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 496ba1b..eb2e410 100644
+index be08fd3..e93c836 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -1,4 +1,5 @@
diff --git a/debian/patches/path/0005-Adapt-aws-sdk-path.patch b/debian/patches/path/0005-Adapt-aws-sdk-path.patch
index 5cd2629..f8d6cc4 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 ea92702..224e8d8 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,14 +7,13 @@ 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 --
2 files changed, 4 deletions(-)
diff --git a/apps/files_external/ajax/google.php b/apps/files_external/ajax/google.php
-index b80f24b..fe88773 100644
+index 000697f..93ece57 100644
--- a/apps/files_external/ajax/google.php
+++ b/apps/files_external/ajax/google.php
@@ -1,6 +1,4 @@
diff --git a/debian/patches/path/0007-Adapt-Dropbox-path.patch b/debian/patches/path/0007-Adapt-Dropbox-path.patch
index 5e1a3ed..52810bd 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
More information about the Pkg-owncloud-commits
mailing list