From 9f1925b2f0592aed8f2ba5bffe872cca82b9d3e4 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 14 Oct 2007 06:35:05 +0000 Subject: [PATCH] In respect to policy 12.3, do not put main.inc.php.dist in /usr/share/doc, thanks to Jonas Smedegaard (Closes: #446502). --- debian/changelog | 8 ++++++++ debian/docs | 1 - debian/postinst | 2 +- debian/rules | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f8877b7..30b4646 100644 --- 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 (Closes: + #446502). + + -- Vincent Bernat 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 085fdcf..c42dfaf 100644 --- 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 80b0827..33d6912 100644 --- 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 96e7b8d..ad615aa 100755 --- 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 -- 2.39.2