Imported Debian patch 0.5.1+dfsg-4

diff --git a/debian/changelog b/debian/changelog
index 947a76dbb05a5e6dbf468e49d2d2dcb677375a19..1131b043efb52ad75e1c514d3e336231538ec9f4 100644 (file)
--- 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 <bernat@debian.org>  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 59f85f727ba009b087ba18dc6b201321ab2c2386..843a1859a9b38ea87fc4541bb1bacf1280a4112f 100644 (file)
--- 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 ce76e07a7ecd21f88daa1e5b6852ac31c197b197..52d29048b0af9f4798bd78665dd7de42610635ab 100644 (file)
--- 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