From ddec9214b8fc6ace0ed40104c007e374c4699b35 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Tue, 1 Mar 2011 19:59:00 +0100 Subject: [PATCH] Imported Debian patch 0.5.1+dfsg-4 --- debian/changelog | 7 +++++++ debian/roundcube-core.postinst | 7 ++++--- debian/watch | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 947a76d..1131b04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +roundcube (0.5.1+dfsg-4) unstable; urgency=low + + * Fix debian/watch to remove "+dfsg" suffix. + * Use awk instead of sed to modify main.inc.php. Closes: #615277. + + -- Vincent Bernat Tue, 01 Mar 2011 19:59:00 +0100 + roundcube (0.5.1+dfsg-3) unstable; urgency=low * Install show_additional_headers plugin in roundcube-plugins package. diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst index 59f85f7..843a185 100644 --- a/debian/roundcube-core.postinst +++ b/debian/roundcube-core.postinst @@ -101,9 +101,10 @@ EOF # Put hosts, language and key in main.inc.php 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\['language'\] = \).*\(;\)\$+\1'${language}'\2+" >> $CONFFILE.ucftmp + awk "/^.rcmail_config\['default_host'\] =/ {print \$1\" = ${hosts};\" ; next} + /^.rcmail_config\['des_key'\] =/ {print \$1\" = '${deskey}';\" ; next} + /^.rcmail_config\['language'\] =/ {print \$1\" = '${language}';\" ; next} + {print}" >> $CONFFILE.ucftmp ucf --debconf-ok $CONFFILE.ucftmp $CONFFILE chown root:www-data $CONFFILE diff --git a/debian/watch b/debian/watch index ce76e07..52d2904 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -opts="uversionmangle=s/-(rc|alpha|beta)/~$1/" http://sf.net/roundcubemail/roundcubemail-([\d\.]+.*)-dep\.tar\.gz +opts="uversionmangle=s/-(rc|alpha|beta)/~$1/,dversionmangle=s/\+dfsg//" http://sf.net/roundcubemail/roundcubemail-([\d\.]+.*)-dep\.tar\.gz -- 2.39.2