[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.1debian-2-9-g0fa28e5

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 0fa28e591dd538f3886599b0dfdc37594738ecc8
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue Jun 12 22:13:49 2012 +0200

    Added fix_sabre_requires.diff to fix the load path of Sabre as well

diff --git a/debian/changelog b/debian/changelog
index 91a6236..b99903b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,12 @@ owncloud (4.0.2debian-1) UNRELEASED; urgency=low
   * New upstream bugfix release.
   * debian/postinst: check whether a2enmod and apache2ctl are available
     (as apache2 need not be installed) (closes: 677159).
-  * debian/patches: added fix_tar_require.diff to make the require path
-    not point to 3rdparty/ so that Archive/Tar.php from php-pear is used
-    (closes: #677159).
+  * debian/patches:
+    - Added fix_tar_require.diff to make the require path
+      not point to 3rdparty/ so that Archive/Tar.php from php-pear is used
+      (closes: #677159).
+    - Added fix_sabre_requires.diff to fix the require path for Sabre as
+      well.
   * debian/watch: updated to use the new releases page.
 
  -- Paul van Tilburg <paulvt at debian.org>  Sun, 10 Jun 2012 21:08:16 +0200
diff --git a/debian/patches/fix_sabre_requires.diff b/debian/patches/fix_sabre_requires.diff
new file mode 100644
index 0000000..f8a01a8
--- /dev/null
+++ b/debian/patches/fix_sabre_requires.diff
@@ -0,0 +1,19 @@
+Description: Path to Sabre is different
+  We use Sabre from the php-sabredav Debian package.
+  The path in upstream explicitly uses Sabre from the upstream 3rdparty/
+  directory which is not available.
+Author: Paul van Tilburg <paulvt at debian.org>
+
+--- a/apps/remoteStorage/WebDAV.php
++++ b/apps/remoteStorage/WebDAV.php
+@@ -38,8 +38,8 @@
+ require_once('../../lib/app.php');
+ require_once('../../lib/public/app.php');
+ 
+-require_once('../../3rdparty/Sabre/DAV/Auth/IBackend.php');
+-require_once('../../3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php');
++require_once('Sabre/DAV/Auth/IBackend.php');
++require_once('Sabre/DAV/Auth/Backend/AbstractBasic.php');
+ require_once('../../lib/connector/sabre/auth.php');
+ 
+ OCP\App::checkAppEnabled('remoteStorage');
diff --git a/debian/patches/series b/debian/patches/series
index 388bd7d..c37fa60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03_fix_phpmailer.diff
 05_no_app_store.diff
 fix_tar_require.diff
+fix_sabre_requires.diff

-- 
owncloud.git