[Pkg-owncloud-commits] [owncloud] 272/273: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Fri Jul 4 03:13:31 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 708f56e08743def09bce4269bf368f9632c5bc7f
Author: David Prévot <taffit at debian.org>
Date: Thu Jul 3 22:44:43 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 +-
...010-Disable-Flash-and-Silverlight-plugins.patch | 2 +-
...es_external-swift-to-php-opencloud-v1.9.2.patch | 433 ---------------------
...ctrine-Symphony-Patchwork-and-Pimple-path.patch | 4 +-
.../0008-Adapt-google-api-php-client-path.patch | 2 +-
debian/patches/path/0009-Adapt-Dropbox-path.patch | 2 +-
debian/patches/series | 1 -
9 files changed, 18 insertions(+), 452 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index a1d2534..185b2a8 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 6da00fc..647682f 100644
+index e613609..53bc44a 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -80,8 +80,10 @@ $CONFIG = array(
+@@ -84,8 +84,10 @@ $CONFIG = array(
/* Enable the help menu item in the settings */
"knowledgebaseenabled" => true,
@@ -39,7 +39,7 @@ index 6da00fc..647682f 100644
/* URL of the appstore to use, server should understand OCS */
"appstoreurl" => "http://api.apps.owncloud.com/v1",
-@@ -234,11 +236,12 @@ $CONFIG = array(
+@@ -238,11 +240,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 6da00fc..647682f 100644
),
'user_backends'=>array(
diff --git a/lib/base.php b/lib/base.php
-index eef0947..6ab7993 100644
+index b526840..71f6c31 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -149,7 +149,7 @@ class OC {
@@ -68,7 +68,7 @@ index eef0947..6ab7993 100644
OC::$APPSROOTS[] = array(
'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
diff --git a/lib/private/app.php b/lib/private/app.php
-index 01597b3..e17bb07 100644
+index 0ca2ca3..a5013d9 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -445,7 +445,7 @@ class OC_App {
@@ -134,10 +134,10 @@ index fdf98ab..88e9c21 100644
$dbSetup->initialize($options);
$dbSetup->setupDatabase($username);
diff --git a/lib/private/util.php b/lib/private/util.php
-index 94005da..fe52b3c 100644
+index eea1942..53dd0ab 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -368,7 +368,7 @@ class OC_Util {
+@@ -417,7 +417,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 fedb986..72f2225 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 647682f..46d5641 100644
+index 53bc44a..e1e6394 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -152,8 +152,8 @@ $CONFIG = array(
+@@ -156,8 +156,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 fe52b3c..a430afb 100644
+index 53dd0ab..be396d2 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1328,7 +1328,7 @@ class OC_Util {
+@@ -1404,7 +1404,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 f9b2a68..122157b 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 46d5641..9c6140a 100644
+index e1e6394..b13556f 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -167,7 +167,7 @@ $CONFIG = array(
+@@ -171,7 +171,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/0010-Disable-Flash-and-Silverlight-plugins.patch b/debian/patches/0010-Disable-Flash-and-Silverlight-plugins.patch
index a614182..9bd0c13 100644
--- a/debian/patches/0010-Disable-Flash-and-Silverlight-plugins.patch
+++ b/debian/patches/0010-Disable-Flash-and-Silverlight-plugins.patch
@@ -13,7 +13,7 @@ Forwarded: not-needed
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_videoviewer/js/mediaelement-and-player.js b/apps/files_videoviewer/js/mediaelement-and-player.js
-index 9b0d668..8a07939 100644
+index 7b52c33..ee4778f 100644
--- a/apps/files_videoviewer/js/mediaelement-and-player.js
+++ b/apps/files_videoviewer/js/mediaelement-and-player.js
@@ -859,7 +859,7 @@ mejs.MediaElementDefaults = {
diff --git a/debian/patches/0011-update-files_external-swift-to-php-opencloud-v1.9.2.patch b/debian/patches/0011-update-files_external-swift-to-php-opencloud-v1.9.2.patch
deleted file mode 100644
index 7a3b123..0000000
--- a/debian/patches/0011-update-files_external-swift-to-php-opencloud-v1.9.2.patch
+++ /dev/null
@@ -1,433 +0,0 @@
-From: =?utf-8?q?J=C3=B6rn_Friedrich_Dreyer?= <jfd at butonic.de>
-Date: Wed, 25 Jun 2014 14:56:16 +0200
-Subject: update files_external swift to php-opencloud v1.9.2
-
-Origin: upstream, https://github.com/owncloud/core/commit/42e9d49d72cd424335bed79b5b8347caa7a34f45
----
- apps/files_external/lib/swift.php | 218 ++++++++++++++++++------------------
- apps/files_external/tests/swift.php | 11 +-
- 2 files changed, 113 insertions(+), 116 deletions(-)
-
-diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
-index 0336486..47ab329 100644
---- a/apps/files_external/lib/swift.php
-+++ b/apps/files_external/lib/swift.php
-@@ -22,21 +22,21 @@
-
- namespace OC\Files\Storage;
-
--set_include_path(get_include_path() . PATH_SEPARATOR .
-- \OC_App::getAppPath('files_external') . '/3rdparty/php-opencloud/lib');
--require_once 'openstack.php';
--
--use \OpenCloud;
--use \OpenCloud\Common\Exceptions;
-+use Guzzle\Http\Exception\ClientErrorResponseException;
-+use OpenCloud;
-+use OpenCloud\Common\Exceptions;
-+use OpenCloud\OpenStack;
-+use OpenCloud\ObjectStore\Resource\DataObject;
-+use OpenCloud\ObjectStore\Exception;
-
- class Swift extends \OC\Files\Storage\Common {
-
- /**
-- * @var \OpenCloud\ObjectStore
-+ * @var \OpenCloud\ObjectStore\Service
- */
- private $connection;
- /**
-- * @var \OpenCloud\ObjectStore\Container
-+ * @var \OpenCloud\ObjectStore\Resource\Container
- */
- private $container;
- /**
-@@ -62,6 +62,8 @@ class Swift extends \OC\Files\Storage\Common {
- $path = '.';
- }
-
-+ $path = str_replace('#', '%23', $path);
-+
- return $path;
- }
-
-@@ -82,12 +84,9 @@ class Swift extends \OC\Files\Storage\Common {
- */
- private function doesObjectExist($path) {
- try {
-- $object = $this->container->DataObject($path);
-+ $this->container->getPartialObject($path);
- return true;
-- } catch (Exceptions\ObjFetchError $e) {
-- \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-- return false;
-- } catch (Exceptions\HttpError $e) {
-+ } catch (ClientErrorResponseException $e) {
- \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
- return false;
- }
-@@ -113,7 +112,6 @@ class Swift extends \OC\Files\Storage\Common {
-
- $settings = array(
- 'username' => $params['user'],
--
- );
-
- if (isset($params['password'])) {
-@@ -126,19 +124,18 @@ class Swift extends \OC\Files\Storage\Common {
- $settings['tenantName'] = $params['tenant'];
- }
-
-- $this->anchor = new \OpenCloud\OpenStack($params['url'], $settings);
--
- if (isset($params['timeout'])) {
-- $this->anchor->setHttpTimeout($params['timeout']);
-+ $settings['timeout'] = $params['timeout'];
- }
-
-- $this->connection = $this->anchor->ObjectStore($params['service_name'], $params['region'], 'publicURL');
-+ $this->anchor = new OpenStack($params['url'], $settings);
-+
-+ $this->connection = $this->anchor->objectStoreService($params['service_name'], $params['region']);
-
- try {
-- $this->container = $this->connection->Container($this->bucket);
-- } catch (Exceptions\ContainerNotFoundError $e) {
-- $this->container = $this->connection->Container();
-- $this->container->Create(array('name' => $this->bucket));
-+ $this->container = $this->connection->getContainer($this->bucket);
-+ } catch (ClientErrorResponseException $e) {
-+ $this->container = $this->connection->createContainer($this->bucket);
- }
-
- if (!$this->file_exists('.')) {
-@@ -158,11 +155,10 @@ class Swift extends \OC\Files\Storage\Common {
- }
-
- try {
-- $object = $this->container->DataObject();
-- $object->Create(array(
-- 'name' => $path,
-- 'content_type' => 'httpd/unix-directory'
-- ));
-+ $customHeaders = array('content-type' => 'httpd/unix-directory');
-+ $metadataHeaders = DataObject::stockHeaders(array());
-+ $allHeaders = $customHeaders + $metadataHeaders;
-+ $this->container->uploadObject($path, '', $allHeaders);
- } catch (Exceptions\CreateUpdateError $e) {
- \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
- return false;
-@@ -202,8 +198,7 @@ class Swift extends \OC\Files\Storage\Common {
- }
-
- try {
-- $object = $this->container->DataObject($path . '/');
-- $object->Delete();
-+ $this->container->dataObject()->setName($path . '/')->delete();
- } catch (Exceptions\DeleteError $e) {
- \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
- return false;
-@@ -221,15 +216,19 @@ class Swift extends \OC\Files\Storage\Common {
- $path .= '/';
- }
-
-+ $path = str_replace('%23', '#', $path); // the prefix is sent as a query param, so revert the encoding of #
-+
- try {
- $files = array();
-- $objects = $this->container->ObjectList(array(
-+ /** @var OpenCloud\Common\Collection $objects */
-+ $objects = $this->container->objectList(array(
- 'prefix' => $path,
- 'delimiter' => '/'
- ));
-
-- while ($object = $objects->Next()) {
-- $file = basename($object->Name());
-+ /** @var OpenCloud\ObjectStore\Resource\DataObject $object */
-+ foreach ($objects as $object) {
-+ $file = basename($object->getName());
- if ($file !== basename($path)) {
- $files[] = $file;
- }
-@@ -252,15 +251,22 @@ class Swift extends \OC\Files\Storage\Common {
- }
-
- try {
-- $object = $this->container->DataObject($path);
-- } catch (Exceptions\ObjFetchError $e) {
-+ $object = $this->container->getPartialObject($path);
-+ } catch (ClientErrorResponseException $e) {
- \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
- return false;
- }
-
-- $mtime = $object->extra_headers['X-Timestamp'];
-- if (isset($object->extra_headers['X-Object-Meta-Timestamp'])) {
-- $mtime = $object->extra_headers['X-Object-Meta-Timestamp'];
-+ $dateTime = \DateTime::createFromFormat(\DateTime::RFC1123, $object->getLastModified());
-+ if ($dateTime !== false) {
-+ $mtime = $dateTime->getTimestamp();
-+ } else {
-+ $mtime = null;
-+ }
-+ $objectMetadata = $object->getMetadata();
-+ $metaTimestamp = $objectMetadata->getProperty('timestamp');
-+ if (isset($metaTimestamp)) {
-+ $mtime = $metaTimestamp;
- }
-
- if (!empty($mtime)) {
-@@ -268,7 +274,7 @@ class Swift extends \OC\Files\Storage\Common {
- }
-
- $stat = array();
-- $stat['size'] = $object->content_length;
-+ $stat['size'] = (int) $object->getContentLength();
- $stat['mtime'] = $mtime;
- $stat['atime'] = time();
- return $stat;
-@@ -293,13 +299,13 @@ class Swift extends \OC\Files\Storage\Common {
- public function unlink($path) {
- $path = $this->normalizePath($path);
-
-+ if ($this->is_dir($path)) {
-+ return $this->rmdir($path);
-+ }
-+
- try {
-- $object = $this->container->DataObject($path);
-- $object->Delete();
-- } catch (Exceptions\DeleteError $e) {
-- \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-- return false;
-- } catch (Exceptions\ObjFetchError $e) {
-+ $this->container->dataObject()->setName($path)->delete();
-+ } catch (ClientErrorResponseException $e) {
- \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
- return false;
- }
-@@ -316,13 +322,19 @@ class Swift extends \OC\Files\Storage\Common {
- $tmpFile = \OC_Helper::tmpFile();
- self::$tmpFiles[$tmpFile] = $path;
- try {
-- $object = $this->container->DataObject($path);
-- } catch (Exceptions\ObjFetchError $e) {
-+ $object = $this->container->getObject($path);
-+ } catch (ClientErrorResponseException $e) {
-+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-+ return false;
-+ } catch (Exception\ObjectNotFoundException $e) {
- \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
- return false;
- }
- try {
-- $object->SaveToFilename($tmpFile);
-+ $objectContent = $object->getContent();
-+ $objectContent->rewind();
-+ $stream = $objectContent->getStream();
-+ file_put_contents($tmpFile, $stream);
- } catch (Exceptions\IOError $e) {
- \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
- return false;
-@@ -363,43 +375,32 @@ class Swift extends \OC\Files\Storage\Common {
- if ($this->is_dir($path)) {
- return 'httpd/unix-directory';
- } else if ($this->file_exists($path)) {
-- $object = $this->container->DataObject($path);
-- return $object->extra_headers["Content-Type"];
-+ $object = $this->container->getPartialObject($path);
-+ return $object->getContentType();
- }
- return false;
- }
-
- public function touch($path, $mtime = null) {
- $path = $this->normalizePath($path);
-+ if (is_null($mtime)) {
-+ $mtime = time();
-+ }
-+ $metadata = array('timestamp' => $mtime);
- if ($this->file_exists($path)) {
- if ($this->is_dir($path) && $path != '.') {
- $path .= '/';
- }
-
-- $object = $this->container->DataObject($path);
-- if( is_null($mtime)) {
-- $mtime = time();
-- }
-- $settings = array(
-- 'name' => $path,
-- 'extra_headers' => array(
-- 'X-Object-Meta-Timestamp' => $mtime
-- )
-- );
-- return $object->UpdateMetadata($settings);
-+ $object = $this->container->getPartialObject($path);
-+ $object->saveMetadata($metadata);
-+ return true;
- } else {
-- $object = $this->container->DataObject();
-- if (is_null($mtime)) {
-- $mtime = time();
-- }
-- $settings = array(
-- 'name' => $path,
-- 'content_type' => 'text/plain',
-- 'extra_headers' => array(
-- 'X-Object-Meta-Timestamp' => $mtime
-- )
-- );
-- return $object->Create($settings);
-+ $customHeaders = array('content-type' => 'text/plain');
-+ $metadataHeaders = DataObject::stockHeaders($metadata);
-+ $allHeaders = $customHeaders + $metadataHeaders;
-+ $this->container->uploadObject($path, '', $allHeaders);
-+ return true;
- }
- }
-
-@@ -407,31 +408,29 @@ class Swift extends \OC\Files\Storage\Common {
- $path1 = $this->normalizePath($path1);
- $path2 = $this->normalizePath($path2);
-
-- if ($this->is_file($path1)) {
-+ $fileType = $this->filetype($path1);
-+ if ($fileType === 'file') {
-+
-+ // make way
-+ $this->unlink($path2);
-+
- try {
-- $source = $this->container->DataObject($path1);
-- $target = $this->container->DataObject();
-- $target->Create(array(
-- 'name' => $path2,
-- ));
-- $source->Copy($target);
-- } catch (Exceptions\ObjectCopyError $e) {
-+ $source = $this->container->getPartialObject($path1);
-+ $source->copy($this->bucket.'/'.$path2);
-+ } catch (ClientErrorResponseException $e) {
- \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
- return false;
- }
-- } else {
-- if ($this->file_exists($path2)) {
-- return false;
-- }
-+
-+ } else if ($fileType === 'dir') {
-+
-+ // make way
-+ $this->unlink($path2);
-
- try {
-- $source = $this->container->DataObject($path1 . '/');
-- $target = $this->container->DataObject();
-- $target->Create(array(
-- 'name' => $path2 . '/',
-- ));
-- $source->Copy($target);
-- } catch (Exceptions\ObjectCopyError $e) {
-+ $source = $this->container->getPartialObject($path1 . '/');
-+ $source->copy($this->bucket.'/'.$path2 . '/');
-+ } catch (ClientErrorResponseException $e) {
- \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
- return false;
- }
-@@ -446,6 +445,10 @@ class Swift extends \OC\Files\Storage\Common {
- $target = $path2 . '/' . $file;
- $this->copy($source, $target);
- }
-+
-+ } else {
-+ //file does not exist
-+ return false;
- }
-
- return true;
-@@ -455,31 +458,28 @@ class Swift extends \OC\Files\Storage\Common {
- $path1 = $this->normalizePath($path1);
- $path2 = $this->normalizePath($path2);
-
-- if ($this->is_file($path1)) {
-+ $fileType = $this->filetype($path1);
-+
-+ if ($fileType === 'dir' || $fileType === 'file') {
-+
-+ // make way
-+ $this->unlink($path2);
-+
-+ // copy
- if ($this->copy($path1, $path2) === false) {
- return false;
- }
-
-+ // cleanup
- if ($this->unlink($path1) === false) {
- $this->unlink($path2);
- return false;
- }
-- } else {
-- if ($this->file_exists($path2)) {
-- return false;
-- }
--
-- if ($this->copy($path1, $path2) === false) {
-- return false;
-- }
-
-- if ($this->rmdir($path1) === false) {
-- $this->rmdir($path2);
-- return false;
-- }
-+ return true;
- }
-
-- return true;
-+ return false;
- }
-
- public function getId() {
-@@ -494,12 +494,8 @@ class Swift extends \OC\Files\Storage\Common {
- if (!isset(self::$tmpFiles[$tmpFile])) {
- return false;
- }
--
-- $object = $this->container->DataObject();
-- $object->Create(array(
-- 'name' => self::$tmpFiles[$tmpFile],
-- 'content_type' => \OC_Helper::getMimeType($tmpFile)
-- ), $tmpFile);
-+ $fileData = fopen($tmpFile, 'r');
-+ $this->container->uploadObject(self::$tmpFiles[$tmpFile], $fileData);
- unlink($tmpFile);
- }
-
-diff --git a/apps/files_external/tests/swift.php b/apps/files_external/tests/swift.php
-index bdfdbde..3918497 100644
---- a/apps/files_external/tests/swift.php
-+++ b/apps/files_external/tests/swift.php
-@@ -38,14 +38,15 @@ class Swift extends Storage {
- public function tearDown() {
- if ($this->instance) {
- $connection = $this->instance->getConnection();
-- $container = $connection->Container($this->config['swift']['bucket']);
-+ $container = $connection->getContainer($this->config['swift']['bucket']);
-
-- $objects = $container->ObjectList();
-- while($object = $objects->Next()) {
-- $object->Delete();
-+ $objects = $container->objectList();
-+ while($object = $objects->next()) {
-+ $object->setName(str_replace('#','%23',$object->getName()));
-+ $object->delete();
- }
-
-- $container->Delete();
-+ $container->delete();
- }
- }
- }
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 02f3619..3880741 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
@@ -15,10 +15,10 @@ Gbp: Topic path
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/base.php b/lib/base.php
-index 6ab7993..4055b20 100644
+index 71f6c31..c423852 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -421,12 +421,12 @@ class OC {
+@@ -423,12 +423,12 @@ class OC {
// register autoloader
require_once __DIR__ . '/autoloader.php';
self::$loader = new \OC\Autoloader();
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 6aa74cf..3bc3a8e 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
@@ -13,7 +13,7 @@ Last-Update: 2013-09-24
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/files_external/ajax/google.php b/apps/files_external/ajax/google.php
-index 2594a17..269f0b0 100644
+index 13e7407..960bd0a 100644
--- a/apps/files_external/ajax/google.php
+++ b/apps/files_external/ajax/google.php
@@ -1,6 +1,6 @@
diff --git a/debian/patches/path/0009-Adapt-Dropbox-path.patch b/debian/patches/path/0009-Adapt-Dropbox-path.patch
index d6355dd..2075333 100644
--- a/debian/patches/path/0009-Adapt-Dropbox-path.patch
+++ b/debian/patches/path/0009-Adapt-Dropbox-path.patch
@@ -13,7 +13,7 @@ Last-Update: 2013-11-06
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/files_external/ajax/dropbox.php b/apps/files_external/ajax/dropbox.php
-index 91c4655..bc9821c 100644
+index bbedf8e..6971fa2 100644
--- a/apps/files_external/ajax/dropbox.php
+++ b/apps/files_external/ajax/dropbox.php
@@ -1,6 +1,6 @@
diff --git a/debian/patches/series b/debian/patches/series
index c7fa28a..15e8dcf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@ path/0007-Adapt-aws-sdk-path.patch
path/0008-Adapt-google-api-php-client-path.patch
path/0009-Adapt-Dropbox-path.patch
0010-Disable-Flash-and-Silverlight-plugins.patch
-0011-update-files_external-swift-to-php-opencloud-v1.9.2.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