[Pkg-owncloud-commits] [owncloud] 238/239: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Fri Nov 29 01:32:49 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 88d8734aa4c20478ae93835eb4806dd30fa4d37b
Author: David Prévot <taffit at debian.org>
Date: Thu Nov 28 18:57:09 2013 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 8 ++--
debian/patches/0002-Fix-displayed-version.patch | 50 ++++++++--------------
debian/patches/0003-Improve-logfile-handling.patch | 4 +-
...octrine-Symphony-Sabre-and-Patchwork-path.patch | 4 +-
.../patches/path/0009-Adapt-chosen-css-path.patch | 2 +-
debian/patches/path/0011-Adapt-aws-sdk-path.patch | 2 +-
.../0013-Adapt-google-api-php-client-path.patch | 2 +-
debian/patches/path/0014-Adapt-Dropbox-path.patch | 2 +-
.../path/0015-Adapt-php-opencloud-path.patch | 2 +-
9 files changed, 31 insertions(+), 45 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 599fba8..a6b20b7 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -22,7 +22,7 @@ Last-Update: 2013-10-23
7 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 105d475..11575ff 100644
+index 7b533a8..bf323c5 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -71,8 +71,10 @@ $CONFIG = array(
@@ -54,7 +54,7 @@ index 105d475..11575ff 100644
),
'user_backends'=>array(
diff --git a/lib/base.php b/lib/base.php
-index f3983a3..fa77984 100644
+index 2feedd8..68690ae 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -144,8 +144,8 @@ class OC {
@@ -135,10 +135,10 @@ index b5c530a..595495d 100644
$dbSetup->initialize($options);
$dbSetup->setupDatabase($username);
diff --git a/lib/private/util.php b/lib/private/util.php
-index 176eb4b..07e1f8f 100644
+index b5c5546..66a946f 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -317,7 +317,7 @@ class OC_Util {
+@@ -322,7 +322,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 9cdaf6d..bb17ccb 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -12,14 +12,13 @@ version is fixed to make it clear that’s a Debian package.
Forwarded: not-needed
Last-Update: 2013-10-17
---
- config/config.sample.php | 4 ++--
- lib/private/templatelayout.php | 2 +-
- settings/templates/admin.php | 2 +-
- settings/templates/personal.php | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
+ config/config.sample.php | 4 ++--
+ lib/private/templatelayout.php | 2 +-
+ lib/private/util.php | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 11575ff..a020c20 100644
+index bf323c5..22624d6 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -125,8 +125,8 @@ $CONFIG = array(
@@ -46,29 +45,16 @@ index 625f342..ed21f88 100644
$data=OC_Updater::check();
if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array() && OC_User::isAdminUser(OC_User::getUser())) {
$this->assign('updateAvailable', true);
-diff --git a/settings/templates/admin.php b/settings/templates/admin.php
-index 5413b70..5cf2a75 100644
---- a/settings/templates/admin.php
-+++ b/settings/templates/admin.php
-@@ -256,7 +256,7 @@ if (!$_['internetconnectionworking']) {
-
- <fieldset class="personalblock">
- <h2><?php p($l->t('Version'));?></h2>
-- <strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getVersionString().' ('.OC_Util::getChannel().')'); ?>
-+ <strong><?php p($theme->getTitle()); ?></strong> @VERSION@ <?php p('('.OC_Util::getChannel().')'); ?>
- <?php if (OC_Util::getEditionString() === ''): ?>
- <p>
- <?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
-diff --git a/settings/templates/personal.php b/settings/templates/personal.php
-index 9d21e18..99d685b 100644
---- a/settings/templates/personal.php
-+++ b/settings/templates/personal.php
-@@ -167,7 +167,7 @@ if($_['passwordChangeSupported']) {
-
- <fieldset class="personalblock">
- <h2><?php p($l->t('Version'));?></h2>
-- <strong><?php p($theme->getName()); ?></strong> <?php p(OC_Util::getVersionString().' ('.OC_Util::getChannel().')'); ?><br />
-+ <strong><?php p($theme->getName()); ?></strong> @VERSION@ <?php p('('.OC_Util::getChannel().')'); ?><br />
- <?php if (OC_Util::getEditionString() === ''): ?>
- <?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
- <?php endif; ?>
+diff --git a/lib/private/util.php b/lib/private/util.php
+index 66a946f..98120d6 100644
+--- a/lib/private/util.php
++++ b/lib/private/util.php
+@@ -1117,7 +1117,7 @@ class OC_Util {
+ * @return string
+ */
+ public static function getHumanVersion() {
+- $version = OC_Util::getVersionString().' ('.OC_Util::getChannel().')';
++ $version = '@VERSION@'.' ('.OC_Util::getChannel().')';
+ $build = OC_Util::getBuild();
+ 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 dc76124..610675e 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 a020c20..382fc22 100644
+index 22624d6..673976f 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -140,7 +140,7 @@ $CONFIG = array(
@@ -26,7 +26,7 @@ index a020c20..382fc22 100644
/* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php
-index 15cace8..b69164b 100644
+index 4c86d0e..383fa45 100644
--- a/lib/private/log/owncloud.php
+++ b/lib/private/log/owncloud.php
@@ -33,7 +33,7 @@ class OC_Log_Owncloud {
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 1555aee..3725b6a 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,10 +20,10 @@ Last-Update: 2013-11-11
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/base.php b/lib/base.php
-index fa77984..6368c5a 100644
+index 68690ae..b468a62 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -369,13 +369,13 @@ class OC {
+@@ -393,13 +393,13 @@ class OC {
// register autoloader
require_once __DIR__ . '/autoloader.php';
self::$loader = new \OC\Autoloader();
diff --git a/debian/patches/path/0009-Adapt-chosen-css-path.patch b/debian/patches/path/0009-Adapt-chosen-css-path.patch
index ac3b0eb..cef861a 100644
--- a/debian/patches/path/0009-Adapt-chosen-css-path.patch
+++ b/debian/patches/path/0009-Adapt-chosen-css-path.patch
@@ -11,7 +11,7 @@ Last-Update: 2013-10-14
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/settings/personal.php b/settings/personal.php
-index 670e18e..66f32a7 100644
+index 44e1048..76068f4 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -14,7 +14,7 @@ $defaults = new OC_Defaults(); // initialize themable default strings and urls
diff --git a/debian/patches/path/0011-Adapt-aws-sdk-path.patch b/debian/patches/path/0011-Adapt-aws-sdk-path.patch
index 83c5799..994cc07 100644
--- a/debian/patches/path/0011-Adapt-aws-sdk-path.patch
+++ b/debian/patches/path/0011-Adapt-aws-sdk-path.patch
@@ -12,7 +12,7 @@ Last-Update: 2013-10-14
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
-index c08a266..1950a8f 100644
+index 9a682fb..4d98cd4 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -25,8 +25,7 @@
diff --git a/debian/patches/path/0013-Adapt-google-api-php-client-path.patch b/debian/patches/path/0013-Adapt-google-api-php-client-path.patch
index a542ef3..c0aa62a 100644
--- a/debian/patches/path/0013-Adapt-google-api-php-client-path.patch
+++ b/debian/patches/path/0013-Adapt-google-api-php-client-path.patch
@@ -25,7 +25,7 @@ index 2594a17..269f0b0 100644
OCP\JSON::checkAppEnabled('files_external');
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
-index b63b588..2c7f5aa 100644
+index 426caf0..64bbbc0 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -22,7 +22,7 @@
diff --git a/debian/patches/path/0014-Adapt-Dropbox-path.patch b/debian/patches/path/0014-Adapt-Dropbox-path.patch
index 18aaa25..44b4c30 100644
--- a/debian/patches/path/0014-Adapt-Dropbox-path.patch
+++ b/debian/patches/path/0014-Adapt-Dropbox-path.patch
@@ -25,7 +25,7 @@ index 91c4655..bc9821c 100644
OCP\JSON::checkAppEnabled('files_external');
OCP\JSON::checkLoggedIn();
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
-index b6deab6..081c547 100644
+index f7d8d98..52e33ca 100644
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -22,7 +22,7 @@
diff --git a/debian/patches/path/0015-Adapt-php-opencloud-path.patch b/debian/patches/path/0015-Adapt-php-opencloud-path.patch
index 261561e..fe5bcee 100644
--- a/debian/patches/path/0015-Adapt-php-opencloud-path.patch
+++ b/debian/patches/path/0015-Adapt-php-opencloud-path.patch
@@ -12,7 +12,7 @@ Last-Update: 2013-10-30
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
-index bb650da..0f25ec8 100644
+index b615d24..772b6dc 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -22,8 +22,7 @@
--
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