[Pkg-owncloud-commits] [owncloud] 151/153: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Tue May 27 03:05:50 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 a8368a391b7b76175dd237ebdb4563f4b240d64b
Author: David Prévot <taffit at debian.org>
Date: Sun May 25 22:52:45 2014 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 12 ++++++------
debian/patches/0002-Fix-displayed-version.patch | 4 ++--
.../0006-Adapt-Doctrine-Symphony-and-Patchwork-path.patch | 4 ++--
debian/patches/path/0007-Adapt-Crypt_Blowfish-path.patch | 2 +-
debian/patches/path/0008-Adapt-aws-sdk-path.patch | 4 ++--
debian/patches/path/0010-Adapt-Dropbox-path.patch | 2 +-
debian/patches/path/0011-Adapt-php-opencloud-path.patch | 6 +++---
7 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 2a9f1ec..910c185 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -55,7 +55,7 @@ index 708e836..eeb9675 100644
),
'user_backends'=>array(
diff --git a/lib/base.php b/lib/base.php
-index f3a15e0..cb14d4d 100644
+index a022b9d..c4824d1 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -152,7 +152,7 @@ class OC {
@@ -68,7 +68,7 @@ index f3a15e0..cb14d4d 100644
OC::$APPSROOTS[] = array(
'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
diff --git a/lib/private/app.php b/lib/private/app.php
-index a35248f..791497a 100644
+index 575cc9f..a0508c7 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -431,7 +431,7 @@ class OC_App{
@@ -81,7 +81,7 @@ index a35248f..791497a 100644
}
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
-index fb82827..6a24d4a 100644
+index 39d7e9c..ccd4f1a 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -64,7 +64,7 @@ class OC_OCSClient{
@@ -121,7 +121,7 @@ index fb82827..6a24d4a 100644
}
$url=OC_OCSClient::getAppStoreURL().'/content/download/'.urlencode($id).'/'.urlencode($item);
diff --git a/lib/private/setup.php b/lib/private/setup.php
-index 4889f60..1ecd49a 100644
+index 7a08816..01e82856 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -69,6 +69,8 @@ class OC_Setup {
@@ -134,10 +134,10 @@ index 4889f60..1ecd49a 100644
$dbSetup->initialize($options);
$dbSetup->setupDatabase($username);
diff --git a/lib/private/util.php b/lib/private/util.php
-index 107dc6b..2247b1f 100644
+index 23c7053..10da41a 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -342,7 +342,7 @@ class OC_Util {
+@@ -365,7 +365,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 f121fcc..5caba6d 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -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 2247b1f..d371bb9 100644
+index 10da41a..9ce5efb 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1287,7 +1287,7 @@ class OC_Util {
+@@ -1310,7 +1310,7 @@ class OC_Util {
* @return string
*/
public static function getHumanVersion() {
diff --git a/debian/patches/path/0006-Adapt-Doctrine-Symphony-and-Patchwork-path.patch b/debian/patches/path/0006-Adapt-Doctrine-Symphony-and-Patchwork-path.patch
index 5d18c34..af7b934 100644
--- a/debian/patches/path/0006-Adapt-Doctrine-Symphony-and-Patchwork-path.patch
+++ b/debian/patches/path/0006-Adapt-Doctrine-Symphony-and-Patchwork-path.patch
@@ -19,10 +19,10 @@ Last-Update: 2013-11-11
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/base.php b/lib/base.php
-index cb14d4d..5b7c9c4 100644
+index c4824d1..8d00b46 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -403,11 +403,11 @@ class OC {
+@@ -411,11 +411,11 @@ class OC {
// register autoloader
require_once __DIR__ . '/autoloader.php';
self::$loader = new \OC\Autoloader();
diff --git a/debian/patches/path/0007-Adapt-Crypt_Blowfish-path.patch b/debian/patches/path/0007-Adapt-Crypt_Blowfish-path.patch
index 122d564..dccf96d 100644
--- a/debian/patches/path/0007-Adapt-Crypt_Blowfish-path.patch
+++ b/debian/patches/path/0007-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 7d86eb7..56dfb03 100644
+index ec7b3bc..753acba 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/0008-Adapt-aws-sdk-path.patch b/debian/patches/path/0008-Adapt-aws-sdk-path.patch
index 5398d82..0c39c28 100644
--- a/debian/patches/path/0008-Adapt-aws-sdk-path.patch
+++ b/debian/patches/path/0008-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 2093fb7..00294ad 100644
+index 7ff17f0..00294ad 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -24,10 +24,6 @@
@@ -20,7 +20,7 @@ index 2093fb7..00294ad 100644
namespace OC\Files\Storage;
-set_include_path(get_include_path() . PATH_SEPARATOR .
-- \OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
+- \OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
-require 'aws-autoloader.php';
-
use Aws\S3\S3Client;
diff --git a/debian/patches/path/0010-Adapt-Dropbox-path.patch b/debian/patches/path/0010-Adapt-Dropbox-path.patch
index e2d2522..d6355dd 100644
--- a/debian/patches/path/0010-Adapt-Dropbox-path.patch
+++ b/debian/patches/path/0010-Adapt-Dropbox-path.patch
@@ -25,7 +25,7 @@ index 91c4655..bc9821c 100644
OCP\JSON::checkAppEnabled('files_external');
OCP\JSON::checkLoggedIn();
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
-index 38de336..2f6b78d 100644
+index 9f297d2..88d7115 100644
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -22,7 +22,7 @@
diff --git a/debian/patches/path/0011-Adapt-php-opencloud-path.patch b/debian/patches/path/0011-Adapt-php-opencloud-path.patch
index ca4f352..f209059 100644
--- a/debian/patches/path/0011-Adapt-php-opencloud-path.patch
+++ b/debian/patches/path/0011-Adapt-php-opencloud-path.patch
@@ -12,15 +12,15 @@ Last-Update: 2014-04-22
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
-index a202d38..e70493b 100644
+index 0336486..c539173 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -23,7 +23,7 @@
namespace OC\Files\Storage;
set_include_path(get_include_path() . PATH_SEPARATOR .
-- \OC_App::getAppPath('files_external') . '/3rdparty/php-opencloud/lib');
-+ '/usr/share/php/php-opencloud');
+- \OC_App::getAppPath('files_external') . '/3rdparty/php-opencloud/lib');
++ '/usr/share/php/php-opencloud');
require_once 'openstack.php';
use \OpenCloud;
--
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