X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Frules;h=0d9aead33d7a4de49f3d36441ecc08b53043a8fc;hb=fa24934ebc1d1f5dc8967cc7a89450d0b0b0aacd;hp=a8bf2125fce847016d808980f3a0874a87dfb1a3;hpb=6ff0b2b23684c3481378e092b74a0fc6b66d06ee;p=roundcube.git

diff --git a/debian/rules b/debian/rules
index a8bf212..0d9aead 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,22 +27,27 @@ binary-install/roundcube-core::
 	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
-	# Database upgrade from latest versions
-	install -m 0644 $(CURDIR)/SQL/postgres.update.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/pgsql/0.1.1-1
-	install -m 0644 $(CURDIR)/SQL/mysql.update.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/mysql/0.1.1-1
-	install -m 0644 $(CURDIR)/SQL/sqlite.update.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/sqlite/0.1.1-1
 
 	# Old database upgrades
 	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/localization -type f -print0 | xargs -0 chmod -x
+	find $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program -type f -print0 | xargs -r0 chmod -x
 	# Remove useless file
-	rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/lib/magic
-	rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/bin/msgimport
+	rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/bin/*.sh
+	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/tinymce2/www 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)
+	install -m 644 $(CURDIR)/debian/bug.control $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/control
 
 clean::
 	debconf-updatepo