[Pkg-owncloud-commits] [owncloud] 45/46: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Fri Oct 24 15:11:45 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 fa23a8738e96781bcc4de3255d429afaa3702d36
Author: David Prévot <taffit at debian.org>
Date: Thu Oct 23 15:19:20 2014 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 14 +++++++-------
debian/patches/0002-Fix-displayed-version.patch | 12 ++++++------
debian/patches/0003-Improve-logfile-handling.patch | 4 ++--
...Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch | 2 +-
debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch | 6 +++---
debian/patches/path/0007-Adapt-aws-sdk-path.patch | 2 +-
.../path/0008-Adapt-google-api-php-client-path.patch | 2 +-
debian/patches/path/0009-Adapt-Dropbox-path.patch | 2 +-
8 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 6bd5158..62034bd 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -23,10 +23,10 @@ Last-Update: 2014-04-22
8 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index d86d46a..659b647 100644
+index 9b70ede..66c7a02 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -499,8 +499,9 @@ $CONFIG = array(
+@@ -512,8 +512,9 @@ $CONFIG = array(
/**
* When enabled, admins may install apps from the ownCloud app store.
@@ -37,7 +37,7 @@ index d86d46a..659b647 100644
/**
* The URL of the appstore to use.
-@@ -514,12 +515,13 @@ $CONFIG = array(
+@@ -527,12 +528,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.
@@ -67,10 +67,10 @@ index 7335be0..4bace86 100644
OC::$APPSROOTS[] = array(
'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
diff --git a/lib/private/app.php b/lib/private/app.php
-index a619504..5fd3610 100644
+index 20c0f5f..ecfe180 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
-@@ -477,7 +477,7 @@ class OC_App {
+@@ -487,7 +487,7 @@ class OC_App {
* @return string
*/
public static function getInstallPath() {
@@ -106,10 +106,10 @@ index 2ad569c..5d27e371 100644
$dbSetup->initialize($options);
$dbSetup->setupDatabase($username);
diff --git a/lib/private/util.php b/lib/private/util.php
-index 41311af..8a2b819 100644
+index 502cf8b..3324fa4 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -437,7 +437,7 @@ class OC_Util {
+@@ -444,7 +444,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 7624181..c8a8e3d 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 659b647..c72e4dd 100644
+index 66c7a02..362c790 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -384,7 +384,7 @@ $CONFIG = array(
+@@ -397,7 +397,7 @@ $CONFIG = array(
* Check if ownCloud is up-to-date and shows a notification if a new version is
* available.
*/
@@ -31,10 +31,10 @@ index 659b647..c72e4dd 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 2bd7f69..b2746f8 100644
+index 1f2f3eb..b1a61c7 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
-@@ -30,7 +30,7 @@ class OC_TemplateLayout extends OC_Template {
+@@ -32,7 +32,7 @@ class OC_TemplateLayout extends OC_Template {
}
// Update notification
@@ -44,10 +44,10 @@ index 2bd7f69..b2746f8 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 8a2b819..11cbd3f 100644
+index 3324fa4..9a22244 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1304,7 +1304,7 @@ class OC_Util {
+@@ -1311,7 +1311,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 22c2824..2f04047 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 c72e4dd..2fe50b6 100644
+index 362c790..cd5ab36 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -420,8 +420,9 @@ $CONFIG = array(
+@@ -433,8 +433,9 @@ $CONFIG = array(
/**
* Change the ownCloud logfile name from ``owncloud.log`` to something else.
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 fc8560d..cf9791c 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
@@ -14,7 +14,7 @@ Gbp: Topic path
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/base.php b/lib/base.php
-index 32224f9..1e77f4d 100644
+index 32224f9..1e77f4d8 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 9f4f163..66b7348 100644
--- a/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
+++ b/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
@@ -13,12 +13,12 @@ Gbp: Topic path
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
-index f0905a8..e026fdd 100644
+index bd86b2b..be2fab2 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
-@@ -25,7 +25,7 @@
-
+@@ -26,7 +26,7 @@
namespace OCA\Encryption;
+ use OCA\Encryption\Exceptions\EncryptionException;
-require_once __DIR__ . '/../3rdparty/Crypt_Blowfish/Blowfish.php';
+require_once 'Crypt/Blowfish.php';
diff --git a/debian/patches/path/0007-Adapt-aws-sdk-path.patch b/debian/patches/path/0007-Adapt-aws-sdk-path.patch
index 58a335e..62c3809 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 bbb1b14..f3a5bd4 100644
+index 77c5f82..cd2bab5 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -24,10 +24,6 @@
diff --git a/debian/patches/path/0008-Adapt-google-api-php-client-path.patch b/debian/patches/path/0008-Adapt-google-api-php-client-path.patch
index 2286d58..798af3d 100644
--- a/debian/patches/path/0008-Adapt-google-api-php-client-path.patch
+++ b/debian/patches/path/0008-Adapt-google-api-php-client-path.patch
@@ -26,7 +26,7 @@ index 13e7407..960bd0a 100644
OCP\JSON::checkAppEnabled('files_external');
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
-index 56c0d45..c75f871 100644
+index e71c7ab..066d064 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -22,7 +22,7 @@
diff --git a/debian/patches/path/0009-Adapt-Dropbox-path.patch b/debian/patches/path/0009-Adapt-Dropbox-path.patch
index 1ee9124..2c7fde6 100644
--- a/debian/patches/path/0009-Adapt-Dropbox-path.patch
+++ b/debian/patches/path/0009-Adapt-Dropbox-path.patch
@@ -26,7 +26,7 @@ index bbedf8e..6971fa2 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 9f297d2..88d7115 100644
+index cc1e628..b7c0978 100644
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -22,7 +22,7 @@
--
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