Imported Debian patch 0.1~rc1-3

diff --git a/debian/changelog b/debian/changelog
index f8877b7ffbf0558ae968a984b38c53fbd591da3d..44a19b7ad38e19ee55dc4aec87b0ef6e409c5554 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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).
+  * Update German and French debconf templates, thanks to Christian
+    Perrier (Closes: #446458) and Helge Kreutzmann (Closes: #446532).
+
+ -- Vincent Bernat <bernat@luffy.cx>  Sun, 14 Oct 2007 08:41:24 +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/links b/debian/links
index e93993e2bf6ea071d730fa0f1223857ae01ff52e..812c7a40969a7d2ec6052ace202631a84c1a94cf 100644 (file)
--- a/debian/links
+++ b/debian/links
@@ -5,3 +5,4 @@ var/lib/roundcube/skins usr/share/roundcube/skins
 var/lib/roundcube/config usr/share/roundcube/config
 var/log/roundcube var/lib/roundcube/logs
 var/lib/roundcube/logs usr/share/roundcube/logs
+usr/share/roundcube/main.inc.php.dist usr/share/doc/roundcube/main.inc.php.dist

diff --git a/debian/po/de.po b/debian/po/de.po
index 0808342c02474d71f7a8883fffda78404c157bec..87b043aff55817abf25505860270fcabc72d3863 100644 (file)
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: roundcube\n"
+"Project-Id-Version: roundcube 0.1~rc1-2\n"
 "Report-Msgid-Bugs-To: pkg-roundcube-maintainers@lists.alioth.debian.org\n"
 "POT-Creation-Date: 2007-05-26 09:36+0200\n"
-"PO-Revision-Date: 2007-05-27 10:27+0200\n"
+"PO-Revision-Date: 2007-10-13 21:33+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -73,15 +73,11 @@ msgstr "Soll der/die Webserver jetzt automatisch neu gestartet werden?"
 #. Type: boolean
 #. Description
 #: ../templates:3001
-#, fuzzy
-#| msgid ""
-#| "In order to activate the new configuration, the reconfigured web servers "
-#| "have to be restarted."
 msgid ""
 "In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
 msgstr ""
-"Um die neue Konfiguration zu aktivieren, müssen die rekonfigurierten "
+"Um die neue Konfiguration zu aktivieren, müssen der/die rekonfigurierten "
 "Webserver neu gestartet werden."
 
 #. Type: string

diff --git a/debian/po/fr.po b/debian/po/fr.po
index 60f7d25218d3c6c04480d27c5f2d0444e131e3b3..cc13f45a2f515b14f82c7ee0e5ef73a1d0c9ee93 100644 (file)
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -74,10 +74,6 @@ msgstr "Faut-il redémarrer le(s) serveur(s) web maintenant ?"
 #. Type: boolean
 #. Description
 #: ../templates:3001
-#, fuzzy
-#| msgid ""
-#| "In order to activate the new configuration, the reconfigured web servers "
-#| "have to be restarted."
 msgid ""
 "In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."

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