Ship new configuration files (mimetypes for now, but symlinks should

be created for any future configuration files, only main.inc.php is
special for now).

diff --git a/debian/roundcube-core.install b/debian/roundcube-core.install
index 7183022bac45dfaf853dbaf21f360aada8f909fa..a0dd3c682241dee63d2e756abea566551f99bea0 100644 (file)
--- a/debian/roundcube-core.install
+++ b/debian/roundcube-core.install
@@ -1,3 +1,4 @@
 robots.txt index.php program/ bin/ usr/share/roundcube
 skins temp var/lib/roundcube
 debian/conf/* etc/roundcube
+config/*.php etc/roundcube

diff --git a/debian/roundcube-core.links b/debian/roundcube-core.links
index 025b868c145147b42a065aae66aeaf0397ab5e06..fa13d4300a49289630cb1deec82aedf4582294fe 100644 (file)
--- a/debian/roundcube-core.links
+++ b/debian/roundcube-core.links
@@ -1,5 +1,4 @@
 etc/roundcube/main.inc.php var/lib/roundcube/config/main.inc.php
-etc/roundcube/db.inc.php var/lib/roundcube/config/db.inc.php
 var/lib/roundcube/temp usr/share/roundcube/temp
 var/lib/roundcube/plugins usr/share/roundcube/plugins
 var/lib/roundcube/skins usr/share/roundcube/skins

diff --git a/debian/rules b/debian/rules
index f87ce91a461a9b86a22b794fe650a6cb48cd47ce..c76a5097753c32f2ac8f66b6cb9e8484b31fc5d6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,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