[Pkg-owncloud-commits] [owncloud] 202/205: Refresh patches

David Prévot taffit at moszumanska.debian.org
Thu Jul 2 17:37:16 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit eabc5c1b6580658e7d56e418e5f8814a7f3baec5
Author: David Prévot <taffit at debian.org>
Date:   Thu Jul 2 12:09:36 2015 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 debian/patches/0001-Disable-the-appstore.patch                 | 10 +++++-----
 debian/patches/0002-Fix-displayed-version.patch                |  8 ++++----
 debian/patches/0003-Improve-logfile-handling.patch             |  8 ++++----
 debian/patches/0004-Make-isCurrentHtaccess-a-noop.patch        |  4 ++--
 debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch  |  6 +++---
 debian/patches/0009-updating-ZipStreamer.patch                 | 10 +++++-----
 debian/patches/path/0005-Adapt-aws-sdk-path.patch              |  2 +-
 .../patches/path/0006-Adapt-google-api-php-client-path.patch   |  4 ++--
 debian/patches/path/0007-Adapt-Dropbox-path.patch              |  4 ++--
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 677278d..ab0ccb5 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -21,7 +21,7 @@ Last-Update: 2014-04-22
  6 files changed, 10 insertions(+), 8 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
-index 87ca678..a978cf6 100644
+index 19e7843..564062e 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -588,8 +588,9 @@ $CONFIG = array(
@@ -52,7 +52,7 @@ index 87ca678..a978cf6 100644
  ),
  
 diff --git a/lib/base.php b/lib/base.php
-index b9f2e4a..d2cee88 100644
+index 829c2bc..81081b9 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -205,7 +205,7 @@ class OC {
@@ -65,7 +65,7 @@ index b9f2e4a..d2cee88 100644
  			OC::$APPSROOTS[] = array(
  				'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
 diff --git a/lib/private/app.php b/lib/private/app.php
-index 4814561..1dddbc4 100644
+index c506be1..cbf239a 100644
 --- a/lib/private/app.php
 +++ b/lib/private/app.php
 @@ -501,7 +501,7 @@ class OC_App {
@@ -78,7 +78,7 @@ index 4814561..1dddbc4 100644
  		}
  
 diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
-index f10a974..e1a4be5 100644
+index 18ba4ce..e8301ad 100644
 --- a/lib/private/ocsclient.php
 +++ b/lib/private/ocsclient.php
 @@ -68,7 +68,7 @@ class OCSClient {
@@ -91,7 +91,7 @@ index f10a974..e1a4be5 100644
  
  	/**
 diff --git a/lib/private/util.php b/lib/private/util.php
-index 59408c0..5197dfe 100644
+index 9c78ad3..6c4cd32 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
 @@ -601,7 +601,7 @@ class OC_Util {
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index 766e818..1786494 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 a978cf6..ae98473 100644
+index 564062e..3914762 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -429,7 +429,7 @@ $CONFIG = array(
@@ -31,10 +31,10 @@ index a978cf6..ae98473 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 998a683..14d9b02 100644
+index 93bf6cb..c5155c0 100644
 --- a/lib/private/templatelayout.php
 +++ b/lib/private/templatelayout.php
-@@ -75,7 +75,7 @@ class OC_TemplateLayout extends OC_Template {
+@@ -76,7 +76,7 @@ class OC_TemplateLayout extends OC_Template {
  			}
  
  			// Update notification
@@ -44,7 +44,7 @@ index 998a683..14d9b02 100644
  				$updater = new \OC\Updater(\OC::$server->getHTTPHelper(),
  					\OC::$server->getConfig());
 diff --git a/lib/private/util.php b/lib/private/util.php
-index 5197dfe..760647f 100644
+index 6c4cd32..1692de2 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
 @@ -1391,7 +1391,7 @@ class OC_Util {
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index 5349e10..f28e4a6 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 ae98473..fe18e6c 100644
+index 3914762..d1df425 100644
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
 @@ -476,8 +476,9 @@ $CONFIG = array(
@@ -29,7 +29,7 @@ index ae98473..fe18e6c 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 d2cee88..faeb098 100644
+index 81081b9..a2cc6d2 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -758,7 +758,7 @@ class OC {
@@ -42,10 +42,10 @@ index d2cee88..faeb098 100644
  	}
  
 diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php
-index 0125164..c17da55 100644
+index 01112ef..a122dce 100644
 --- a/lib/private/log/owncloud.php
 +++ b/lib/private/log/owncloud.php
-@@ -45,7 +45,7 @@ class OC_Log_Owncloud {
+@@ -38,7 +38,7 @@ class OC_Log_Owncloud {
  	 * Init class data
  	 */
  	public static function init() {
diff --git a/debian/patches/0004-Make-isCurrentHtaccess-a-noop.patch b/debian/patches/0004-Make-isCurrentHtaccess-a-noop.patch
index 64409d7..5055aff 100644
--- a/debian/patches/0004-Make-isCurrentHtaccess-a-noop.patch
+++ b/debian/patches/0004-Make-isCurrentHtaccess-a-noop.patch
@@ -10,10 +10,10 @@ Forwarded: not-needed
  1 file changed, 1 insertion(+), 7 deletions(-)
 
 diff --git a/lib/private/setup.php b/lib/private/setup.php
-index 7ca30e1..230d1ce 100644
+index 50bf0dc..742a3a3 100644
 --- a/lib/private/setup.php
 +++ b/lib/private/setup.php
-@@ -382,13 +382,7 @@ class Setup {
+@@ -381,13 +381,7 @@ class Setup {
  	 * @return bool
  	 */
  	private function isCurrentHtaccess() {
diff --git a/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch b/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch
index 70943d1..90b076e 100644
--- a/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch
+++ b/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch
@@ -124,10 +124,10 @@ index 0000000..fc17944
 +    }
 +}
 diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
-index 14d9b02..52498eb 100644
+index c5155c0..176c542 100644
 --- a/lib/private/templatelayout.php
 +++ b/lib/private/templatelayout.php
-@@ -37,7 +37,7 @@ use Assetic\AssetWriter;
+@@ -38,7 +38,7 @@ use Assetic\AssetWriter;
  use Assetic\Filter\CssImportFilter;
  use Assetic\Filter\CssMinFilter;
  use Assetic\Filter\CssRewriteFilter;
@@ -136,7 +136,7 @@ index 14d9b02..52498eb 100644
  use OC\Assetic\SeparatorFilter; // waiting on upstream
  
  /**
-@@ -219,7 +219,7 @@ class OC_TemplateLayout extends OC_Template {
+@@ -220,7 +220,7 @@ class OC_TemplateLayout extends OC_Template {
  					), $root, $file);
  				}
  				return new FileAsset($root . '/' . $file, array(
diff --git a/debian/patches/0009-updating-ZipStreamer.patch b/debian/patches/0009-updating-ZipStreamer.patch
index d2f88eb..f6853ce 100644
--- a/debian/patches/0009-updating-ZipStreamer.patch
+++ b/debian/patches/0009-updating-ZipStreamer.patch
@@ -8,10 +8,10 @@ Origin: upstream, https://github.com/owncloud/core/commit/ca55c10d668904ed350dff
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/lib/private/files.php b/lib/private/files.php
-index 5a3e102..8c0f7ee 100644
+index 17e2e5a..050858a 100644
 --- a/lib/private/files.php
 +++ b/lib/private/files.php
-@@ -39,9 +39,7 @@
+@@ -38,9 +38,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>
   *
   */
@@ -20,9 +20,9 @@ index 5a3e102..8c0f7ee 100644
 -require_once 'mcnetic/phpzipstreamer/ZipStreamer.php';
 +use ZipStreamer\ZipStreamer;
  
- /**
-  * Class for file server access
-@@ -126,7 +124,7 @@ class OC_Files {
+ use OC\Lock\NoopLockingProvider;
+ use OCP\Lock\ILockingProvider;
+@@ -132,7 +130,7 @@ class OC_Files {
  				$xsendfile = false;
  			}
  		} else {
diff --git a/debian/patches/path/0005-Adapt-aws-sdk-path.patch b/debian/patches/path/0005-Adapt-aws-sdk-path.patch
index e368ae4..a174941 100644
--- a/debian/patches/path/0005-Adapt-aws-sdk-path.patch
+++ b/debian/patches/path/0005-Adapt-aws-sdk-path.patch
@@ -11,7 +11,7 @@ Last-Update: 2014-01-02
  1 file changed, 4 deletions(-)
 
 diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
-index 763cf59..f919162 100644
+index 02a0271..6331592 100644
 --- a/apps/files_external/lib/amazons3.php
 +++ b/apps/files_external/lib/amazons3.php
 @@ -34,10 +34,6 @@
diff --git a/debian/patches/path/0006-Adapt-google-api-php-client-path.patch b/debian/patches/path/0006-Adapt-google-api-php-client-path.patch
index 797e580..e69a119 100644
--- a/debian/patches/path/0006-Adapt-google-api-php-client-path.patch
+++ b/debian/patches/path/0006-Adapt-google-api-php-client-path.patch
@@ -26,10 +26,10 @@ index acaf1b0..34cb21b 100644
  
  OCP\JSON::checkAppEnabled('files_external');
 diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
-index 541113f..7cd3876 100644
+index 8199d97..8233b28 100644
 --- a/apps/files_external/lib/google.php
 +++ b/apps/files_external/lib/google.php
-@@ -31,8 +31,6 @@
+@@ -32,8 +32,6 @@
  
  namespace OC\Files\Storage;
  
diff --git a/debian/patches/path/0007-Adapt-Dropbox-path.patch b/debian/patches/path/0007-Adapt-Dropbox-path.patch
index 2962570..54d0b45 100644
--- a/debian/patches/path/0007-Adapt-Dropbox-path.patch
+++ b/debian/patches/path/0007-Adapt-Dropbox-path.patch
@@ -13,10 +13,10 @@ Last-Update: 2014-10-09
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/apps/files_external/ajax/dropbox.php b/apps/files_external/ajax/dropbox.php
-index 495387b..c1d9be4 100644
+index 55dc417..324abd0 100644
 --- a/apps/files_external/ajax/dropbox.php
 +++ b/apps/files_external/ajax/dropbox.php
-@@ -24,7 +24,7 @@
+@@ -23,7 +23,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>
   *
   */

-- 
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