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

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 94bbac2e250fb36427a6f94cff643e33b4788db7
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue May 22 11:51:05 2012 +0200

    (Temporarily) install the MDB2 SQlite driver to owncloud-sqlite; added TODO item

diff --git a/debian/TODO b/debian/TODO
index 7708940..df3f459 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,6 +1,8 @@
 ownCloud packaging TODO list
 ============================
 
+* Remove the MDB2 SQLite driver installed by owncloud-sqlite and depend
+  on php-mdb2-driver-sqlite (still to be packaged).
 * Handle purging well (removing config, conformation for removing data).
 * Get source for 3rdparty/timepicker/css/include/js/*.js, see also FIXMEs
   in debian/copyright.
diff --git a/debian/rules b/debian/rules
index 3e5f0e8..9cb74a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,6 @@ override_dh_install:
 	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
-	rm -r debian/owncloud/usr/share/owncloud/lib/MDB2 # php-mdb2
 
 	# Remove redundant license files as it is already captured in debian/copyright.
 	rm debian/owncloud/usr/share/owncloud/3rdparty/PEAR-LICENSE
@@ -91,6 +90,9 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf-debug.js
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.js
 
+	# Move the MDB2 Sqlite driver to owncloud-sqlite.
+	mv debian/owncloud/usr/share/owncloud/lib/MDB2 debian/owncloud-sqlite/usr/share/php # php-mdb2-driver-sqlite (not yet)
+
 	# Minify ace in app_texteditor
 	find debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor -type f | grep -v 'ace-uncompressed' | xargs -exec rm
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor/ace-uncompressed.js -o debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor/ace.js

-- 
owncloud.git