[Pkg-owncloud-commits] [owncloud] 75/78: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Sun May 31 01:59:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 25a0097c31f2d6bcc86df4d6d59e68516ef77a54
Author: David Prévot <taffit at debian.org>
Date: Sat May 30 19:20:07 2015 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 4 ++--
debian/patches/0002-Fix-displayed-version.patch | 2 +-
debian/patches/0003-Improve-logfile-handling.patch | 6 +++---
debian/patches/path/0004-Adapt-Archive-Tar.php-path.patch | 1 -
.../0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch | 5 ++---
debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch | 1 -
debian/patches/path/0007-Adapt-aws-sdk-path.patch | 1 -
debian/patches/path/0008-Adapt-google-api-php-client-path.patch | 1 -
debian/patches/path/0009-Adapt-Dropbox-path.patch | 1 -
9 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 54adaaf..9f7e6d5 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, 14 insertions(+), 10 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 3ddf0a6..0b22049 100644
+index 60c01af..619a4fe 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -539,8 +539,9 @@ $CONFIG = array(
@@ -54,7 +54,7 @@ index 3ddf0a6..0b22049 100644
),
diff --git a/lib/base.php b/lib/base.php
-index 495d753..27084e4 100644
+index 1714bd1..cd9aaa7 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -157,7 +157,7 @@ class OC {
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index 7e33cd4..3c929c2 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, 3 insertions(+), 3 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 0b22049..b5988f5 100644
+index 619a4fe..8789893 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -414,7 +414,7 @@ $CONFIG = array(
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index 8803e1d..be09a19 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -14,7 +14,7 @@ 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 b5988f5..5104050 100644
+index 8789893..67deb0d 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -459,8 +459,9 @@ $CONFIG = array(
@@ -29,10 +29,10 @@ index b5988f5..5104050 100644
/**
* Loglevel to start logging at. Valid values are: 0 = Debug, 1 = Info, 2 =
diff --git a/lib/base.php b/lib/base.php
-index 27084e4..d1eb4f6 100644
+index cd9aaa7..2adaaa9 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -618,7 +618,7 @@ class OC {
+@@ -628,7 +628,7 @@ class OC {
if (OC_Config::getValue('installed', false) && OC_Config::getValue('log_rotate_size', false) && !\OCP\Util::needUpgrade()) {
//don't try to do this before we are properly setup
//use custom logfile path if defined, otherwise use default of owncloud.log in data directory
diff --git a/debian/patches/path/0004-Adapt-Archive-Tar.php-path.patch b/debian/patches/path/0004-Adapt-Archive-Tar.php-path.patch
index 9a7fda9..9ae11e7 100644
--- a/debian/patches/path/0004-Adapt-Archive-Tar.php-path.patch
+++ b/debian/patches/path/0004-Adapt-Archive-Tar.php-path.patch
@@ -11,7 +11,6 @@ them, i.e. php-pear.
Bug-Debian: http://bugs.debian.org/677159
Reviewed-by: David Prévot <taffit at debian.org>
Last-Update: 2014-10-09
-Gbp: Topic path
---
lib/private/archive/tar.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 0e62047..d9b3ab8 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
@@ -8,16 +8,15 @@ php-symfony-routing, php-patchwork-utf8 and php-pimple.
Forwarded: not-needed
Last-Update: 2014-10-09
-Gbp: Topic path
---
lib/base.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/base.php b/lib/base.php
-index d1eb4f6..37c4d40 100644
+index 2adaaa9..20bf824 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -439,12 +439,12 @@ class OC {
+@@ -449,12 +449,12 @@ class OC {
// register autoloader
require_once __DIR__ . '/autoloader.php';
self::$loader = new \OC\Autoloader();
diff --git a/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch b/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
index 66b7348..a7c36d6 100644
--- a/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
+++ b/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
@@ -7,7 +7,6 @@ them, i.e. php-crypt-blowfish.
Forwarded: not-needed
Last-Update: 2014-10-09
-Gbp: Topic path
---
apps/files_encryption/lib/crypt.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/path/0007-Adapt-aws-sdk-path.patch b/debian/patches/path/0007-Adapt-aws-sdk-path.patch
index 0deef68..7bf6432 100644
--- a/debian/patches/path/0007-Adapt-aws-sdk-path.patch
+++ b/debian/patches/path/0007-Adapt-aws-sdk-path.patch
@@ -6,7 +6,6 @@ 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 ----
1 file changed, 4 deletions(-)
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 798af3d..f12cdd2 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
@@ -7,7 +7,6 @@ them, i.e. php-google-api-php-client.
Forwarded: not-needed
Last-Update: 2014-10-09
-Gbp: Topic path
---
apps/files_external/ajax/google.php | 2 +-
apps/files_external/lib/google.php | 2 +-
diff --git a/debian/patches/path/0009-Adapt-Dropbox-path.patch b/debian/patches/path/0009-Adapt-Dropbox-path.patch
index 2c7fde6..a467d61 100644
--- a/debian/patches/path/0009-Adapt-Dropbox-path.patch
+++ b/debian/patches/path/0009-Adapt-Dropbox-path.patch
@@ -7,7 +7,6 @@ them, i.e. php-dropbox.
Forwarded: not-needed
Last-Update: 2014-10-09
-Gbp: Topic path
---
apps/files_external/ajax/dropbox.php | 2 +-
apps/files_external/lib/dropbox.php | 2 +-
--
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