[Pkg-owncloud-commits] [owncloud] 17/20: Update patches
David Prévot
taffit at moszumanska.debian.org
Tue Apr 29 17:37:56 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 9554e1b70d6038d4ec1edf9afc08a33418176913
Author: David Prévot <taffit at debian.org>
Date: Mon Apr 28 23:01:55 2014 -0400
Update 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 | 2 +-
...16-Disable-Flash-and-Silverlight-plugins.patch} | 0
...octrine-Symphony-Sabre-and-Patchwork-path.patch | 2 +-
...path.patch => 0008-Adapt-chosen-css-path.patch} | 5 +++--
debian/patches/path/0008-Adapt-dompdf-path.patch | 26 ----------------------
....patch => 0009-Adapt-Crypt_Blowfish-path.patch} | 0
...dk-path.patch => 0010-Adapt-aws-sdk-path.patch} | 0
...-path.patch => 0011-Adapt-iRODS-PHP-path.patch} | 0
...=> 0012-Adapt-google-api-php-client-path.patch} | 0
...ox-path.patch => 0013-Adapt-Dropbox-path.patch} | 0
...h.patch => 0014-Adapt-php-opencloud-path.patch} | 0
...-Zend-path.patch => 0015-Adapt-Zend-path.patch} | 0
debian/patches/series | 19 ++++++++--------
15 files changed, 17 insertions(+), 43 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 5a5542f..99de775 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, 19 insertions(+), 14 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 72b21ff..22cf223 100644
+index 0cf8611..a518c3f 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -74,8 +74,10 @@ $CONFIG = array(
@@ -55,7 +55,7 @@ index 72b21ff..22cf223 100644
),
'user_backends'=>array(
diff --git a/lib/base.php b/lib/base.php
-index b594aa4..65a3245 100644
+index 5a83a69..efaeb4b 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -145,7 +145,7 @@ class OC {
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index 1c93bc9..7e567ab 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, 4 insertions(+), 4 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 22cf223..35ce430 100644
+index a518c3f..ec36f6d 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -134,8 +134,8 @@ $CONFIG = array(
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index 9d89e31..6e26bdb 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -13,7 +13,7 @@ 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 35ce430..fb69176 100644
+index ec36f6d..dbfd75d 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -149,7 +149,7 @@ $CONFIG = array(
diff --git a/debian/patches/0017-Disable-Flash-and-Silverlight-plugins.patch b/debian/patches/0016-Disable-Flash-and-Silverlight-plugins.patch
similarity index 100%
rename from debian/patches/0017-Disable-Flash-and-Silverlight-plugins.patch
rename to debian/patches/0016-Disable-Flash-and-Silverlight-plugins.patch
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 6f4426a..0c2bc0f 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 65a3245..cbdaa64 100644
+index efaeb4b..d148cae 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -435,13 +435,13 @@ class OC {
diff --git a/debian/patches/path/0009-Adapt-chosen-css-path.patch b/debian/patches/path/0008-Adapt-chosen-css-path.patch
similarity index 86%
rename from debian/patches/path/0009-Adapt-chosen-css-path.patch
rename to debian/patches/path/0008-Adapt-chosen-css-path.patch
index 9c5b7cc..7f4c605 100644
--- a/debian/patches/path/0009-Adapt-chosen-css-path.patch
+++ b/debian/patches/path/0008-Adapt-chosen-css-path.patch
@@ -4,8 +4,9 @@ Subject: Adapt chosen (css) path
Avoid shipping duplicate files in subdirectories.
-Forwarded: https://github.com/owncloud/core/pull/8309
-Last-Update: 2013-10-14
+Applied-Upstream: https://github.com/owncloud/core/commit/eebb756c3814ec481d2fad0734800ebbd3621769
+Last-Update: 2014-04-28
+Gbp: Topic path
---
settings/personal.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/path/0008-Adapt-dompdf-path.patch b/debian/patches/path/0008-Adapt-dompdf-path.patch
deleted file mode 100644
index 241d765..0000000
--- a/debian/patches/path/0008-Adapt-dompdf-path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Tue, 5 Nov 2013 20:39:36 -0400
-Subject: Adapt dompdf path
-
-The Debian package depends on the needed classes instead of embedding
-them, i.e. php-dompdf.
-
-Forwarded: not-needed
-Last-Update: 2013-10-21
----
- lib/private/preview/office-fallback.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/private/preview/office-fallback.php b/lib/private/preview/office-fallback.php
-index f184b31..ad282dd 100644
---- a/lib/private/preview/office-fallback.php
-+++ b/lib/private/preview/office-fallback.php
-@@ -66,7 +66,7 @@ class MSOfficeExcel extends Provider {
- $tmpPath = \OC_Helper::tmpFile();
-
- $rendererName = \PHPExcel_Settings::PDF_RENDERER_DOMPDF;
-- $rendererLibraryPath = \OC::$THIRDPARTYROOT . '/3rdparty/dompdf';
-+ $rendererLibraryPath = 'dompdf';
-
- \PHPExcel_Settings::setPdfRenderer($rendererName, $rendererLibraryPath);
-
diff --git a/debian/patches/path/0010-Adapt-Crypt_Blowfish-path.patch b/debian/patches/path/0009-Adapt-Crypt_Blowfish-path.patch
similarity index 100%
rename from debian/patches/path/0010-Adapt-Crypt_Blowfish-path.patch
rename to debian/patches/path/0009-Adapt-Crypt_Blowfish-path.patch
diff --git a/debian/patches/path/0011-Adapt-aws-sdk-path.patch b/debian/patches/path/0010-Adapt-aws-sdk-path.patch
similarity index 100%
rename from debian/patches/path/0011-Adapt-aws-sdk-path.patch
rename to debian/patches/path/0010-Adapt-aws-sdk-path.patch
diff --git a/debian/patches/path/0012-Adapt-iRODS-PHP-path.patch b/debian/patches/path/0011-Adapt-iRODS-PHP-path.patch
similarity index 100%
rename from debian/patches/path/0012-Adapt-iRODS-PHP-path.patch
rename to debian/patches/path/0011-Adapt-iRODS-PHP-path.patch
diff --git a/debian/patches/path/0013-Adapt-google-api-php-client-path.patch b/debian/patches/path/0012-Adapt-google-api-php-client-path.patch
similarity index 100%
rename from debian/patches/path/0013-Adapt-google-api-php-client-path.patch
rename to debian/patches/path/0012-Adapt-google-api-php-client-path.patch
diff --git a/debian/patches/path/0014-Adapt-Dropbox-path.patch b/debian/patches/path/0013-Adapt-Dropbox-path.patch
similarity index 100%
rename from debian/patches/path/0014-Adapt-Dropbox-path.patch
rename to debian/patches/path/0013-Adapt-Dropbox-path.patch
diff --git a/debian/patches/path/0015-Adapt-php-opencloud-path.patch b/debian/patches/path/0014-Adapt-php-opencloud-path.patch
similarity index 100%
rename from debian/patches/path/0015-Adapt-php-opencloud-path.patch
rename to debian/patches/path/0014-Adapt-php-opencloud-path.patch
diff --git a/debian/patches/path/0016-Adapt-Zend-path.patch b/debian/patches/path/0015-Adapt-Zend-path.patch
similarity index 100%
rename from debian/patches/path/0016-Adapt-Zend-path.patch
rename to debian/patches/path/0015-Adapt-Zend-path.patch
diff --git a/debian/patches/series b/debian/patches/series
index be08744..9eaea3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,13 +5,12 @@ path/0004-Adapt-class.phpmailer.php-path.patch
path/0005-Adapt-Archive-Tar.php-path.patch
path/0006-Adapt-mediawiki-path.patch
path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch
-path/0008-Adapt-dompdf-path.patch
-path/0009-Adapt-chosen-css-path.patch
-path/0010-Adapt-Crypt_Blowfish-path.patch
-path/0011-Adapt-aws-sdk-path.patch
-path/0012-Adapt-iRODS-PHP-path.patch
-path/0013-Adapt-google-api-php-client-path.patch
-path/0014-Adapt-Dropbox-path.patch
-path/0015-Adapt-php-opencloud-path.patch
-path/0016-Adapt-Zend-path.patch
-0017-Disable-Flash-and-Silverlight-plugins.patch
+path/0008-Adapt-chosen-css-path.patch
+path/0009-Adapt-Crypt_Blowfish-path.patch
+path/0010-Adapt-aws-sdk-path.patch
+path/0011-Adapt-iRODS-PHP-path.patch
+path/0012-Adapt-google-api-php-client-path.patch
+path/0013-Adapt-Dropbox-path.patch
+path/0014-Adapt-php-opencloud-path.patch
+path/0015-Adapt-Zend-path.patch
+0016-Disable-Flash-and-Silverlight-plugins.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