[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0-85-g6f9b891

[Thomas Mueller]

The following commit has been merged in the master branch:
commit 6f9b8918b2ef41806e8e51a51c755554c1528b8f
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Sun May 20 22:37:38 2012 +0200

    patching mdb2-schema

diff --git a/debian/patches/04_fix_pear_mdb2_missmatch.diff b/debian/patches/04_fix_pear_mdb2_missmatch.diff
new file mode 100644
index 0000000..29eef0b
--- /dev/null
+++ b/debian/patches/04_fix_pear_mdb2_missmatch.diff
@@ -0,0 +1,45 @@
+Description: Incompatibilities between ownCloud MDB2 and Debian PEAR package
+ Due to a different PEAR version packaged inside Debain the function needs
+ to be changed to non-static.
+ .
+ owncloud (2.0.0-1) unstable; urgency=low
+ .
+   * Initial release (Closes: #648674)
+Author: Thomas Mueller <thomas.mueller at tmit.eu>
+Bug-Debian: http://bugs.debian.org/648674
+
+---
+Forwarded: not-needed
+Last-Update: <2011-11-17>
+
+--- a/3rdparty/MDB2/Schema.php
++++ b/3rdparty/MDB2/Schema.php
+@@ -2727,7 +2727,7 @@
+      * @access  public
+      * @see PEAR_Error
+      */
+-    static function &raiseError($code = null, $mode = null, $options = null, $userinfo = null, $dummy1 = null, $dummy2 = null, $dummy3 = false)
++    function &raiseError($code = null, $mode = null, $options = null, $userinfo = null, $dummy1 = null, $dummy2 = null, $dummy3 = false)
+     {
+         $err = PEAR::raiseError(null, $code, $mode, $options,
+                                 $userinfo, 'MDB2_Schema_Error', true);
+@@ -2748,7 +2748,7 @@
+      * @return  bool  true if parameter is an error
+      * @access  public
+      */
+-    static function isError($data, $code = null)
++    function isError($data, $code = null)
+     {
+         if (is_a($data, 'MDB2_Schema_Error')) {
+             if (is_null($code)) {
+--- a/3rdparty/MDB2/Schema/Parser.php
++++ b/3rdparty/MDB2/Schema/Parser.php
+@@ -574,7 +574,7 @@
+      * @access private
+      * @static
+      */
+-    static function &raiseError($msg = null, $xmlecode = 0, $xp = null, $ecode = MDB2_SCHEMA_ERROR_PARSE, $userinfo = null,
++    function &raiseError($msg = null, $xmlecode = 0, $xp = null, $ecode = MDB2_SCHEMA_ERROR_PARSE, $userinfo = null,
+                          $error_class = null,
+                          $skipmsg = false)
+     {
diff --git a/debian/patches/series b/debian/patches/series
index ed0dbed..fb9f725 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_fix_data_path.diff
 02_fix_crypt.diff
 03_fix_phpmailer.diff
+04_fix_pear_mdb2_missmatch.diff

-- 
owncloud.git