[Pkg-owncloud-commits] [owncloud] 58/61: Refresh patches

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 1061d128f54ed92459eac1afed1de5347dd61583
Author: David Prévot <taffit at debian.org>
Date:   Wed Jul 30 22:57:22 2014 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 debian/patches/0001-Disable-the-appstore.patch                      | 6 +++---
 debian/patches/0002-Fix-displayed-version.patch                     | 4 ++--
 .../0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index b551ebc..0c880de 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -55,7 +55,7 @@ index 24c1579..7d772f8 100644
  ),
  'user_backends'=>array(
 diff --git a/lib/base.php b/lib/base.php
-index 730cee5..32f1502 100644
+index 341859d..998eda8 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -157,7 +157,7 @@ class OC {
@@ -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 eea1942..53dd0ab 100644
+index 896b076..8b80e04 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
-@@ -417,7 +417,7 @@ class OC_Util {
+@@ -432,7 +432,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 e31a2ad..0f19aea 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -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 53dd0ab..be396d2 100644
+index 8b80e04..62719c0 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
-@@ -1404,7 +1404,7 @@ class OC_Util {
+@@ -1424,7 +1424,7 @@ class OC_Util {
  	 * @return string
  	 */
  	public static function getHumanVersion() {
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 879b896..baa0aad 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,7 +15,7 @@ Gbp: Topic path
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/lib/base.php b/lib/base.php
-index 32f1502..7b5d52f 100644
+index 998eda8..344150e 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -431,12 +431,12 @@ class OC {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git