[Pkg-owncloud-commits] [owncloud] 142/145: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Wed Feb 26 16:27:51 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 2820376951be9daf2aacc219a963bfcc15e8d802
Author: David Prévot <taffit at debian.org>
Date: Tue Feb 25 19:09:50 2014 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 14 +++++++-------
debian/patches/0002-Fix-displayed-version.patch | 4 ++--
debian/patches/0003-Improve-logfile-handling.patch | 6 +++---
.../0017-Disable-Flash-and-Silverlight-plugins.patch | 6 +++---
debian/patches/0018-Fix-X-EVOLUTION-FILE-AS-escape.patch | 2 +-
...-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch | 4 ++--
6 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 17b7733..fafead2 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -22,10 +22,10 @@ Last-Update: 2013-10-23
7 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 1070ef7..60b6a0f 100644
+index 72b21ff..22cf223 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -71,8 +71,10 @@ $CONFIG = array(
+@@ -74,8 +74,10 @@ $CONFIG = array(
/* Enable the help menu item in the settings */
"knowledgebaseenabled" => true,
@@ -38,7 +38,7 @@ index 1070ef7..60b6a0f 100644
/* URL of the appstore to use, server should understand OCS */
"appstoreurl" => "http://api.apps.owncloud.com/v1",
-@@ -203,11 +205,12 @@ $CONFIG = array(
+@@ -213,11 +215,12 @@ $CONFIG = array(
key 'path' is for the fs path and the key 'url' is for the http path to your
applications paths. 'writable' indicates whether the user can install apps in this folder.
You must have at least 1 app folder writable or you must set the parameter 'appstoreenabled' to false
@@ -54,7 +54,7 @@ index 1070ef7..60b6a0f 100644
),
'user_backends'=>array(
diff --git a/lib/base.php b/lib/base.php
-index 5470cf2..11aa253 100644
+index 3435217..96de840 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -144,8 +144,8 @@ class OC {
@@ -69,7 +69,7 @@ index 5470cf2..11aa253 100644
OC::$APPSROOTS[] = array(
'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
diff --git a/lib/private/app.php b/lib/private/app.php
-index eca40a8..742ae92 100644
+index d4683b3..885eb55 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -437,7 +437,7 @@ class OC_App{
@@ -122,10 +122,10 @@ index e35556d..8dcf6da 100644
}
$url=OC_OCSClient::getAppStoreURL().'/content/download/'.urlencode($id).'/'.urlencode($item);
diff --git a/lib/private/setup.php b/lib/private/setup.php
-index 5232398..f935c0d 100644
+index f3ef4df..81973e5 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
-@@ -68,6 +68,8 @@ class OC_Setup {
+@@ -69,6 +69,8 @@ class OC_Setup {
OC_Config::setValue('datadirectory', $datadir);
OC_Config::setValue('dbtype', $dbtype);
OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index efdd510..92a7531 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, 4 insertions(+), 4 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 60b6a0f..bd99675 100644
+index 22cf223..35ce430 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -131,8 +131,8 @@ $CONFIG = array(
+@@ -134,8 +134,8 @@ $CONFIG = array(
/* Check 3rdparty apps for malicious code fragments */
"appcodechecker" => "",
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index c4cb0b1..9d89e31 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -13,10 +13,10 @@ 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 bd99675..22b9d72 100644
+index 35ce430..fb69176 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -146,7 +146,7 @@ $CONFIG = array(
+@@ -149,7 +149,7 @@ $CONFIG = array(
/* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
"log_type" => "owncloud",
@@ -26,7 +26,7 @@ index bd99675..22b9d72 100644
/* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php
-index 4c86d0e..383fa45 100644
+index 3590bbd..b76d75e 100644
--- a/lib/private/log/owncloud.php
+++ b/lib/private/log/owncloud.php
@@ -33,7 +33,7 @@ class OC_Log_Owncloud {
diff --git a/debian/patches/0017-Disable-Flash-and-Silverlight-plugins.patch b/debian/patches/0017-Disable-Flash-and-Silverlight-plugins.patch
index 8191267..a614182 100644
--- a/debian/patches/0017-Disable-Flash-and-Silverlight-plugins.patch
+++ b/debian/patches/0017-Disable-Flash-and-Silverlight-plugins.patch
@@ -13,10 +13,10 @@ Forwarded: not-needed
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_videoviewer/js/mediaelement-and-player.js b/apps/files_videoviewer/js/mediaelement-and-player.js
-index d52868f..46952d1 100644
+index 9b0d668..8a07939 100644
--- a/apps/files_videoviewer/js/mediaelement-and-player.js
+++ b/apps/files_videoviewer/js/mediaelement-and-player.js
-@@ -816,7 +816,7 @@ mejs.MediaElementDefaults = {
+@@ -859,7 +859,7 @@ mejs.MediaElementDefaults = {
// none: forces fallback view
mode: 'auto',
// remove or reorder to change plugin priority and availability
@@ -24,4 +24,4 @@ index d52868f..46952d1 100644
+ plugins: ['youtube','vimeo'],
// shows debug errors on screen
enablePluginDebug: false,
- // overrides the type specified, useful for dynamic instantiation
+ // use plugin for browsers that have trouble with Basic Authentication on HTTPS sites
diff --git a/debian/patches/0018-Fix-X-EVOLUTION-FILE-AS-escape.patch b/debian/patches/0018-Fix-X-EVOLUTION-FILE-AS-escape.patch
index 44d8d76..ed060ef 100644
--- a/debian/patches/0018-Fix-X-EVOLUTION-FILE-AS-escape.patch
+++ b/debian/patches/0018-Fix-X-EVOLUTION-FILE-AS-escape.patch
@@ -24,7 +24,7 @@ Origin: upstream, https://github.com/owncloud/contacts/commit/16fa2cf80713d383c3
1 file changed, 1 insertion(+)
diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
-index bf63bf4..273120a 100644
+index 363ebd6..60be9ef 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -15,6 +15,7 @@ use \OC\AppFramework\Core\API;
diff --git a/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch b/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch
index afbddc6..aadac6b 100644
--- a/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch
+++ b/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch
@@ -20,10 +20,10 @@ Last-Update: 2013-11-11
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/base.php b/lib/base.php
-index 11aa253..6d723a4 100644
+index 96de840..434b859 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -406,13 +406,13 @@ class OC {
+@@ -407,13 +407,13 @@ class OC {
// register autoloader
require_once __DIR__ . '/autoloader.php';
self::$loader = new \OC\Autoloader();
--
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