[Pkg-owncloud-commits] [owncloud] 130/134: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Fri Apr 18 21:44:13 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 3bb81c785b3d594307cb6170c36344730451c3bb
Author: David Prévot <taffit at debian.org>
Date: Fri Apr 18 15:35:16 2014 -0400
Refresh patches
---
debian/patches/0001-Disable-the-appstore.patch | 16 ++++++++--------
debian/patches/0002-Fix-displayed-version.patch | 4 ++--
.../path/0004-Adapt-class.phpmailer.php-path.patch | 2 +-
...dapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch | 2 +-
debian/patches/path/0011-Adapt-aws-sdk-path.patch | 2 --
debian/patches/path/0015-Adapt-php-opencloud-path.patch | 2 +-
debian/patches/path/0016-Adapt-Zend-path.patch | 2 --
7 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index fafead2..9d4008b 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -54,7 +54,7 @@ index 72b21ff..22cf223 100644
),
'user_backends'=>array(
diff --git a/lib/base.php b/lib/base.php
-index 3435217..96de840 100644
+index dba905f..9ecbdbb 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -144,8 +144,8 @@ class OC {
@@ -82,7 +82,7 @@ index d4683b3..885eb55 100644
}
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
-index e35556d..8dcf6da 100644
+index d4a3e59..ca60d6e 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -63,7 +63,7 @@ class OC_OCSClient{
@@ -94,7 +94,7 @@ index e35556d..8dcf6da 100644
return null;
}
$url=OC_OCSClient::getAppStoreURL().'/content/categories';
-@@ -94,7 +94,7 @@ class OC_OCSClient{
+@@ -96,7 +96,7 @@ class OC_OCSClient{
* This function returns a list of all the applications on the OCS server
*/
public static function getApplications($categories, $page, $filter) {
@@ -103,7 +103,7 @@ index e35556d..8dcf6da 100644
return(array());
}
-@@ -146,7 +146,7 @@ class OC_OCSClient{
+@@ -150,7 +150,7 @@ class OC_OCSClient{
* This function returns an applications from the OCS server
*/
public static function getApplication($id) {
@@ -112,7 +112,7 @@ index e35556d..8dcf6da 100644
return null;
}
$url=OC_OCSClient::getAppStoreURL().'/content/data/'.urlencode($id);
-@@ -186,7 +186,7 @@ class OC_OCSClient{
+@@ -192,7 +192,7 @@ class OC_OCSClient{
* This function returns an download url for an applications from the OCS server
*/
public static function getApplicationDownload($id, $item) {
@@ -122,7 +122,7 @@ 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 f3ef4df..81973e5 100644
+index 8ef563b..6af35dc 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -69,6 +69,8 @@ class OC_Setup {
@@ -135,10 +135,10 @@ index f3ef4df..81973e5 100644
$dbSetup->initialize($options);
$dbSetup->setupDatabase($username);
diff --git a/lib/private/util.php b/lib/private/util.php
-index 7b9d223..8220246 100644
+index 6db1727..c519ed5 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -326,7 +326,7 @@ class OC_Util {
+@@ -332,7 +332,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 92a7531..1c93bc9 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -46,10 +46,10 @@ index 625f342..ed21f88 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 8220246..a3aace1 100644
+index c519ed5..44fdd92 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1133,7 +1133,7 @@ class OC_Util {
+@@ -1162,7 +1162,7 @@ class OC_Util {
* @return string
*/
public static function getHumanVersion() {
diff --git a/debian/patches/path/0004-Adapt-class.phpmailer.php-path.patch b/debian/patches/path/0004-Adapt-class.phpmailer.php-path.patch
index ecb2a01..72892f4 100644
--- a/debian/patches/path/0004-Adapt-class.phpmailer.php-path.patch
+++ b/debian/patches/path/0004-Adapt-class.phpmailer.php-path.patch
@@ -16,7 +16,7 @@ Last-Update: 2013-10-14
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/private/mail.php b/lib/private/mail.php
-index b339b33..d172d00 100644
+index 27dc6d3..b807fd1 100644
--- a/lib/private/mail.php
+++ b/lib/private/mail.php
@@ -12,7 +12,7 @@
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 aadac6b..f864ac7 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,7 +20,7 @@ Last-Update: 2013-11-11
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/base.php b/lib/base.php
-index 96de840..434b859 100644
+index 9ecbdbb..5dbcc54 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -407,13 +407,13 @@ class OC {
diff --git a/debian/patches/path/0011-Adapt-aws-sdk-path.patch b/debian/patches/path/0011-Adapt-aws-sdk-path.patch
index a7b9f88..d54550d 100644
--- a/debian/patches/path/0011-Adapt-aws-sdk-path.patch
+++ b/debian/patches/path/0011-Adapt-aws-sdk-path.patch
@@ -4,10 +4,8 @@ Subject: Adapt aws-sdk path
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 ----
diff --git a/debian/patches/path/0015-Adapt-php-opencloud-path.patch b/debian/patches/path/0015-Adapt-php-opencloud-path.patch
index fe5bcee..b015c94 100644
--- a/debian/patches/path/0015-Adapt-php-opencloud-path.patch
+++ b/debian/patches/path/0015-Adapt-php-opencloud-path.patch
@@ -12,7 +12,7 @@ Last-Update: 2013-10-30
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
-index b615d24..772b6dc 100644
+index de2fda7..9ce5484 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -22,8 +22,7 @@
diff --git a/debian/patches/path/0016-Adapt-Zend-path.patch b/debian/patches/path/0016-Adapt-Zend-path.patch
index 1992cd8..1c3265a 100644
--- a/debian/patches/path/0016-Adapt-Zend-path.patch
+++ b/debian/patches/path/0016-Adapt-Zend-path.patch
@@ -4,10 +4,8 @@ Subject: Adapt Zend path
The Debian package depends on the needed classes instead of embedding
them, i.e. zendframework.
-
Forwarded: not-needed
Last-Update: 2013-11-06
-
Gbp: Topic path
---
apps/search_lucene/appinfo/app.php | 22 +++++++++++-----------
--
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