[Pkg-owncloud-commits] [owncloud] 62/67: 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 29c8d99b432fede461439d35695ae6c272f71f5f
Author: David Prévot <taffit at debian.org>
Date:   Thu Jun 26 12:28:43 2014 -0400

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

diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 13d4e89..a1d2534 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -55,7 +55,7 @@ index 6da00fc..647682f 100644
  ),
  'user_backends'=>array(
 diff --git a/lib/base.php b/lib/base.php
-index 7bde1db..7c269dd 100644
+index eef0947..6ab7993 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -149,7 +149,7 @@ class OC {
@@ -68,10 +68,10 @@ index 7bde1db..7c269dd 100644
  			OC::$APPSROOTS[] = array(
  				'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
 diff --git a/lib/private/app.php b/lib/private/app.php
-index a626239..2de296f 100644
+index 01597b3..e17bb07 100644
 --- a/lib/private/app.php
 +++ b/lib/private/app.php
-@@ -440,7 +440,7 @@ class OC_App {
+@@ -445,7 +445,7 @@ class OC_App {
  	 * @return string
  	 */
  	public static function getInstallPath() {
@@ -121,10 +121,10 @@ index 39d7e9c..ccd4f1a 100644
  		}
  		$url=OC_OCSClient::getAppStoreURL().'/content/download/'.urlencode($id).'/'.urlencode($item);
 diff --git a/lib/private/setup.php b/lib/private/setup.php
-index 7a08816..01e82856 100644
+index fdf98ab..88e9c21 100644
 --- a/lib/private/setup.php
 +++ b/lib/private/setup.php
-@@ -69,6 +69,8 @@ class OC_Setup {
+@@ -75,6 +75,8 @@ class OC_Setup {
  		OC_Config::setValue('datadirectory', $datadir);
  		OC_Config::setValue('dbtype', $dbtype);
  		OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
@@ -134,7 +134,7 @@ index 7a08816..01e82856 100644
  			$dbSetup->initialize($options);
  			$dbSetup->setupDatabase($username);
 diff --git a/lib/private/util.php b/lib/private/util.php
-index dfdddd0..6315a72 100644
+index 94005da..fe52b3c 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
 @@ -368,7 +368,7 @@ class OC_Util {
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index d674980..fedb986 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -46,7 +46,7 @@ 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 6315a72..31721ba 100644
+index fe52b3c..a430afb 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
 @@ -1328,7 +1328,7 @@ class OC_Util {
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 958df83..02f3619 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 7c269dd..0da2e0e 100644
+index 6ab7993..4055b20 100644
 --- a/lib/base.php
 +++ b/lib/base.php
-@@ -426,12 +426,12 @@ class OC {
+@@ -421,12 +421,12 @@ class OC {
  		// register autoloader
  		require_once __DIR__ . '/autoloader.php';
  		self::$loader = new \OC\Autoloader();

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