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

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit e3f500ae11bf6d5f9fd1b4a77e13b1aeb38ddce7
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue Jun 12 21:52:55 2012 +0200

    Added fix_tar_require.diff to fix the load path of Archive/Tar.php

diff --git a/debian/patches/fix_tar_require.diff b/debian/patches/fix_tar_require.diff
new file mode 100644
index 0000000..78d3406
--- /dev/null
+++ b/debian/patches/fix_tar_require.diff
@@ -0,0 +1,21 @@
+Description: Path to Archive/Tar.php is different
+  We use Archive/Tar.php from the php-pear Debian package.
+  The path in upstream explicitly uses Archive/Tar.php from the upstream
+  directory which is not available.
+Author: Paul van Tilburg <paulvt at debian.org>
+Bug-Debian: http://bugs.debian.org/677159
+
+---
+Last-Update: <2012-06-12>
+
+--- a/lib/archive/tar.php
++++ b/lib/archive/tar.php
+@@ -6,7 +6,7 @@
+  * See the COPYING-README file.
+  */
+ 
+-require_once '3rdparty/Archive/Tar.php';
++require_once 'Archive/Tar.php';
+ 
+ class OC_Archive_TAR extends OC_Archive{
+ 	const PLAIN=0;
diff --git a/debian/patches/series b/debian/patches/series
index df39018..388bd7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_fix_crypt.diff
 03_fix_phpmailer.diff
 05_no_app_store.diff
+fix_tar_require.diff

-- 
owncloud.git