X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Frules;h=a2998a91f885b42fa8fdbdaaeb704c0da3c93c1f;hb=a6cc1ac49674e1902dbb9a2c34f22408471bc4d3;hp=b041fa00dacf04ef271442f69c0bb533d6e1e65c;hpb=4875b8b01f559bb6a0c8642e199302fa33b754bc;p=roundcube.git

diff --git a/debian/rules b/debian/rules
index b041fa0..a2998a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,6 @@ binary-install/roundcube-core::
 	# Install empty tables and updates for each db type
 	install -m 0644 $(CURDIR)/SQL/mysql.initial.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/install/mysql
 	install -m 0644 $(CURDIR)/SQL/postgres.initial.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/install/pgsql
-	install -m 0644 $(CURDIR)/SQL/sqlite.initial.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/install/sqlite
 
 	# Old database upgrades
 	cp -r $(CURDIR)/debian/sql/* $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/.
@@ -43,7 +42,9 @@ binary-install/roundcube-core::
 	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.min.js
-	dh_link -proundcube-core usr/share/javascript/jquery/jquery.min.js usr/share/roundcube/program/js/jquery-1.4.min.js
+	dh_link -proundcube-core usr/share/javascript/jquery/jquery.min.js usr/share/roundcube/program/js/jquery.min.js
+	# Remove GnuPG PEAR module
+	rm -rf $(CURDIR)/debian/roundcube-plugins/usr/share/roundcube/plugins/enigma/lib/Crypt
 
 binary-install/roundcube-plugins::
 	# Plugins are in usr/share/roundcube/plugins, for each plugin
@@ -56,7 +57,8 @@ binary-install/roundcube-plugins::
 		dh_installdirs -proundcube-plugins etc/roundcube/plugins/$${plugin##*/} ; \
 		(echo "<?php" ; \
 		 echo "// Empty configuration for $${plugin##*/}" ; \
-		 echo "// See /usr/share/roundcube/plugins/$${plugin##*/}/config.inc.php.dist for instructions") > \
+		 echo "// See /usr/share/roundcube/plugins/$${plugin##*/}/config.inc.php.dist for instructions" ; \
+		 echo "?>") > \
 			$(CURDIR)/debian/roundcube-plugins/etc/roundcube/plugins/$${plugin##*/}/config.inc.php ; \
 		dh_link -proundcube-plugins etc/roundcube/plugins/$${plugin##*/}/config.inc.php \
 			usr/share/roundcube/plugins/$${plugin##*/}/config.inc.php ; \