X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Frules;h=4d4aaeac6fed7b7f123efc75306474dd5931be52;hb=eb4cd25835facbfbadd7bf8d8b981a6dce60802b;hp=ad615aa0f8b795eb3b091cb79a419d141e7a7068;hpb=8a4a1a7851436ef5ff246a861b1cac2d3c0d030b;p=roundcube.git

diff --git a/debian/rules b/debian/rules
index ad615aa..4d4aaea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,13 +8,6 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 # Then check manually if everything's ok
 
 binary-install/roundcube::
-	# Removing PEAR classes that are provided via strd packages
-	rm -rf $(CURDIR)/debian/roundcube/usr/share/roundcube/program/lib/Auth
-	rm -rf $(CURDIR)/debian/roundcube/usr/share/roundcube/program/lib/DB
-	rm -rf $(CURDIR)/debian/roundcube/usr/share/roundcube/program/lib/DB.php
-	rm -rf $(CURDIR)/debian/roundcube/usr/share/roundcube/program/lib/Mail
-	rm -rf $(CURDIR)/debian/roundcube/usr/share/roundcube/program/lib/Net
-	rm -rf $(CURDIR)/debian/roundcube/usr/share/roundcube/program/lib/PEAR.php
 	# Symlink all that is in /usr/share/roundcube to /var/lib/roundcube
 	find debian/roundcube/usr/share/roundcube -maxdepth 1 -mindepth 1 | \
 	while read i; do \
@@ -34,16 +27,12 @@ binary-install/roundcube::
 	install -m 0644 $(CURDIR)/SQL/sqlite.initial.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/install/sqlite
 	install -m 0644 $(CURDIR)/SQL/sqlite.update.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/upgrade/sqlite/0.1~rc1~dfsg-1
 	# Some files are executable while not being scripts or binary...
-	chmod -x $(CURDIR)/debian/roundcube/usr/share/roundcube/program/include/rcube_mdb2.inc
-	chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/images/icons/plus.gif
-	chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/common.css
-	chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/images/display/loading.gif
-	chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/images/buttons/up_arrow.png
-	chmod -x $(CURDIR)/debian/roundcube/usr/share/roundcube/program/include/rcube_db.inc
-	chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/images/buttons/down_arrow.png
-	chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/googiespell.css
-	chmod -x $(CURDIR)/debian/roundcube/usr/share/roundcube/program/js/googiespell.js
 	find $(CURDIR)/debian/roundcube/usr/share/roundcube/program/localization -type f -print0 | xargs -0 chmod -x
+	# Remove files shipped in tinymce package
+	rm -rf $(CURDIR)/debian/roundcube/usr/share/roundcube/program/js/tiny_mce
+	for f in colorpicker.css editor_content.css editor_popup.css editor_ui.css; do \
+		rm $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/$$f; \
+	done
 
 clean::
 	debconf-updatepo