X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Frules;h=92d44a21ef4f992225bfbe47e0847fe989064256;hb=c138227a9ec7166dd9e524e798ba5c6e1b407b18;hp=c04db2896c9ccc0014846bc6e68ea28babcb732c;hpb=c4c802ef40ed3e2c71502c3d71f5f047f8168cc1;p=roundcube.git

diff --git a/debian/rules b/debian/rules
index c04db28..92d44a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_INSTALL_CHANGELOGS_ALL=CHANGELOG
 
@@ -10,6 +9,9 @@ DEB_INSTALL_CHANGELOGS_ALL=CHANGELOG
 # Then check manually if everything's ok
 
 binary-install/roundcube-core::
+	# Remove plugins
+	rm -rf $(CURDIR)/debian/roundcube-core/usr/share/roundcube/plugins
+
 	# Symlink all that is in /usr/share/roundcube to /var/lib/roundcube
 	find debian/roundcube-core/usr/share/roundcube -maxdepth 1 -mindepth 1 | \
 	while read i; do \
@@ -18,9 +20,12 @@ binary-install/roundcube-core::
 		  "`echo "$$i" | sed -e s#debian/roundcube-core/usr/share/roundcube/#var/lib/roundcube/#`"; \
 		fi \
 	done
-	# Install config/db.inc.php.dist
+	# Install config files
 	install -m 0640 $(CURDIR)/config/db.inc.php.dist $(CURDIR)/debian/roundcube-core/etc/roundcube/db.inc.php
 	install -m 0640 $(CURDIR)/config/main.inc.php.dist $(CURDIR)/debian/roundcube-core/usr/share/roundcube
+	for c in $(CURDIR)/debian/roundcube-core/etc/roundcube/*.php; do \
+		dh_link -proundcube-core etc/roundcube/$$(basename $$c) var/lib/roundcube/config/$$(basename $$c) ; \
+	done
 
 	# Database related files
 	# Install empty tables and updates for each db type
@@ -32,15 +37,18 @@ binary-install/roundcube-core::
 	cp -r $(CURDIR)/debian/sql/* $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/.
 
 	# Some files are executable while not being scripts or binary...
-	find $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program -type f -print0 | xargs -r0 chmod -x
+	find $(CURDIR)/debian/roundcube-core/usr/share/roundcube -type f -print0 | xargs -r0 chmod -x
 	# Remove useless file
 	rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/bin/*.sh
+	rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/bin/decrypt.php
 	find $(CURDIR)/debian/roundcube-core -name '._*' -print0 | xargs -r0 rm
-	find $(CURDIR)/debian/roundcube-core -name '.htaccess' -print0 | xargs -r0 rm
 	find $(CURDIR)/debian/roundcube-core -name '*.js.src' -print0 | xargs -r0 rm
 	# Remove files shipped in tinymce package
 	rm -rf $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/js/tiny_mce
 	dh_link -proundcube-core usr/share/tinymce/www usr/share/roundcube/program/js/tiny_mce
+	# Remove jquery as well
+	rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/js/jquery-1.3.min.js
+	dh_link -proundcube-core usr/share/javascript/jquery/jquery.min.js usr/share/roundcube/program/js/jquery-1.3.min.js
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/% :
 	install -d $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)