[Pkg-owncloud-commits] [owncloud] 06/17: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Thu Mar 12 22:07:30 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 12e13621d02243ec46e12ac96a699c7ebb458690
Author: David Prévot <taffit at debian.org>
Date: Thu Mar 12 14:31:27 2015 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 101 ++++++++-------------
debian/patches/0002-Fix-displayed-version.patch | 28 +++---
debian/patches/0003-Improve-logfile-handling.patch | 18 ++--
.../path/0004-Adapt-Archive-Tar.php-path.patch | 31 -------
...dk-path.patch => 0004-Adapt-aws-sdk-path.patch} | 2 +-
...ctrine-Symphony-Patchwork-and-Pimple-path.patch | 38 --------
...=> 0005-Adapt-google-api-php-client-path.patch} | 27 +++---
.../path/0006-Adapt-Crypt_Blowfish-path.patch | 27 ------
...ox-path.patch => 0006-Adapt-Dropbox-path.patch} | 2 +-
debian/patches/series | 9 +-
10 files changed, 80 insertions(+), 203 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 54adaaf..4330ebb 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -12,21 +12,20 @@ Forwarded: not-needed
Reviewed-by: David Prévot <taffit at debian.org>
Last-Update: 2014-04-22
---
- config/config.sample.php | 8 +++++---
- lib/base.php | 2 +-
- lib/private/app.php | 2 +-
- lib/private/ocsclient.php | 2 +-
- lib/private/setup.php | 2 ++
- lib/private/util.php | 2 +-
- settings/ajax/apps/ocs.php | 2 +-
- settings/templates/apps.php | 4 ++--
- 8 files changed, 14 insertions(+), 10 deletions(-)
+ config/config.sample.php | 8 +++++---
+ lib/base.php | 2 +-
+ lib/private/app.php | 2 +-
+ lib/private/ocsclient.php | 2 +-
+ lib/private/util.php | 2 +-
+ settings/controller/appsettingscontroller.php | 2 +-
+ settings/templates/apps.php | 2 +-
+ 7 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 3ddf0a6..0b22049 100644
+index c98ce25..2da6a54 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -539,8 +539,9 @@ $CONFIG = array(
+@@ -556,8 +556,9 @@ $CONFIG = array(
/**
* When enabled, admins may install apps from the ownCloud app store.
* The app store is disabled by default for ownCloud Enterprise Edition
@@ -37,7 +36,7 @@ index 3ddf0a6..0b22049 100644
/**
* The URL of the appstore to use.
-@@ -554,12 +555,13 @@ $CONFIG = array(
+@@ -571,12 +572,13 @@ $CONFIG = array(
* file system path to the app folder. The key ``url`` defines the HTTP web path
* to that folder, starting from the ownCloud web root. The key ``writable``
* indicates if a web server can write files to that folder.
@@ -54,7 +53,7 @@ index 3ddf0a6..0b22049 100644
),
diff --git a/lib/base.php b/lib/base.php
-index 495d753..27084e4 100644
+index ae9a7b2..42283f6 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -157,7 +157,7 @@ class OC {
@@ -67,10 +66,10 @@ index 495d753..27084e4 100644
OC::$APPSROOTS[] = array(
'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
diff --git a/lib/private/app.php b/lib/private/app.php
-index 9712775..f1984a9 100644
+index d3dcf1f..54fbaad 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
-@@ -487,7 +487,7 @@ class OC_App {
+@@ -502,7 +502,7 @@ class OC_App {
* @return string
*/
public static function getInstallPath() {
@@ -80,7 +79,7 @@ index 9712775..f1984a9 100644
}
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
-index dc147de..52db11c 100644
+index 7ce6723..b779836 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -33,7 +33,7 @@ class OC_OCSClient{
@@ -92,24 +91,11 @@ index dc147de..52db11c 100644
return false;
}
-diff --git a/lib/private/setup.php b/lib/private/setup.php
-index a958aba..216d313 100644
---- a/lib/private/setup.php
-+++ b/lib/private/setup.php
-@@ -189,6 +189,8 @@ class OC_Setup {
- OC_Config::setValue('overwrite.cli.url', \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . OC::$WEBROOT);
- OC_Config::setValue('dbtype', $dbtype);
- OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
-+ OC_Config::setValue('appstoreenabled', false);
-+ OC_Config::setValue('apps_paths', array(array('path'=> '/usr/share/owncloud/apps','url' => '/apps','writable' => false)));
- try {
- $dbSetup->initialize($options);
- $dbSetup->setupDatabase($username);
diff --git a/lib/private/util.php b/lib/private/util.php
-index f02a990..50e3d60 100644
+index 4e69bf2..e0f3363 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -437,7 +437,7 @@ class OC_Util {
+@@ -515,7 +515,7 @@ class OC_Util {
}
// Check if there is a writable install folder.
@@ -117,39 +103,30 @@ index f02a990..50e3d60 100644
+ if ($config->getSystemValue('appstoreenabled', false)) {
if (OC_App::getInstallPath() === null
|| !is_writable(OC_App::getInstallPath())
- || !is_readable(OC_App::getInstallPath()) ) {
-diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
-index b68083f..844a43a 100644
---- a/settings/ajax/apps/ocs.php
-+++ b/settings/ajax/apps/ocs.php
-@@ -10,7 +10,7 @@ OC_JSON::checkAdminUser();
-
- $l = OC_L10N::get('settings');
-
--if(OC_Config::getValue('appstoreenabled', true)==false) {
-+if(OC_Config::getValue('appstoreenabled', false)==false) {
- OCP\JSON::success(array('type' => 'external', 'data' => array()));
- }
+ || !is_readable(OC_App::getInstallPath())
+diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php
+index 7240343..8ff68ea 100644
+--- a/settings/controller/appsettingscontroller.php
++++ b/settings/controller/appsettingscontroller.php
+@@ -63,7 +63,7 @@ class AppSettingsController extends Controller {
+ ['id' => 1, 'displayName' => (string)$this->l10n->t('Not enabled')],
+ ];
+- if($this->config->getSystemValue('appstoreenabled', true)) {
++ if($this->config->getSystemValue('appstoreenabled', false)) {
+ $categories[] = ['id' => 2, 'displayName' => (string)$this->l10n->t('Recommended')];
+ // apps from external repo via OCS
+ $ocs = \OC_OCSClient::getCategories();
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
-index 5199d3f..a5b4557 100644
+index 02cab16..ca2c374 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
-@@ -9,7 +9,7 @@
-
- <div id="app-navigation">
- <ul class="applist">
-- <?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
-+ <?php if(OC_Config::getValue('appstoreenabled', false) === true): ?>
- <li>
- <a class="app-external" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your App'));?> …</a>
- </li>
-@@ -26,7 +26,7 @@
- </li>
- <?php endforeach;?>
+@@ -3,7 +3,7 @@
+ <li id="app-category-{{id}}" data-category-id="{{id}}"><a>{{displayName}}</a></li>
+ {{/each}}
-- <?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
-+ <?php if(OC_Config::getValue('appstoreenabled', false) === true): ?>
- <li>
- <a class="app-external" target="_blank" href="http://apps.owncloud.com"><?php p($l->t('More Apps'));?> …</a>
- </li>
+-<?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
++<?php if(OC_Config::getValue('appstoreenabled', false) === true): ?>
+ <li>
+ <a class="app-external" target="_blank" href="https://apps.owncloud.com/?xsortmode=high"><?php p($l->t('More apps'));?> …</a>
+ </li>
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index 7e33cd4..d9acd8c 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, 3 insertions(+), 3 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 0b22049..b5988f5 100644
+index 2da6a54..d1cad75 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -414,7 +414,7 @@ $CONFIG = array(
+@@ -429,7 +429,7 @@ $CONFIG = array(
* Check if ownCloud is up-to-date and shows a notification if a new version is
* available.
*/
@@ -31,28 +31,28 @@ index 0b22049..b5988f5 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 1f2f3eb..b1a61c7 100644
+index f8cee15..99b10e4 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
-@@ -32,7 +32,7 @@ class OC_TemplateLayout extends OC_Template {
+@@ -43,7 +43,7 @@ class OC_TemplateLayout extends OC_Template {
}
// Update notification
-- if(OC_Config::getValue('updatechecker', true) === true) {
-+ if(OC_Config::getValue('updatechecker', false) === true) {
- $data=OC_Updater::check();
- if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array() && OC_User::isAdminUser(OC_User::getUser())) {
- $this->assign('updateAvailable', true);
+- if($this->config->getSystemValue('updatechecker', true) === true &&
++ if($this->config->getSystemValue('updatechecker', false) === true &&
+ OC_User::isAdminUser(OC_User::getUser())) {
+ $updater = new \OC\Updater(\OC::$server->getHTTPHelper(),
+ \OC::$server->getConfig());
diff --git a/lib/private/util.php b/lib/private/util.php
-index 50e3d60..151f9f8 100644
+index e0f3363..2e1d96c 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1316,7 +1316,7 @@ class OC_Util {
+@@ -1337,7 +1337,7 @@ class OC_Util {
* @return string
*/
public static function getHumanVersion() {
-- $version = OC_Util::getVersionString().' ('.OC_Util::getChannel().')';
-+ $version = '@VERSION@'.' ('.OC_Util::getChannel().')';
+- $version = OC_Util::getVersionString() . ' (' . OC_Util::getChannel() . ')';
++ $version = '@VERSION@' . ' (' . OC_Util::getChannel() . ')';
$build = OC_Util::getBuild();
- if(!empty($build) and OC_Util::getChannel() === 'daily') {
+ if (!empty($build) and OC_Util::getChannel() === 'daily') {
$version .= ' Build:' . $build;
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index 8803e1d..99e6bb7 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -14,10 +14,10 @@ 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 d1cad75..5e5894f 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -459,8 +459,9 @@ $CONFIG = array(
+@@ -476,8 +476,9 @@ $CONFIG = array(
/**
* Change the ownCloud logfile name from ``owncloud.log`` to something else.
@@ -29,23 +29,23 @@ 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 42283f6..666639a 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -618,7 +618,7 @@ class OC {
- if (OC_Config::getValue('installed', false) && OC_Config::getValue('log_rotate_size', false) && !\OCP\Util::needUpgrade()) {
+@@ -660,7 +660,7 @@ class OC {
+ if ($systemConfig->getValue('installed', false) && $systemConfig->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
-- \OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue('logfile', OC_Config::getValue("datadirectory", OC::$SERVERROOT . '/data') . '/owncloud.log'));
-+ \OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue('logfile', '/var/log//owncloud.log'));
+- \OCP\BackgroundJob::registerJob('OC\Log\Rotate', $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/owncloud.log'));
++ \OCP\BackgroundJob::registerJob('OC\Log\Rotate', $systemConfig->getValue('logfile', '/var/log/owncloud.log'));
}
}
diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php
-index 08d0b7d..da9df3e 100644
+index c8ae610..d097ccf 100644
--- a/lib/private/log/owncloud.php
+++ b/lib/private/log/owncloud.php
-@@ -34,7 +34,7 @@ class OC_Log_Owncloud {
+@@ -33,7 +33,7 @@ class OC_Log_Owncloud {
* Init class data
*/
public static function init() {
diff --git a/debian/patches/path/0004-Adapt-Archive-Tar.php-path.patch b/debian/patches/path/0004-Adapt-Archive-Tar.php-path.patch
deleted file mode 100644
index 9a7fda9..0000000
--- a/debian/patches/path/0004-Adapt-Archive-Tar.php-path.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Paul van Tilburg <paulvt at debian.org>
-Date: Tue, 5 Nov 2013 20:39:36 -0400
-Subject: Adapt Archive/Tar.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. 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/lib/private/archive/tar.php b/lib/private/archive/tar.php
-index 3f64b4c..7e30e7e 100644
---- a/lib/private/archive/tar.php
-+++ b/lib/private/archive/tar.php
-@@ -6,7 +6,7 @@
- * See the COPYING-README file.
- */
-
--require_once OC::$THIRDPARTYROOT . '/3rdparty/Archive/Tar.php';
-+require_once 'Archive/Tar.php';
-
- class OC_Archive_TAR extends OC_Archive{
- const PLAIN=0;
diff --git a/debian/patches/path/0007-Adapt-aws-sdk-path.patch b/debian/patches/path/0004-Adapt-aws-sdk-path.patch
similarity index 96%
rename from debian/patches/path/0007-Adapt-aws-sdk-path.patch
rename to debian/patches/path/0004-Adapt-aws-sdk-path.patch
index 0deef68..5cd2629 100644
--- a/debian/patches/path/0007-Adapt-aws-sdk-path.patch
+++ b/debian/patches/path/0004-Adapt-aws-sdk-path.patch
@@ -12,7 +12,7 @@ Gbp: Topic path
1 file changed, 4 deletions(-)
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
-index bc1b56f..0c5ae87 100644
+index 4d94e35..3ceb17a 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -24,10 +24,6 @@
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
deleted file mode 100644
index 0e62047..0000000
--- a/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
+++ /dev/null
@@ -1,38 +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 Doctrine, Symphony, Patchwork and Pimple path
-
-The Debian package depends on the needed classes instead of embedding
-them, i.e. php-doctrine-common, php-doctrine-dbal, php-symfony-console,
-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
---- a/lib/base.php
-+++ b/lib/base.php
-@@ -439,12 +439,12 @@ class OC {
- // register autoloader
- require_once __DIR__ . '/autoloader.php';
- self::$loader = new \OC\Autoloader();
-- self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib');
-- self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib');
-- self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing');
-- self::$loader->registerPrefix('Symfony\\Component\\Console', 'symfony/console');
-- self::$loader->registerPrefix('Patchwork', '3rdparty');
-- self::$loader->registerPrefix('Pimple', '3rdparty/Pimple');
-+ self::$loader->registerPrefix('Doctrine\\Common', '/usr/share/php');
-+ self::$loader->registerPrefix('Doctrine\\DBAL', '/usr/share/php');
-+ self::$loader->registerPrefix('Symfony\\Component\\Routing', '/usr/share/php');
-+ self::$loader->registerPrefix('Symfony\\Component\\Console', '/usr/share/php');
-+ self::$loader->registerPrefix('Patchwork', '/usr/share/php');
-+ self::$loader->registerPrefix('Pimple', '/usr/share/php');
- spl_autoload_register(array(self::$loader, 'load'));
-
- // make a dummy session available as early as possible since error pages need it
diff --git a/debian/patches/path/0008-Adapt-google-api-php-client-path.patch b/debian/patches/path/0005-Adapt-google-api-php-client-path.patch
similarity index 61%
rename from debian/patches/path/0008-Adapt-google-api-php-client-path.patch
rename to debian/patches/path/0005-Adapt-google-api-php-client-path.patch
index 798af3d..ea92702 100644
--- a/debian/patches/path/0008-Adapt-google-api-php-client-path.patch
+++ b/debian/patches/path/0005-Adapt-google-api-php-client-path.patch
@@ -9,32 +9,31 @@ 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 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ apps/files_external/ajax/google.php | 2 --
+ apps/files_external/lib/google.php | 2 --
+ 2 files changed, 4 deletions(-)
diff --git a/apps/files_external/ajax/google.php b/apps/files_external/ajax/google.php
-index 13e7407..960bd0a 100644
+index b80f24b..fe88773 100644
--- a/apps/files_external/ajax/google.php
+++ b/apps/files_external/ajax/google.php
-@@ -1,6 +1,6 @@
+@@ -1,6 +1,4 @@
<?php
- set_include_path(get_include_path().PATH_SEPARATOR.
+-set_include_path(get_include_path().PATH_SEPARATOR.
- \OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src');
-+ '/usr/share/php/google-api-php-client/src');
- require_once 'Google_Client.php';
+ require_once 'Google/Client.php';
OCP\JSON::checkAppEnabled('files_external');
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
-index e71c7ab..066d064 100644
+index bd9bdce..d5cb9cb 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
-@@ -22,7 +22,7 @@
+@@ -21,8 +21,6 @@
+
namespace OC\Files\Storage;
- set_include_path(get_include_path().PATH_SEPARATOR.
+-set_include_path(get_include_path().PATH_SEPARATOR.
- \OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src');
-+ '/usr/share/php/google-api-php-client/src');
- require_once 'Google_Client.php';
- require_once 'contrib/Google_DriveService.php';
+ require_once 'Google/Client.php';
+ require_once 'Google/Service/Drive.php';
diff --git a/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch b/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
deleted file mode 100644
index 66b7348..0000000
--- a/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
+++ /dev/null
@@ -1,27 +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 Crypt_Blowfish path
-
-The Debian package depends on the needed classes instead of embedding
-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/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
-index bd86b2b..be2fab2 100644
---- a/apps/files_encryption/lib/crypt.php
-+++ b/apps/files_encryption/lib/crypt.php
-@@ -26,7 +26,7 @@
- namespace OCA\Encryption;
- use OCA\Encryption\Exceptions\EncryptionException;
-
--require_once __DIR__ . '/../3rdparty/Crypt_Blowfish/Blowfish.php';
-+require_once 'Crypt/Blowfish.php';
-
- /**
- * Class for common cryptography functionality
diff --git a/debian/patches/path/0009-Adapt-Dropbox-path.patch b/debian/patches/path/0006-Adapt-Dropbox-path.patch
similarity index 97%
rename from debian/patches/path/0009-Adapt-Dropbox-path.patch
rename to debian/patches/path/0006-Adapt-Dropbox-path.patch
index 2c7fde6..f62dd37 100644
--- a/debian/patches/path/0009-Adapt-Dropbox-path.patch
+++ b/debian/patches/path/0006-Adapt-Dropbox-path.patch
@@ -14,7 +14,7 @@ Gbp: Topic path
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/files_external/ajax/dropbox.php b/apps/files_external/ajax/dropbox.php
-index bbedf8e..6971fa2 100644
+index db417de..0fba990 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 230b514..393d9aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,6 @@
0001-Disable-the-appstore.patch
0002-Fix-displayed-version.patch
0003-Improve-logfile-handling.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/0004-Adapt-aws-sdk-path.patch
+path/0005-Adapt-google-api-php-client-path.patch
+path/0006-Adapt-Dropbox-path.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