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

diff --git a/debian/rules b/debian/rules
index 721060c..a2998a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,11 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_INSTALL_CHANGELOGS_ALL=CHANGELOG
 
+DEB_DH_INSTALL_ARGS = \
+	--exclude=chgsaslpasswd.c \
+	--exclude=chgvirtualminpasswd.c \
+	--exclude=chpass-wrapper.py
+
 binary-install/roundcube-core::
 	# Install config files
 	install -m 0640 $(CURDIR)/config/db.inc.php.dist $(CURDIR)/debian/roundcube-core/etc/roundcube/db.inc.php
@@ -18,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/.
@@ -28,13 +32,19 @@ binary-install/roundcube-core::
 	# Remove useless file
 	rm -rf $(CURDIR)/debian/roundcube-core/usr/share/roundcube/bin
 	find $(CURDIR)/debian/roundcube-core -name '._*' -print0 | xargs -r0 rm
-	find $(CURDIR)/debian/roundcube-core -name '*.js.src' -print0 | xargs -r0 rm
+	# Convert .js.src back to js
+	for js in $$(find $(CURDIR)/debian/roundcube-core -name '*.js.src' -print); do \
+		yui-compressor --type js "$$js" -o "$${js%.*}" ; \
+		rm "$$js" ; \
+	done
 	# 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.4.min.js
-	dh_link -proundcube-core usr/share/javascript/jquery/jquery.min.js usr/share/roundcube/program/js/jquery-1.4.min.js
+	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.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
@@ -47,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 ; \