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

[Thomas Mueller]

The following commit has been merged in the master branch:
commit bbb9789c0327acba10e178e2da94bf56f866c626
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Mon May 21 18:11:45 2012 +0200

    bring back dependency to php-mdb2-schema

diff --git a/debian/changelog b/debian/changelog
index bd7c304..16742a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,6 @@ owncloud (4.0.0-1) UNRELEASED; urgency=low
   * New upstream release 4.0.0
   * debian/postrm: remove /etc/owncloud/config.php
   * fullcalendar.min.js & jquery.Jcrop.min.js are not needed
-  * debian/patches:
-    - 04_fix_pear_mdb2_missmatch.diff added
 
   [ Paul van Tilburg ]
   * debian/control:
diff --git a/debian/control b/debian/control
index 9d301f4..3997482 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Architecture: all
 Depends:  ${misc:Depends}, dbconfig-common, debconf | debconf-2.0, ucf,
  apache2 | httpd,
  php5, php-pear, php-xml-parser, php-crypt-blowfish, php-sabredav,
- php-mdb2, php-mdb2-driver-mysql, php5-gd,
+ php-mdb2, php-mdb2-schema, php-mdb2-driver-mysql, php5-gd,
  libphp-phpmailer,
  mysql-client | virtual-mysql-client,
  libjs-jquery-ui, libjs-jquery-jplayer, libjs-jquery (>= 1.7.2-1)
diff --git a/debian/patches/04_fix_pear_mdb2_missmatch.diff b/debian/patches/04_fix_pear_mdb2_missmatch.diff
deleted file mode 100644
index 29eef0b..0000000
--- a/debian/patches/04_fix_pear_mdb2_missmatch.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-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 fb9f725..ed0dbed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_fix_data_path.diff
 02_fix_crypt.diff
 03_fix_phpmailer.diff
-04_fix_pear_mdb2_missmatch.diff
diff --git a/debian/rules b/debian/rules
index 23c753a..3e5f0e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,19 +16,15 @@ override_dh_install:
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/Archive/ # php-pear
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/Console/ # php-pear
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/Crypt_Blowfish/ # php-crypt-blowfish
-	rm -r debian/owncloud/usr/share/owncloud/3rdparty/MDB2/Driver # php-mdb2-driver-*
-	rm debian/owncloud/usr/share/owncloud/3rdparty/MDB2/Date.php # php-mdb2
-	rm debian/owncloud/usr/share/owncloud/3rdparty/MDB2/Extended.php # php-mdb2
-	rm debian/owncloud/usr/share/owncloud/3rdparty/MDB2/Iterator.php # php-mdb2
-	rm debian/owncloud/usr/share/owncloud/3rdparty/MDB2/LOB.php # php-mdb2
+	rm -r debian/owncloud/usr/share/owncloud/3rdparty/MDB2/ # php-mdb2-schema
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/OS/ # php-pear
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/PEAR/ # php-pear
-	rm -r debian/owncloud/usr/share/owncloud/3rdparty/Sabre # php-sabre (not yet)
+	rm -r debian/owncloud/usr/share/owncloud/3rdparty/Sabre # php-sabre
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/XML/ # php-xml-parser / php-xml-rpc
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/simpletest # not used
 	rm debian/owncloud/usr/share/owncloud/3rdparty/MDB2.php # php-mdb2
 	rm debian/owncloud/usr/share/owncloud/3rdparty/PEAR*.php # php-pear
-	rm debian/owncloud/usr/share/owncloud/3rdparty/Sabre.includes.php # php-sabre (not yet)
+	rm debian/owncloud/usr/share/owncloud/3rdparty/Sabre.includes.php # php-sabre
 	rm debian/owncloud/usr/share/owncloud/3rdparty/System.php # php-pear
 	rm debian/owncloud/usr/share/owncloud/3rdparty/class.phpmailer.php # libphp-phpmailer
 	rm debian/owncloud/usr/share/owncloud/3rdparty/class.smtp.php # libphp-phpmailer

-- 
owncloud.git