[Pkg-owncloud-commits] [owncloud] 167/172: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Sun May 18 20:10:00 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 6e642a3b31dd5094a5a8adbc60edc96a61319d4a
Author: David Prévot <taffit at debian.org>
Date: Sat May 17 12:31:53 2014 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 10 +++++-----
debian/patches/0002-Fix-displayed-version.patch | 8 ++++----
debian/patches/0013-Disable-Assetic.patch | 2 +-
debian/patches/path/0005-Adapt-Archive-Tar.php-path.patch | 2 +-
.../path/0006-Adapt-Doctrine-Symphony-and-Patchwork-path.patch | 4 ++--
debian/patches/path/0007-Adapt-Crypt_Blowfish-path.patch | 2 +-
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 1752132..2a9f1ec 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -55,7 +55,7 @@ index 708e836..eeb9675 100644
),
'user_backends'=>array(
diff --git a/lib/base.php b/lib/base.php
-index 1f7d0c0..1ba5cbe 100644
+index f3a15e0..cb14d4d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -152,7 +152,7 @@ class OC {
@@ -68,7 +68,7 @@ index 1f7d0c0..1ba5cbe 100644
OC::$APPSROOTS[] = array(
'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
diff --git a/lib/private/app.php b/lib/private/app.php
-index 2f55b54..563e113 100644
+index a35248f..791497a 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -431,7 +431,7 @@ class OC_App{
@@ -81,7 +81,7 @@ index 2f55b54..563e113 100644
}
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
-index b0480ca..975772c 100644
+index fb82827..6a24d4a 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -64,7 +64,7 @@ class OC_OCSClient{
@@ -134,10 +134,10 @@ index 4889f60..1ecd49a 100644
$dbSetup->initialize($options);
$dbSetup->setupDatabase($username);
diff --git a/lib/private/util.php b/lib/private/util.php
-index e2005d3..3f0d4e7 100644
+index 107dc6b..2247b1f 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -332,7 +332,7 @@ class OC_Util {
+@@ -342,7 +342,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 fd98508..f121fcc 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -33,10 +33,10 @@ index eeb9675..24dc4a6 100644
/* Are we connected to the internet or are we running in a closed network? */
"has_internet_connection" => true,
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
-index b7ac02a..f1b10c0 100644
+index a5dd9a0..ccba321 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
-@@ -28,7 +28,7 @@ class OC_TemplateLayout extends OC_Template {
+@@ -29,7 +29,7 @@ class OC_TemplateLayout extends OC_Template {
}
// Update notification
@@ -46,10 +46,10 @@ index b7ac02a..f1b10c0 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 3f0d4e7..17c5ca2 100644
+index 2247b1f..d371bb9 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1257,7 +1257,7 @@ class OC_Util {
+@@ -1287,7 +1287,7 @@ class OC_Util {
* @return string
*/
public static function getHumanVersion() {
diff --git a/debian/patches/0013-Disable-Assetic.patch b/debian/patches/0013-Disable-Assetic.patch
index 28d48f7..b0a51ff 100644
--- a/debian/patches/0013-Disable-Assetic.patch
+++ b/debian/patches/0013-Disable-Assetic.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
1 file changed, 4 deletions(-)
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
-index f1b10c0..7079cc4 100644
+index ccba321..596098d 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -1,8 +1,4 @@
diff --git a/debian/patches/path/0005-Adapt-Archive-Tar.php-path.patch b/debian/patches/path/0005-Adapt-Archive-Tar.php-path.patch
index bca4ae9..55fc9ba 100644
--- a/debian/patches/path/0005-Adapt-Archive-Tar.php-path.patch
+++ b/debian/patches/path/0005-Adapt-Archive-Tar.php-path.patch
@@ -16,7 +16,7 @@ Last-Update: 2013-10-14
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/private/archive/tar.php b/lib/private/archive/tar.php
-index cbdb565..ea525cd 100644
+index 21a995d..5cb40e4 100644
--- a/lib/private/archive/tar.php
+++ b/lib/private/archive/tar.php
@@ -6,7 +6,7 @@
diff --git a/debian/patches/path/0006-Adapt-Doctrine-Symphony-and-Patchwork-path.patch b/debian/patches/path/0006-Adapt-Doctrine-Symphony-and-Patchwork-path.patch
index 65d2091..5d18c34 100644
--- a/debian/patches/path/0006-Adapt-Doctrine-Symphony-and-Patchwork-path.patch
+++ b/debian/patches/path/0006-Adapt-Doctrine-Symphony-and-Patchwork-path.patch
@@ -19,10 +19,10 @@ Last-Update: 2013-11-11
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/base.php b/lib/base.php
-index 1ba5cbe..b7186c2 100644
+index cb14d4d..5b7c9c4 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -431,11 +431,11 @@ class OC {
+@@ -403,11 +403,11 @@ class OC {
// register autoloader
require_once __DIR__ . '/autoloader.php';
self::$loader = new \OC\Autoloader();
diff --git a/debian/patches/path/0007-Adapt-Crypt_Blowfish-path.patch b/debian/patches/path/0007-Adapt-Crypt_Blowfish-path.patch
index 51c62c9..122d564 100644
--- a/debian/patches/path/0007-Adapt-Crypt_Blowfish-path.patch
+++ b/debian/patches/path/0007-Adapt-Crypt_Blowfish-path.patch
@@ -12,7 +12,7 @@ Last-Update: 2013-10-14
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
-index a4f7bd3..901800a 100644
+index 7d86eb7..56dfb03 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -25,7 +25,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