[Pkg-owncloud-commits] [owncloud] 192/199: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Sun Jun 1 18:53:29 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 187c56cc167db7dc3157b749a2eb65cf72fb7996
Author: David Prévot <taffit at debian.org>
Date: Sat May 31 21:32:36 2014 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 14 +++++-----
debian/patches/0002-Fix-displayed-version.patch | 8 +++---
debian/patches/0003-Improve-logfile-handling.patch | 4 +--
...11-Disable-Flash-and-Silverlight-plugins.patch} | 0
...le-Assetic.patch => 0012-Disable-Assetic.patch} | 0
...patch => 0004-Adapt-Archive-Tar.php-path.patch} | 0
.../path/0004-Adapt-class.phpmailer.php-path.patch | 30 ----------------------
...trine-Symphony-Patchwork-and-Pimple-path.patch} | 4 +--
....patch => 0006-Adapt-Crypt_Blowfish-path.patch} | 0
...dk-path.patch => 0007-Adapt-aws-sdk-path.patch} | 0
...=> 0008-Adapt-google-api-php-client-path.patch} | 0
...ox-path.patch => 0009-Adapt-Dropbox-path.patch} | 0
...h.patch => 0010-Adapt-php-opencloud-path.patch} | 0
debian/patches/series | 19 +++++++-------
14 files changed, 24 insertions(+), 55 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 910c185..3bb40d4 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, 19 insertions(+), 14 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 708e836..eeb9675 100644
+index 0a81543..c8c8839 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -74,8 +74,10 @@ $CONFIG = array(
+@@ -80,8 +80,10 @@ $CONFIG = array(
/* Enable the help menu item in the settings */
"knowledgebaseenabled" => true,
@@ -39,7 +39,7 @@ index 708e836..eeb9675 100644
/* URL of the appstore to use, server should understand OCS */
"appstoreurl" => "http://api.apps.owncloud.com/v1",
-@@ -228,11 +230,12 @@ $CONFIG = array(
+@@ -234,11 +236,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 708e836..eeb9675 100644
),
'user_backends'=>array(
diff --git a/lib/base.php b/lib/base.php
-index a022b9d..c4824d1 100644
+index 882b587..9404caa 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -152,7 +152,7 @@ class OC {
@@ -68,7 +68,7 @@ index a022b9d..c4824d1 100644
OC::$APPSROOTS[] = array(
'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
diff --git a/lib/private/app.php b/lib/private/app.php
-index 575cc9f..a0508c7 100644
+index ea0453e..102837f 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -431,7 +431,7 @@ class OC_App{
@@ -134,10 +134,10 @@ index 7a08816..01e82856 100644
$dbSetup->initialize($options);
$dbSetup->setupDatabase($username);
diff --git a/lib/private/util.php b/lib/private/util.php
-index 23c7053..10da41a 100644
+index 306e37b..a489a85 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -365,7 +365,7 @@ class OC_Util {
+@@ -368,7 +368,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 5caba6d..05b747b 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 eeb9675..24dc4a6 100644
+index c8c8839..065c990 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -146,8 +146,8 @@ $CONFIG = array(
+@@ -152,8 +152,8 @@ $CONFIG = array(
/* Check 3rdparty apps for malicious code fragments */
"appcodechecker" => true,
@@ -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 10da41a..9ce5efb 100644
+index a489a85..93ab566 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1310,7 +1310,7 @@ class OC_Util {
+@@ -1331,7 +1331,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 15da218..b8051e7 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 24dc4a6..0822292 100644
+index 065c990..fd42706 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -161,7 +161,7 @@ $CONFIG = array(
+@@ -167,7 +167,7 @@ $CONFIG = array(
/* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
"log_type" => "owncloud",
diff --git a/debian/patches/0012-Disable-Flash-and-Silverlight-plugins.patch b/debian/patches/0011-Disable-Flash-and-Silverlight-plugins.patch
similarity index 100%
rename from debian/patches/0012-Disable-Flash-and-Silverlight-plugins.patch
rename to debian/patches/0011-Disable-Flash-and-Silverlight-plugins.patch
diff --git a/debian/patches/0013-Disable-Assetic.patch b/debian/patches/0012-Disable-Assetic.patch
similarity index 100%
rename from debian/patches/0013-Disable-Assetic.patch
rename to debian/patches/0012-Disable-Assetic.patch
diff --git a/debian/patches/path/0005-Adapt-Archive-Tar.php-path.patch b/debian/patches/path/0004-Adapt-Archive-Tar.php-path.patch
similarity index 100%
rename from debian/patches/path/0005-Adapt-Archive-Tar.php-path.patch
rename to debian/patches/path/0004-Adapt-Archive-Tar.php-path.patch
diff --git a/debian/patches/path/0004-Adapt-class.phpmailer.php-path.patch b/debian/patches/path/0004-Adapt-class.phpmailer.php-path.patch
deleted file mode 100644
index 61b2dab..0000000
--- a/debian/patches/path/0004-Adapt-class.phpmailer.php-path.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Paul van Tilburg <paulvt at debian.org>
-Date: Tue, 5 Nov 2013 20:39:35 -0400
-Subject: Adapt class.phpmailer.php path
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-The Debian package depends on the needed classes instead of embedding
-them, i.e. libphp-phpmailer.
-
-Forwarded: not-needed
-Reviewed-by: David Prévot <taffit at debian.org>
-Last-Update: 2013-10-14
----
- lib/private/mail.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/private/mail.php b/lib/private/mail.php
-index f9083cc..6dad170 100644
---- a/lib/private/mail.php
-+++ b/lib/private/mail.php
-@@ -12,7 +12,7 @@
- * A class to handle mail sending.
- */
-
--require_once 'class.phpmailer.php';
-+require_once 'libphp-phpmailer/class.phpmailer.php';
-
- class OC_Mail {
-
diff --git a/debian/patches/path/0006-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch b/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
similarity index 96%
rename from debian/patches/path/0006-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
rename to debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
index 79062d0..e0f0655 100644
--- a/debian/patches/path/0006-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
+++ b/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
@@ -21,10 +21,10 @@ Gbp: Topic path
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/base.php b/lib/base.php
-index c4824d1..6c6d78e 100644
+index 9404caa..8225e02 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -411,12 +411,12 @@ class OC {
+@@ -426,12 +426,12 @@ 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/0006-Adapt-Crypt_Blowfish-path.patch
similarity index 100%
rename from debian/patches/path/0007-Adapt-Crypt_Blowfish-path.patch
rename to debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
diff --git a/debian/patches/path/0008-Adapt-aws-sdk-path.patch b/debian/patches/path/0007-Adapt-aws-sdk-path.patch
similarity index 100%
rename from debian/patches/path/0008-Adapt-aws-sdk-path.patch
rename to debian/patches/path/0007-Adapt-aws-sdk-path.patch
diff --git a/debian/patches/path/0009-Adapt-google-api-php-client-path.patch b/debian/patches/path/0008-Adapt-google-api-php-client-path.patch
similarity index 100%
rename from debian/patches/path/0009-Adapt-google-api-php-client-path.patch
rename to debian/patches/path/0008-Adapt-google-api-php-client-path.patch
diff --git a/debian/patches/path/0010-Adapt-Dropbox-path.patch b/debian/patches/path/0009-Adapt-Dropbox-path.patch
similarity index 100%
rename from debian/patches/path/0010-Adapt-Dropbox-path.patch
rename to debian/patches/path/0009-Adapt-Dropbox-path.patch
diff --git a/debian/patches/path/0011-Adapt-php-opencloud-path.patch b/debian/patches/path/0010-Adapt-php-opencloud-path.patch
similarity index 100%
rename from debian/patches/path/0011-Adapt-php-opencloud-path.patch
rename to debian/patches/path/0010-Adapt-php-opencloud-path.patch
diff --git a/debian/patches/series b/debian/patches/series
index d8a1e7c..62f1442 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,13 +1,12 @@
0001-Disable-the-appstore.patch
0002-Fix-displayed-version.patch
0003-Improve-logfile-handling.patch
-path/0004-Adapt-class.phpmailer.php-path.patch
-path/0005-Adapt-Archive-Tar.php-path.patch
-path/0006-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
-path/0007-Adapt-Crypt_Blowfish-path.patch
-path/0008-Adapt-aws-sdk-path.patch
-path/0009-Adapt-google-api-php-client-path.patch
-path/0010-Adapt-Dropbox-path.patch
-path/0011-Adapt-php-opencloud-path.patch
-0012-Disable-Flash-and-Silverlight-plugins.patch
-0013-Disable-Assetic.patch
+path/0004-Adapt-Archive-Tar.php-path.patch
+path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
+path/0006-Adapt-Crypt_Blowfish-path.patch
+path/0007-Adapt-aws-sdk-path.patch
+path/0008-Adapt-google-api-php-client-path.patch
+path/0009-Adapt-Dropbox-path.patch
+path/0010-Adapt-php-opencloud-path.patch
+0011-Disable-Flash-and-Silverlight-plugins.patch
+0012-Disable-Assetic.patch
--
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