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

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 256447b7f311e10b5c9bb808cc1eb6b1d438a03d
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Sat May 19 21:15:56 2012 +0200

    Install MDB2/Schema for now; a separate package has been blocked due to license issues

diff --git a/debian/TODO b/debian/TODO
index 63cbce9..39f4988 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -16,4 +16,6 @@ Low priority/later
 * Once php-getid3 has been brought up to date in Debian, use it as a
   depend, remove the source and integrate with it (the package has a weird
   installation path).
+* Package MDB2/schema as php-mdb2-schema; currently blocked by a license
+  issue of a dependency.
 * Package more stuff under 3rdparty/ separately (php-cloudfiles, phpass, etc.)
diff --git a/debian/control b/debian/control
index 5eeca6a..7b2e6f5 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-schema, php-mdb2-driver-mysql,
+ php-mdb2, php-mdb2-driver-mysql,
  libphp-phpmailer,
  mysql-client | virtual-mysql-client,
  libjs-jquery-ui, libjs-jquery-jplayer, libjs-jquery (>= 1.7.2-1)
diff --git a/debian/rules b/debian/rules
index e53606a..6ec7e72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,11 @@ 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/ # php-mdb2-schema (not yet)
+	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/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)

-- 
owncloud.git