[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0-rc-57-geb8ded7

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit eb8ded714eabebeaa53a5f3dcf8d9597f9f3cc8c
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Wed May 16 10:46:07 2012 +0200

    Don't install 3rdparty/simpletest

diff --git a/debian/TODO b/debian/TODO
index 18fbaaa..1ae99d2 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -18,7 +18,5 @@ ownCloud packaging TODO list
 Low priority/later
 ------------------
 
-* moodle and ownCloud both ship PHP simpletest, it should probably be
-  packaged separately
 * collabtive and owncloud both ship class.openid.php, it should probably be
   packaged separately
diff --git a/debian/owncloud.lintian-overrides b/debian/owncloud.lintian-overrides
index 695960c..5920971 100644
--- a/debian/owncloud.lintian-overrides
+++ b/debian/owncloud.lintian-overrides
@@ -1,4 +1,2 @@
 # User www-data has to write here.
 owncloud: non-standard-dir-perm var/lib/owncloud/data/ 2770 != 0755
-# Needs to be packaged separately; coordinate with moodle maintainers.
-owncloud: embedded-php-library usr/share/owncloud/3rdparty/simpletest/unit_tester.php
diff --git a/debian/rules b/debian/rules
index 24ef1a3..a783390 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,9 +48,10 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/releases.txt
 	
 	# Remove an unused scripts, source and minified JavaScript files.
-	rm -rf debian/owncloud/usr/share/owncloud/3rdparty/timepicker/css/include
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/README.md
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/VERSION
+	rm -r debian/owncloud/usr/share/owncloud/3rdparty/simpletest
+	rm -r debian/owncloud/usr/share/owncloud/3rdparty/timepicker/css/include
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_odfviewer/src
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery-1.7.2.min.js
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery-ui-1.8.16.custom.min.js

-- 
owncloud.git