In respect to policy 12.3, do not put main.inc.php.dist in

/usr/share/doc, thanks to Jonas Smedegaard <dr@jones.dk> (Closes:
#446502).

diff --git a/debian/changelog b/debian/changelog
index f8877b7ffbf0558ae968a984b38c53fbd591da3d..30b464692cda76e2193d9339e915b69d19983f10 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+roundcube (0.1~rc1-3) unstable; urgency=low
+
+  * In respect to policy 12.3, do not put main.inc.php.dist in
+    /usr/share/doc, thanks to Jonas Smedegaard <dr@jones.dk> (Closes:
+    #446502).
+
+ -- Vincent Bernat <bernat@luffy.cx>  Sun, 14 Oct 2007 08:31:09 +0200
+
 roundcube (0.1~rc1-2) unstable; urgency=low
 
   * Fix dependencies by creating virtual packages for each database

diff --git a/debian/docs b/debian/docs
index 085fdcfa52a364d795704bb684abfe5795ac7091..c42dfaf29f7ebb66f4391558be86ff2a8514921f 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,2 @@
 README
 UPGRADING
-config/main.inc.php.dist

diff --git a/debian/postinst b/debian/postinst
index 80b0827a4ef5e0641a2f7f43a09e5a09d9991b10..33d691264f9babc88cf8f1e86c472f189c36aa7f 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -101,7 +101,7 @@ EOF
        done
 
        # Put hosts, language and key in main.inc.php
-       zcat /usr/share/doc/roundcube/main.inc.php.dist.gz | \
+       cat /usr/share/roundcube/main.inc.php.dist | \
            sed -e "s+^\(\$rcmail_config\['default_host'\] = \)''\(;\)\$+\1${hosts}\2+" \
                -e "s+^\(\$rcmail_config\['des_key'\] = '\).*\(';\)\$+\1$deskey\2+" \
                -e "s+^\(\$rcmail_config\['locale_string'\] = '\).*\(';\)\$+\1${language}\2+" >> $CONFFILE.ucftmp

diff --git a/debian/rules b/debian/rules
index 96e7b8de8647abadf2972819fa2293c00044b031..ad615aa0f8b795eb3b091cb79a419d141e7a7068 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,7 @@ binary-install/roundcube::
        done
        # Install config/db.inc.php.dist
        install -m 0640 $(CURDIR)/config/db.inc.php.dist $(CURDIR)/debian/roundcube/etc/roundcube/db.inc.php
+       install -m 0640 $(CURDIR)/config/main.inc.php.dist $(CURDIR)/debian/roundcube/usr/share/roundcube
        # Install empty tables and updates for each db type
        install -m 0644 $(CURDIR)/SQL/mysql.initial.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/install/mysql
        install -m 0644 $(CURDIR)/SQL/mysql.update.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/upgrade/mysql/0.1~rc1~dfsg-1