[Pkg-owncloud-commits] [owncloud] 118/121: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Thu Aug 21 16:44:43 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 d761f70b2298745684a23f0537cc2ce81b7c4b6c
Author: David Prévot <taffit at debian.org>
Date: Thu Aug 21 00:49:59 2014 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 20 ++++++++++----------
debian/patches/0002-Fix-displayed-version.patch | 6 +++---
debian/patches/0003-Improve-logfile-handling.patch | 2 +-
...Doctrine-Symphony-Patchwork-and-Pimple-path.patch | 2 +-
.../path/0006-Adapt-Crypt_Blowfish-path.patch | 2 +-
debian/patches/path/0007-Adapt-aws-sdk-path.patch | 2 +-
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 0c880de..b6e97eb 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 24c1579..7d772f8 100644
+index 2aa240a..6ce5fdb 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -84,8 +84,10 @@ $CONFIG = array(
@@ -39,7 +39,7 @@ index 24c1579..7d772f8 100644
/* URL of the appstore to use, server should understand OCS */
"appstoreurl" => "https://api.owncloud.com/v1",
-@@ -238,11 +240,12 @@ $CONFIG = array(
+@@ -240,11 +242,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
@@ -55,7 +55,7 @@ index 24c1579..7d772f8 100644
),
'user_backends'=>array(
diff --git a/lib/base.php b/lib/base.php
-index 341859d..998eda8 100644
+index ed0830c..5854d17 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -157,7 +157,7 @@ class OC {
@@ -68,10 +68,10 @@ index 341859d..998eda8 100644
OC::$APPSROOTS[] = array(
'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
diff --git a/lib/private/app.php b/lib/private/app.php
-index 7bf04f1..994b312 100644
+index 70f8980..47bff46 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
-@@ -445,7 +445,7 @@ class OC_App {
+@@ -453,7 +453,7 @@ class OC_App {
* @return string
*/
public static function getInstallPath() {
@@ -81,7 +81,7 @@ index 7bf04f1..994b312 100644
}
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
-index dc52fc2..542d831 100644
+index e4cce6b..3a45167 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -64,7 +64,7 @@ class OC_OCSClient{
@@ -103,7 +103,7 @@ index dc52fc2..542d831 100644
}
@@ -155,7 +155,7 @@ class OC_OCSClient{
- * This function returns an applications from the OCS server
+ * This function returns an applications from the OCS server
*/
public static function getApplication($id) {
- if(OC_Config::getValue('appstoreenabled', true)==false) {
@@ -111,7 +111,7 @@ index dc52fc2..542d831 100644
return null;
}
$url=OC_OCSClient::getAppStoreURL().'/content/data/'.urlencode($id);
-@@ -199,7 +199,7 @@ class OC_OCSClient{
+@@ -203,7 +203,7 @@ class OC_OCSClient{
* @param integer $item
*/
public static function getApplicationDownload($id, $item) {
@@ -134,10 +134,10 @@ index fdf98ab..88e9c21 100644
$dbSetup->initialize($options);
$dbSetup->setupDatabase($username);
diff --git a/lib/private/util.php b/lib/private/util.php
-index 896b076..8b80e04 100644
+index 0696a79..c259d01 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -432,7 +432,7 @@ class OC_Util {
+@@ -435,7 +435,7 @@ class OC_Util {
}
// Check if there is a writable install folder.
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index 0f19aea..f37fa2a 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 7d772f8..339ad3d 100644
+index 6ce5fdb..31268f2 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -156,8 +156,8 @@ $CONFIG = array(
@@ -46,10 +46,10 @@ index a5dd9a0..ccba321 100644
if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array() && OC_User::isAdminUser(OC_User::getUser())) {
$this->assign('updateAvailable', true);
diff --git a/lib/private/util.php b/lib/private/util.php
-index 8b80e04..62719c0 100644
+index c259d01..59a47e1 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1424,7 +1424,7 @@ class OC_Util {
+@@ -1427,7 +1427,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 705e822..82d1e0f 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 339ad3d..eabc688 100644
+index 31268f2..44686dc 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 baa0aad..0d45941 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,7 +15,7 @@ Gbp: Topic path
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/base.php b/lib/base.php
-index 998eda8..344150e 100644
+index 5854d17..2323bd1 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -431,12 +431,12 @@ class OC {
diff --git a/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch b/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
index 4c57bf9..4ce81e7 100644
--- a/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
+++ b/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
@@ -12,7 +12,7 @@ Last-Update: 2013-10-14
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
-index 69ccce0..ff60572 100644
+index f0905a8..e026fdd 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -25,7 +25,7 @@
diff --git a/debian/patches/path/0007-Adapt-aws-sdk-path.patch b/debian/patches/path/0007-Adapt-aws-sdk-path.patch
index d8d2ba0..55b8b04 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 10fc626..060c99e 100644
+index cfc9b51..da62a16 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
More information about the Pkg-owncloud-commits
mailing list