[Pkg-owncloud-commits] [owncloud] 02/04: Revert useless apps path change

[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 799d02b16ff1ee0aeba3b9bbc7618b75b11c4257
Author: David Prévot <taffit at debian.org>
Date:   Tue Apr 22 19:19:54 2014 -0400

    Revert useless apps path change
    
    Git-Dch: Ignore
---
 debian/patches/0001-Disable-the-appstore.patch           | 16 +++++++---------
 ...dapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 9d4008b..95d10d2 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -10,16 +10,16 @@ disabled.
 
 Forwarded: not-needed
 Reviewed-by: David Prévot <taffit at debian.org>
-Last-Update: 2013-10-23
+Last-Update: 2014-04-22
 ---
  config/config.sample.php   | 11 +++++++----
- lib/base.php               |  4 ++--
+ lib/base.php               |  2 +-
  lib/private/app.php        |  2 +-
  lib/private/ocsclient.php  |  8 ++++----
  lib/private/setup.php      |  2 ++
  lib/private/util.php       |  2 +-
  settings/ajax/apps/ocs.php |  2 +-
- 7 files changed, 18 insertions(+), 13 deletions(-)
+ 7 files changed, 17 insertions(+), 12 deletions(-)
 
 diff --git a/config/config.sample.php b/config/config.sample.php
 index 72b21ff..22cf223 100644
@@ -54,17 +54,15 @@ index 72b21ff..22cf223 100644
  ),
  'user_backends'=>array(
 diff --git a/lib/base.php b/lib/base.php
-index dba905f..9ecbdbb 100644
+index dba905f..ae71f0b 100644
 --- a/lib/base.php
 +++ b/lib/base.php
-@@ -144,8 +144,8 @@ class OC {
- 					OC::$APPSROOTS[] = $paths;
+@@ -145,7 +145,7 @@ class OC {
  				}
  			}
--		} elseif (file_exists(OC::$SERVERROOT . '/apps')) {
+ 		} elseif (file_exists(OC::$SERVERROOT . '/apps')) {
 -			OC::$APPSROOTS[] = array('path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true);
-+		} elseif (file_exists('/usr/share/owncloud/apps')) {
-+			OC::$APPSROOTS[] = array('path' => '/usr/share/owncloud/apps', 'url' => '/apps', 'writable' => false);
++			OC::$APPSROOTS[] = array('path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => false);
  		} elseif (file_exists(OC::$SERVERROOT . '/../apps')) {
  			OC::$APPSROOTS[] = array(
  				'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
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 f864ac7..e93a5a6 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,7 +20,7 @@ Last-Update: 2013-11-11
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/lib/base.php b/lib/base.php
-index 9ecbdbb..5dbcc54 100644
+index ae71f0b..bc56f62 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -407,13 +407,13 @@ class OC {

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