From: Vincent Bernat Date: Wed, 5 Mar 2008 19:49:03 +0000 (+0100) Subject: Imported Debian patch 0.1-1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d67919fd0c7962fb1d252bb3450fa9b8339b5a4e;p=roundcube.git Imported Debian patch 0.1-1 --- diff --git a/debian/changelog b/debian/changelog index bd10872..aea4e9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,28 @@ +roundcube (0.1-1) unstable; urgency=low + + * New upstream release (Closes: #469487). + - This release seems to fix failure to set some fields when replying, + with bincimap as IMAP server (Closes: #443562) + - It also fixes the deletion of multiple messages, still with + bincimap (Closes: #451404) + * Remove 'ob_gzhandler.patch' and 'xss-fix.patch'. They have been + merged upstream. + * Upstream has switched to MDB2 database backend which is not packaged + in Debian yet. We switch back to old backend. + * Fix debian/watch to handle correctly detection of new versions. + * Add support for lighttpd and remove support for older version of + Apache. The debconf question about webserver autoconfiguration is + reworded (Closes: #462961). + * Do not depend on a specific revision of cdbs. + * Move po-debconf from Build-Depends-Indep to Build-Depends since it is + needed for clean target. + * Correct path to /usr/share/file/magic, provided by libmagic1. Provide + license information about this file in debian/copyright. + + -- Vincent Bernat Wed, 05 Mar 2008 20:49:03 +0100 + roundcube (0.1~rc2-6) unstable; urgency=high - [ Vincent Bernat ] * Bug fix: "CVE-2007-6321: Cross-site scripting (XSS) vulnerability", thanks to Micah Anderson (Closes: #455840). The patch is from http://lists.roundcube.net/mail-archive/dev/2007-12/0000038.html and @@ -8,12 +30,7 @@ roundcube (0.1~rc2-6) unstable; urgency=high stolen from Squirrelmail. * Finnish debconf template, thanks to Esko Arajärvi (Closes: #458244). - [ Romain Beauxis ] - * Added DM-Upload-Allowed: yes to control file. - * Moved po-debconf to Build-Dep since it is needed for clean - target. Thanks to lintian. - - -- Romain Beauxis Sat, 26 Jan 2008 03:26:42 +0100 + -- Vincent Bernat Sat, 29 Dec 2007 21:55:17 +0100 roundcube (0.1~rc2-5) unstable; urgency=low diff --git a/debian/conf/lighttpd.conf b/debian/conf/lighttpd.conf new file mode 100644 index 0000000..d64b232 --- /dev/null +++ b/debian/conf/lighttpd.conf @@ -0,0 +1,17 @@ +# You may want to set up this alias differently depending on your +# virtual host configuration. Do not forget to adapt the rest of the +# configuration. + +alias.url += ( + "/roundcube" => "/var/lib/roundcube", + # The following line allow to use tinymce. Look at README.Debian + "/roundcube/program/js/tiny_mce" => "/usr/share/tinymce/www" +) + +$HTTP["url"] =~ "^/roundcube" { + server.follow-symlink = "enable" +} + +$HTTP["url"] =~ "^/roundcube/config|/roundcube/temp|/roundcube/logs" { + url.access-deny = ( "" ) +} diff --git a/debian/control b/debian/control index 82b4690..02a9d8b 100644 --- a/debian/control +++ b/debian/control @@ -3,16 +3,15 @@ Section: web Priority: extra Maintainer: Debian Roundcube Maintainers Uploaders: Vincent Bernat , Romain Beauxis -Build-Depends: debhelper (>= 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), po-debconf +Build-Depends: debhelper (>= 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), po-debconf Homepage: http://www.roundcube.net/ Standards-Version: 3.7.3 -DM-Upload-Allowed: yes -Vcs-Svn: svn://svn.debian.org/pkg-roundcube/roundcube +Vcs-Svn: svn://svn.debian.org/svn/pkg-roundcube/roundcube Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube Package: roundcube-core Architecture: all -Depends: dbconfig-common, debconf | debconf-2.0, apache2 | httpd, php5, php5-mcrypt, roundcube-db, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, tinymce, ${misc:Depends} +Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, roundcube-db, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, tinymce, ${misc:Depends}, libmagic1 Replaces: roundcube Conflicts: roundcube (<< 0.1~rc2-2) Description: skinnable AJAX based webmail solution for IMAP servers diff --git a/debian/control.in b/debian/control.in index cb97fcf..a6dae44 100644 --- a/debian/control.in +++ b/debian/control.in @@ -6,13 +6,12 @@ Uploaders: Vincent Bernat , Romain Beauxis + + This software is not subject to any export provision of the United + States Department of Commerce, and may be exported to any country or + planet. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + 1. Redistributions of source code must retain the above copyright notice + immediately at the beginning of the file, without modification, this + list of conditions, and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + THE POSSIBILITY OF SUCH DAMAGE. + +All other licenses can be found in the corresponding source file. The Debian packaging is (C) 2007, Vincent Bernat and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. diff --git a/debian/patches/correct-magic-path.patch b/debian/patches/correct-magic-path.patch new file mode 100644 index 0000000..e8e1b2e --- /dev/null +++ b/debian/patches/correct-magic-path.patch @@ -0,0 +1,11 @@ +--- roundcube-0.1/config/main.inc.php.dist~ 2008-02-21 11:27:19.000000000 +0100 ++++ roundcube-0.1/config/main.inc.php.dist 2008-03-06 14:04:53.000000000 +0100 +@@ -277,7 +277,7 @@ + $rcmail_config['max_pagesize'] = 200; + + // mime magic database +-$rcmail_config['mime_magic'] = '/usr/share/misc/magic'; ++$rcmail_config['mime_magic'] = '/usr/share/file/magic'; + + // end of config file + ?> diff --git a/debian/patches/dbconfig-common_support.patch b/debian/patches/dbconfig-common_support.patch index ec4a2a8..4063b3c 100644 --- a/debian/patches/dbconfig-common_support.patch +++ b/debian/patches/dbconfig-common_support.patch @@ -6,7 +6,7 @@ -// PEAR database DSN for read/write operations -// format is db_provider://user:password@host/databse --// currently supported db_providers: mysql, sqlite +-// currently supported db_providers: mysql, mysqli, pgsql, sqlite, mssql - -$rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail'; -// postgres example: 'pgsql://roundcube:pass@localhost/roundcubemail'; diff --git a/debian/patches/ob_gzhandler.patch b/debian/patches/ob_gzhandler.patch deleted file mode 100644 index 4b2827c..0000000 --- a/debian/patches/ob_gzhandler.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- roundcube/index.php 2007-10-29 21:56:00.000000000 +0100 -+++ roundcube/index.php 2007-11-17 09:10:54.000000000 +0100 -@@ -103,7 +103,7 @@ - if ($_action != 'get' && $_action != 'viewsource') - { - // use gzip compression if supported -- if (function_exists('ob_gzhandler') && ini_get('zlib.output_compression')) -+ if (function_exists('ob_gzhandler') && !ini_get('zlib.output_compression')) - ob_start('ob_gzhandler'); - else - ob_start(); diff --git a/debian/patches/series b/debian/patches/series index 2cdc720..b5789c7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,5 @@ dbconfig-common_support.patch correct_install_path.patch use_packaged_tinymce.patch -ob_gzhandler.patch -xss-fix.patch +use-db-backend.patch +correct-magic-path.patch diff --git a/debian/patches/use-db-backend.patch b/debian/patches/use-db-backend.patch new file mode 100644 index 0000000..a32a0f4 --- /dev/null +++ b/debian/patches/use-db-backend.patch @@ -0,0 +1,11 @@ +--- roundcubemail-0.1-dep/config/db.inc.php.dist~ 2008-03-03 22:32:15.000000000 +0100 ++++ roundcubemail-0.1-dep/config/db.inc.php.dist 2008-03-05 21:07:28.000000000 +0100 +@@ -27,7 +27,7 @@ + $rcmail_config['db_dsnr'] = ''; + + // database backend to use (only db or mdb2 are supported) +-$rcmail_config['db_backend'] = 'mdb2'; ++$rcmail_config['db_backend'] = 'db'; + + // maximum length of a query in bytes + $rcmail_config['db_max_length'] = 512000; // 500K diff --git a/debian/patches/xss-fix.patch b/debian/patches/xss-fix.patch deleted file mode 100644 index 225283c..0000000 --- a/debian/patches/xss-fix.patch +++ /dev/null @@ -1,136 +0,0 @@ ---- roundcube/program/steps/mail/func.inc 2007-10-17 08:50:28.000000000 +0200 -+++ roundcube/program/steps/mail/func.inc 2008-01-22 21:59:30.000000000 +0100 -@@ -481,6 +481,124 @@ - return Q($out); - } - -+/* Stolen from Squirrelmail */ -+function sq_deent(&$attvalue, $regex, $hex=false){ -+ $ret_match = false; -+ preg_match_all($regex, $attvalue, $matches); -+ if (is_array($matches) && sizeof($matches[0]) > 0){ -+ $repl = Array(); -+ for ($i = 0; $i < sizeof($matches[0]); $i++){ -+ $numval = $matches[1][$i]; -+ if ($hex){ -+ $numval = hexdec($numval); -+ } -+ $repl{$matches[0][$i]} = chr($numval); -+ } -+ $attvalue = strtr($attvalue, $repl); -+ return true; -+ } else { -+ return false; -+ } -+} -+ -+/* Stolen verbatim from Squirrelmail */ -+function sq_defang(&$attvalue){ -+ /** -+ * Skip this if there aren't ampersands or backslashes. -+ */ -+ if (strpos($attvalue, '&') === false -+ && strpos($attvalue, '\\') === false){ -+ return; -+ } -+ $m = false; -+ do { -+ $m = false; -+ $m = $m || sq_deent($attvalue, '/\�*(\d+);*/s'); -+ $m = $m || sq_deent($attvalue, '/\�*((\d|[a-f])+);*/si', true); -+ $m = $m || sq_deent($attvalue, '/\\\\(\d+)/s', true); -+ } while ($m == true); -+ $attvalue = stripslashes($attvalue); -+} -+ -+function rcmail_html_filter($html) -+ { -+ preg_match_all('/<\/?\w+((\s+\w+(\s*=\s*(?:".*?"|\'.*?\'|[^\'">\s]+))?)+\s*|\s*)\/?>/', $html, $tags); -+ -+ /* From Squirrelmail: Translate all dangerous Unicode or Shift_JIS characters which are accepted by -+ * IE as regular characters. */ -+ $replace = array(array('ʟ', 'ʟ' ,/* L UNICODE IPA Extension */ -+ 'ʀ', 'ʀ' ,/* R UNICODE IPA Extension */ -+ 'ɴ', 'ɴ' ,/* N UNICODE IPA Extension */ -+ 'Ｅ', 'Ｅ' ,/* Unicode FULLWIDTH LATIN CAPITAL LETTER E */ -+ 'ｅ', 'ｅ' ,/* Unicode FULLWIDTH LATIN SMALL LETTER E */ -+ 'Ｘ', 'Ｘ',/* Unicode FULLWIDTH LATIN CAPITAL LETTER X */ -+ 'ｘ', 'ｘ',/* Unicode FULLWIDTH LATIN SMALL LETTER X */ -+ 'Ｐ', 'Ｐ',/* Unicode FULLWIDTH LATIN CAPITAL LETTER P */ -+ 'ｐ', 'ｐ',/* Unicode FULLWIDTH LATIN SMALL LETTER P */ -+ 'Ｒ', 'Ｒ',/* Unicode FULLWIDTH LATIN CAPITAL LETTER R */ -+ 'ｒ', 'ｒ',/* Unicode FULLWIDTH LATIN SMALL LETTER R */ -+ 'Ｓ', 'Ｓ',/* Unicode FULLWIDTH LATIN CAPITAL LETTER S */ -+ 'ｓ', 'ｓ',/* Unicode FULLWIDTH LATIN SMALL LETTER S */ -+ 'Ｉ', 'Ｉ',/* Unicode FULLWIDTH LATIN CAPITAL LETTER I */ -+ 'ｉ', 'ｉ',/* Unicode FULLWIDTH LATIN SMALL LETTER I */ -+ 'Ｏ', 'Ｏ',/* Unicode FULLWIDTH LATIN CAPITAL LETTER O */ -+ 'ｏ', 'ｏ',/* Unicode FULLWIDTH LATIN SMALL LETTER O */ -+ 'Ｎ', 'Ｎ',/* Unicode FULLWIDTH LATIN CAPITAL LETTER N */ -+ 'ｎ', 'ｎ',/* Unicode FULLWIDTH LATIN SMALL LETTER N */ -+ 'Ｌ', 'Ｌ',/* Unicode FULLWIDTH LATIN CAPITAL LETTER L */ -+ 'ｌ', 'ｌ',/* Unicode FULLWIDTH LATIN SMALL LETTER L */ -+ 'Ｕ', 'Ｕ',/* Unicode FULLWIDTH LATIN CAPITAL LETTER U */ -+ 'ｕ', 'ｕ',/* Unicode FULLWIDTH LATIN SMALL LETTER U */ -+ 'ⁿ', 'ⁿ' ,/* Unicode SUPERSCRIPT LATIN SMALL LETTER N */ -+ "\xEF\xBC\xA5", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER E */ -+ /* in unicode this is some Chinese char range */ -+ "\xEF\xBD\x85", /* Shift JIS FULLWIDTH LATIN SMALL LETTER E */ -+ "\xEF\xBC\xB8", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER X */ -+ "\xEF\xBD\x98", /* Shift JIS FULLWIDTH LATIN SMALL LETTER X */ -+ "\xEF\xBC\xB0", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER P */ -+ "\xEF\xBD\x90", /* Shift JIS FULLWIDTH LATIN SMALL LETTER P */ -+ "\xEF\xBC\xB2", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER R */ -+ "\xEF\xBD\x92", /* Shift JIS FULLWIDTH LATIN SMALL LETTER R */ -+ "\xEF\xBC\xB3", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER S */ -+ "\xEF\xBD\x93", /* Shift JIS FULLWIDTH LATIN SMALL LETTER S */ -+ "\xEF\xBC\xA9", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER I */ -+ "\xEF\xBD\x89", /* Shift JIS FULLWIDTH LATIN SMALL LETTER I */ -+ "\xEF\xBC\xAF", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER O */ -+ "\xEF\xBD\x8F", /* Shift JIS FULLWIDTH LATIN SMALL LETTER O */ -+ "\xEF\xBC\xAE", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER N */ -+ "\xEF\xBD\x8E", /* Shift JIS FULLWIDTH LATIN SMALL LETTER N */ -+ "\xEF\xBC\xAC", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER L */ -+ "\xEF\xBD\x8C", /* Shift JIS FULLWIDTH LATIN SMALL LETTER L */ -+ "\xEF\xBC\xB5", /* Shift JIS FULLWIDTH LATIN CAPITAL LETTER U */ -+ "\xEF\xBD\x95", /* Shift JIS FULLWIDTH LATIN SMALL LETTER U */ -+ "\xE2\x81\xBF", /* Shift JIS FULLWIDTH SUPERSCRIPT N */ -+ "\xCA\x9F", /* L UNICODE IPA Extension */ -+ "\xCA\x80", /* R UNICODE IPA Extension */ -+ "\xC9\xB4"), /* N UNICODE IPA Extension */ -+ array('l', 'l', 'r', 'r', 'n', 'n', 'E', 'E', 'e', 'e', 'X', 'X', 'x', 'x', -+ 'P', 'P', 'p', 'p', 'R', 'R', 'r', 'r', 'S', 'S', 's', 's', 'I', 'I', -+ 'i', 'i', 'O', 'O', 'o', 'o', 'N', 'N', 'n', 'n', 'L', 'L', 'l', 'l', -+ 'U', 'U', 'u', 'u', 'n', 'n', 'E', 'e', 'X', 'x', 'P', 'p', 'R', 'r', -+ 'S', 's', 'I', 'i', 'O', 'o', 'N', 'n', 'L', 'l', 'U', 'u', 'n', 'l', 'r', 'n')); -+ if ((count($tags)>3) && (count($tags[3])>0)) -+ foreach ($tags[3] as $nr=>$value) -+ { -+ /* Remove comments */ -+ $newvalue = preg_replace('/(\/\*.*\*\/)/','$2',$value); -+ /* Translate dangerous characters */ -+ $newvalue = str_replace($replace[0], $replace[1], $newvalue); -+ sq_defang($newvalue); -+ /* Rename dangerous CSS */ -+ $newvalue = preg_replace('/expression/i', 'idiocy', $newvalue); -+ $newvalue = preg_replace('/url/i', 'idiocy', $newvalue); -+ $newattrs = preg_replace('/'.preg_quote($value, '/').'$/', $newvalue, $tags[1][$nr]); -+ $newtag = preg_replace('/'.preg_quote($tags[1][$nr], '/').'/', $newattrs, $tags[0][$nr]); -+ $html = preg_replace('/'.preg_quote($tags[0][$nr], '/').'/', $newtag, $html); -+ } -+ -+ return $html; -+ } -+ - - function rcmail_print_body($part, $safe=FALSE, $plain=FALSE) - { -@@ -533,7 +651,7 @@ - $body = preg_replace($remote_patterns, $remote_replaces, $body); - } - -- return Q($body, 'show', FALSE); -+ return Q(rcmail_html_filter($body), 'show', FALSE); - } - - // text/enriched diff --git a/debian/po/ar.po b/debian/po/ar.po index dd89f76..a86ee3e 100644 --- a/debian/po/ar.po +++ b/debian/po/ar.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: ar\n" -"Report-Msgid-Bugs-To: pkg-roundcube-maintainers@lists.alioth.debian.org\n" -"POT-Creation-Date: 2007-05-26 09:36+0200\n" +"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" +"POT-Creation-Date: 2008-03-05 22:12+0100\n" "PO-Revision-Date: 2007-06-02 01:26+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -19,26 +19,14 @@ msgstr "" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache" -msgstr "apache" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-ssl" -msgstr "apache-ssl" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-perl" -msgstr "apache-perl" +msgid "apache2" +msgstr "apache2" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache2" -msgstr "apache2" +msgid "lighttpd" +msgstr "" #. Type: multiselect #. Description @@ -49,9 +37,13 @@ msgstr "خادم الوب المطلوب تهيئته آلياً:" #. Type: multiselect #. Description #: ../templates:2002 +#, fuzzy +#| msgid "" +#| "RoundCube supports any web server supported by PHP, however only Apache " +#| "can be configured automatically." msgid "" -"RoundCube supports any web server supported by PHP, however only Apache can " -"be configured automatically." +"RoundCube supports any web server supported by PHP, however only Apache 2 " +"and lighttpd can be configured automatically." msgstr "يدعم RoundCube أي خادم وب يدعمه PHP، ولكن يمكن تهيئة Apache فقط آلياً." #. Type: multiselect @@ -140,3 +132,12 @@ msgid "" msgstr "" "على أي، سيتم استخدام اللغة الافتراضية لشاشة تسجيل الدخول والاتصال الأول " "للمستخدمين." + +#~ msgid "apache" +#~ msgstr "apache" + +#~ msgid "apache-ssl" +#~ msgstr "apache-ssl" + +#~ msgid "apache-perl" +#~ msgstr "apache-perl" diff --git a/debian/po/cs.po b/debian/po/cs.po index ccb5b2e..78d2153 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: roundcube\n" -"Report-Msgid-Bugs-To: pkg-roundcube-maintainers@lists.alioth.debian.org\n" -"POT-Creation-Date: 2007-05-26 09:36+0200\n" +"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" +"POT-Creation-Date: 2008-03-05 22:12+0100\n" "PO-Revision-Date: 2007-05-28 19:51+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -18,26 +18,14 @@ msgstr "" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache" -msgstr "apache" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-ssl" -msgstr "apache-ssl" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-perl" -msgstr "apache-perl" +msgid "apache2" +msgstr "apache2" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache2" -msgstr "apache2" +msgid "lighttpd" +msgstr "" #. Type: multiselect #. Description @@ -48,9 +36,13 @@ msgstr "Webové servery, které se mají nastavit automaticky:" #. Type: multiselect #. Description #: ../templates:2002 +#, fuzzy +#| msgid "" +#| "RoundCube supports any web server supported by PHP, however only Apache " +#| "can be configured automatically." msgid "" -"RoundCube supports any web server supported by PHP, however only Apache can " -"be configured automatically." +"RoundCube supports any web server supported by PHP, however only Apache 2 " +"and lighttpd can be configured automatically." msgstr "" "RoundCube podporuje libovolný webový server, pod kterým běží PHP, ovÅ¡em " "automaticky lze nastavit pouze Apache." @@ -145,3 +137,12 @@ msgid "" msgstr "" "Výchozí jazyk se vÅ¡ak použije na přihlaÅ¡ovací obrazovce a při prvním " "připojení uživatelů." + +#~ msgid "apache" +#~ msgstr "apache" + +#~ msgid "apache-ssl" +#~ msgstr "apache-ssl" + +#~ msgid "apache-perl" +#~ msgstr "apache-perl" diff --git a/debian/po/de.po b/debian/po/de.po index 87b043a..e03094e 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "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" +"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" +"POT-Creation-Date: 2008-03-05 22:12+0100\n" "PO-Revision-Date: 2007-10-13 21:33+0200\n" "Last-Translator: Helge Kreutzmann \n" "Language-Team: German \n" @@ -17,26 +17,14 @@ msgstr "" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache" -msgstr "Apache" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-ssl" -msgstr "Apache-SSL" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-perl" -msgstr "Apache-Perl" +msgid "apache2" +msgstr "Apache2" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache2" -msgstr "Apache2" +msgid "lighttpd" +msgstr "" #. Type: multiselect #. Description @@ -47,9 +35,13 @@ msgstr "Webserver, die automatisch konfiguriert werden sollen:" #. Type: multiselect #. Description #: ../templates:2002 +#, fuzzy +#| msgid "" +#| "RoundCube supports any web server supported by PHP, however only Apache " +#| "can be configured automatically." msgid "" -"RoundCube supports any web server supported by PHP, however only Apache can " -"be configured automatically." +"RoundCube supports any web server supported by PHP, however only Apache 2 " +"and lighttpd can be configured automatically." msgstr "" "RoundCube unterstützt jeden Webserver, der auch von PHP unterstützt wird. " "Allerdings kann nur Apache automatisch konfiguriert werden." @@ -145,3 +137,12 @@ msgid "" msgstr "" "Allerdings wird die Standardsprache beim Anmeldebildschirm und der ersten " "Verbindung mit den Benutzern verwandt." + +#~ msgid "apache" +#~ msgstr "Apache" + +#~ msgid "apache-ssl" +#~ msgstr "Apache-SSL" + +#~ msgid "apache-perl" +#~ msgstr "Apache-Perl" diff --git a/debian/po/es.po b/debian/po/es.po index 7c3c20c..c13192a 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -28,8 +28,8 @@ msgid "" msgstr "" "Project-Id-Version: roundcube_0.1~rc1~dfsg-1\n" -"Report-Msgid-Bugs-To: pkg-roundcube-maintainers@lists.alioth.debian.org\n" -"POT-Creation-Date: 2007-05-26 09:36+0200\n" +"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" +"POT-Creation-Date: 2008-03-05 22:12+0100\n" "PO-Revision-Date: 2007-05-28 10:47+0200\n" "Last-Translator: Carlos Galisteo \n" "Language-Team: \n" @@ -40,25 +40,13 @@ msgstr "" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache" -msgstr "" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-ssl" -msgstr "" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-perl" +msgid "apache2" msgstr "" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache2" +msgid "lighttpd" msgstr "" #. Type: multiselect @@ -72,8 +60,8 @@ msgstr "Reconfiguración del servidor web:" #. Description #: ../templates:2002 msgid "" -"RoundCube supports any web server supported by PHP, however only Apache can " -"be configured automatically." +"RoundCube supports any web server supported by PHP, however only Apache 2 " +"and lighttpd can be configured automatically." msgstr "" #. Type: multiselect diff --git a/debian/po/eu.po b/debian/po/eu.po index 042c6df..ae55c33 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: roundcube-templates\n" -"Report-Msgid-Bugs-To: pkg-roundcube-maintainers@lists.alioth.debian.org\n" -"POT-Creation-Date: 2007-05-26 09:36+0200\n" +"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" +"POT-Creation-Date: 2008-03-05 22:12+0100\n" "PO-Revision-Date: 2007-05-26 20:51+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -19,26 +19,14 @@ msgstr "" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache" -msgstr "apache" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-ssl" -msgstr "apache-ssl" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-perl" -msgstr "apache-perl" +msgid "apache2" +msgstr "apache2" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache2" -msgstr "apache2" +msgid "lighttpd" +msgstr "" #. Type: multiselect #. Description @@ -49,9 +37,13 @@ msgstr "Automatikoki konfiguratu behar den web zerbitzaria:" #. Type: multiselect #. Description #: ../templates:2002 +#, fuzzy +#| msgid "" +#| "RoundCube supports any web server supported by PHP, however only Apache " +#| "can be configured automatically." msgid "" -"RoundCube supports any web server supported by PHP, however only Apache can " -"be configured automatically." +"RoundCube supports any web server supported by PHP, however only Apache 2 " +"and lighttpd can be configured automatically." msgstr "" "RoundCube-k PHP onartzen duen edozein web zerbitzari onartzen du, hala ere " "Apache bakarrik konfiguratu daiteke automatikoki." @@ -148,3 +140,12 @@ msgid "" msgstr "" "Hala ere, lehenetsiriko hizkuntza saio hasiera orria eta erabiltzailearen " "lehen konexioetan erabiliko da." + +#~ msgid "apache" +#~ msgstr "apache" + +#~ msgid "apache-ssl" +#~ msgstr "apache-ssl" + +#~ msgid "apache-perl" +#~ msgstr "apache-perl" diff --git a/debian/po/fi.po b/debian/po/fi.po index dc86e03..cac79fb 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: roundcube_0.1~rc2-4\n" -"Report-Msgid-Bugs-To: pkg-roundcube-maintainers@lists.alioth.debian.org\n" -"POT-Creation-Date: 2007-05-26 09:36+0200\n" +"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" +"POT-Creation-Date: 2008-03-05 22:12+0100\n" "PO-Revision-Date: 2007-12-29 22:04+0200\n" "Last-Translator: Esko Arajärvi \n" "Language-Team: Finnish \n" @@ -15,26 +15,14 @@ msgstr "" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache" -msgstr "apache" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-ssl" -msgstr "apache-ssl" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-perl" -msgstr "apache-perl" +msgid "apache2" +msgstr "apache2" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache2" -msgstr "apache2" +msgid "lighttpd" +msgstr "" #. Type: multiselect #. Description @@ -45,14 +33,26 @@ msgstr "Automaattisesti asetettavat verkkopalvelimet:" #. Type: multiselect #. Description #: ../templates:2002 -msgid "RoundCube supports any web server supported by PHP, however only Apache can be configured automatically." -msgstr "RoundCube tukee kaikkia verkkopalvelimia, jotka tukevat PHP:ta, mutta vain Apachen asetukset voidaan tehdä automaattisesti." +#, fuzzy +#| msgid "" +#| "RoundCube supports any web server supported by PHP, however only Apache " +#| "can be configured automatically." +msgid "" +"RoundCube supports any web server supported by PHP, however only Apache 2 " +"and lighttpd can be configured automatically." +msgstr "" +"RoundCube tukee kaikkia verkkopalvelimia, jotka tukevat PHP:ta, mutta vain " +"Apachen asetukset voidaan tehdä automaattisesti." #. Type: multiselect #. Description #: ../templates:2002 -msgid "Please select the web server(s) that should be configured automatically for RoundCube." -msgstr "Valitse verkkopalvelimet, joiden asetukset tulisi automaattisesti tehdä RoundCubea varten." +msgid "" +"Please select the web server(s) that should be configured automatically for " +"RoundCube." +msgstr "" +"Valitse verkkopalvelimet, joiden asetukset tulisi automaattisesti tehdä " +"RoundCubea varten." #. Type: boolean #. Description @@ -63,8 +63,12 @@ msgstr "Tulisiko verkkopalvelimet käynnistää uudelleen nyt?" #. Type: boolean #. Description #: ../templates:3001 -msgid "In order to activate the new configuration, the reconfigured web server(s) have to be restarted." -msgstr "Uusien asetusten käyttöönottamiseksi asetetut verkkopalvelimet tulee käynnistää uudelleen." +msgid "" +"In order to activate the new configuration, the reconfigured web server(s) " +"have to be restarted." +msgstr "" +"Uusien asetusten käyttöönottamiseksi asetetut verkkopalvelimet tulee " +"käynnistää uudelleen." #. Type: string #. Description @@ -81,14 +85,24 @@ msgstr "Valitse IMAP-palvelimet, joita käytetään RoundCuben kanssa." #. Type: string #. Description #: ../templates:4001 -msgid "If this is left blank, a text box will be displayed at login. Entering a space-separated list of hosts will display a pull-down menu. Entering a single host will enforce using this host." -msgstr "Jos tämä kenttä jätetään tyhjäksi, kirjautumisvaiheessa näytetään tekstikenttä. Jos kentässä on välilyönnein eroteltu lista palvelimista, kirjauduttaessa näytetään alasvetovalikko. Yhden palvelimen syöttäminen pakottaa kyseisen palvelimen käyttöön." +msgid "" +"If this is left blank, a text box will be displayed at login. Entering a " +"space-separated list of hosts will display a pull-down menu. Entering a " +"single host will enforce using this host." +msgstr "" +"Jos tämä kenttä jätetään tyhjäksi, kirjautumisvaiheessa näytetään " +"tekstikenttä. Jos kentässä on välilyönnein eroteltu lista palvelimista, " +"kirjauduttaessa näytetään alasvetovalikko. Yhden palvelimen syöttäminen " +"pakottaa kyseisen palvelimen käyttöön." #. Type: string #. Description #: ../templates:4001 -msgid "To use SSL connections, please enter host names as 'ssl://hostname:993'." -msgstr "SSL-yhteydet saat käyttöön syöttämällä palvelimien verkkonimet muodossa ”ssl://verkkonimi:993”." +msgid "" +"To use SSL connections, please enter host names as 'ssl://hostname:993'." +msgstr "" +"SSL-yhteydet saat käyttöön syöttämällä palvelimien verkkonimet muodossa " +"”ssl://verkkonimi:993”." #. Type: select #. Description @@ -111,6 +125,18 @@ msgstr "Yksittäiset käyttäjät voivat muuttaa tätä valintaa asetuksissaan." #. Type: select #. Description #: ../templates:5001 -msgid "However, the default language will be used for the login screen and the first connection of users." -msgstr "Oletuskieltä käytetään kuitenkin kirjautumisruudussa ja käyttäjien ensimmäisen yhteyden yhteydessä." +msgid "" +"However, the default language will be used for the login screen and the " +"first connection of users." +msgstr "" +"Oletuskieltä käytetään kuitenkin kirjautumisruudussa ja käyttäjien " +"ensimmäisen yhteyden yhteydessä." + +#~ msgid "apache" +#~ msgstr "apache" + +#~ msgid "apache-ssl" +#~ msgstr "apache-ssl" +#~ msgid "apache-perl" +#~ msgstr "apache-perl" diff --git a/debian/po/fr.po b/debian/po/fr.po index cc13f45..2102069 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: roundcube-0.1~rc1~dfsg-1\n" -"Report-Msgid-Bugs-To: pkg-roundcube-maintainers@lists.alioth.debian.org\n" -"POT-Creation-Date: 2007-05-26 09:36+0200\n" +"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" +"POT-Creation-Date: 2008-03-05 22:12+0100\n" "PO-Revision-Date: 2007-06-02 00:35+0200\n" "Last-Translator: Vincent Bernat \n" "Language-Team: French \n" @@ -18,26 +18,14 @@ msgstr "" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache" -msgstr "Apache" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-ssl" -msgstr "Apache SSL" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-perl" -msgstr "Apache-perl" +msgid "apache2" +msgstr "Apache 2" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache2" -msgstr "Apache 2" +msgid "lighttpd" +msgstr "" #. Type: multiselect #. Description @@ -48,9 +36,13 @@ msgstr "Serveur(s) web à configurer automatiquement :" #. Type: multiselect #. Description #: ../templates:2002 +#, fuzzy +#| msgid "" +#| "RoundCube supports any web server supported by PHP, however only Apache " +#| "can be configured automatically." msgid "" -"RoundCube supports any web server supported by PHP, however only Apache can " -"be configured automatically." +"RoundCube supports any web server supported by PHP, however only Apache 2 " +"and lighttpd can be configured automatically." msgstr "" "RoundCube fonctionne avec n'importe quel serveur web géré par PHP. " "Cependant, seul Apache peut être configuré automatiquement." @@ -143,3 +135,12 @@ msgid "" msgstr "" "Cependant, la langue par défaut sera utilisée sur l'écran de connexion et " "lors de la première connexion de chaque utilisateur." + +#~ msgid "apache" +#~ msgstr "Apache" + +#~ msgid "apache-ssl" +#~ msgstr "Apache SSL" + +#~ msgid "apache-perl" +#~ msgstr "Apache-perl" diff --git a/debian/po/gl.po b/debian/po/gl.po index 627dec2..186d75d 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: roundcube\n" -"Report-Msgid-Bugs-To: pkg-roundcube-maintainers@lists.alioth.debian.org\n" -"POT-Creation-Date: 2007-05-26 09:36+0200\n" +"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" +"POT-Creation-Date: 2008-03-05 22:12+0100\n" "PO-Revision-Date: 2007-10-24 22:32+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -17,26 +17,14 @@ msgstr "" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache" -msgstr "apache" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-ssl" -msgstr "apache-ssl" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-perl" -msgstr "apache-perl" +msgid "apache2" +msgstr "apache2" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache2" -msgstr "apache2" +msgid "lighttpd" +msgstr "" #. Type: multiselect #. Description @@ -47,9 +35,13 @@ msgstr "Servidor(es) web a reconfigurar automaticamente:" #. Type: multiselect #. Description #: ../templates:2002 +#, fuzzy +#| msgid "" +#| "RoundCube supports any web server supported by PHP, however only Apache " +#| "can be configured automatically." msgid "" -"RoundCube supports any web server supported by PHP, however only Apache can " -"be configured automatically." +"RoundCube supports any web server supported by PHP, however only Apache 2 " +"and lighttpd can be configured automatically." msgstr "" "RoundCube soporta os servidores web soportados por PHP; nembargantes, só se " "pode configurar automaticamente Apache." @@ -141,3 +133,12 @@ msgid "" msgstr "" "Nembargantes, hase empregar o idioma por defecto na pantalla de inicio e na " "primeira conexión de cada usuario." + +#~ msgid "apache" +#~ msgstr "apache" + +#~ msgid "apache-ssl" +#~ msgstr "apache-ssl" + +#~ msgid "apache-perl" +#~ msgstr "apache-perl" diff --git a/debian/po/it.po b/debian/po/it.po index 559e504..c1954e3 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: roundcube italian debconf templates\n" -"Report-Msgid-Bugs-To: pkg-roundcube-maintainers@lists.alioth.debian.org\n" -"POT-Creation-Date: 2007-05-26 09:36+0200\n" +"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" +"POT-Creation-Date: 2008-03-05 22:12+0100\n" "PO-Revision-Date: 2007-05-29 21:09+0200\n" "Last-Translator: Luca Monducci \n" "Language-Team: Italian \n" @@ -18,26 +18,14 @@ msgstr "" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache" -msgstr "apache" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-ssl" -msgstr "apache-ssl" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-perl" -msgstr "apache-perl" +msgid "apache2" +msgstr "apache2" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache2" -msgstr "apache2" +msgid "lighttpd" +msgstr "" #. Type: multiselect #. Description @@ -48,9 +36,13 @@ msgstr "Server web da configurare automaticamente:" #. Type: multiselect #. Description #: ../templates:2002 +#, fuzzy +#| msgid "" +#| "RoundCube supports any web server supported by PHP, however only Apache " +#| "can be configured automatically." msgid "" -"RoundCube supports any web server supported by PHP, however only Apache can " -"be configured automatically." +"RoundCube supports any web server supported by PHP, however only Apache 2 " +"and lighttpd can be configured automatically." msgstr "" "RoundCube può essere usato con qualsiasi server web che supporta PHP, ma " "questo processo di configurazione automatica funziona solo con Apache." @@ -144,3 +136,12 @@ msgid "" msgstr "" "La lingua predefinita viene comunque usata nella schermata d'accesso e per " "la prima connessione degli utenti." + +#~ msgid "apache" +#~ msgstr "apache" + +#~ msgid "apache-ssl" +#~ msgstr "apache-ssl" + +#~ msgid "apache-perl" +#~ msgstr "apache-perl" diff --git a/debian/po/pt.po b/debian/po/pt.po index df83dbf..e22f59b 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: roundcube\n" -"Report-Msgid-Bugs-To: pkg-roundcube-maintainers@lists.alioth.debian.org\n" -"POT-Creation-Date: 2007-05-26 09:36+0200\n" +"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" +"POT-Creation-Date: 2008-03-05 22:12+0100\n" "PO-Revision-Date: 2007-05-27 22:41+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -19,26 +19,14 @@ msgstr "" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache" -msgstr "apache" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-ssl" -msgstr "apache-ssl" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-perl" -msgstr "apache-perl" +msgid "apache2" +msgstr "apache2" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache2" -msgstr "apache2" +msgid "lighttpd" +msgstr "" #. Type: multiselect #. Description @@ -49,9 +37,13 @@ msgstr "Servidor(es) web a configurar automaticamente:" #. Type: multiselect #. Description #: ../templates:2002 +#, fuzzy +#| msgid "" +#| "RoundCube supports any web server supported by PHP, however only Apache " +#| "can be configured automatically." msgid "" -"RoundCube supports any web server supported by PHP, however only Apache can " -"be configured automatically." +"RoundCube supports any web server supported by PHP, however only Apache 2 " +"and lighttpd can be configured automatically." msgstr "" "O RoundCube suporta qualquer servidor web suportado por PHP, no entanto o " "Apache pode ser configurado automaticamente." @@ -150,3 +142,12 @@ msgid "" msgstr "" "No entanto, o idioma por omissão será utilizado para o ecrã de login e " "primeira ligação dos utilizadores." + +#~ msgid "apache" +#~ msgstr "apache" + +#~ msgid "apache-ssl" +#~ msgstr "apache-ssl" + +#~ msgid "apache-perl" +#~ msgstr "apache-perl" diff --git a/debian/po/ru.po b/debian/po/ru.po index 5d67817..6a77798 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.1~rc1~dfsg-1\n" -"Report-Msgid-Bugs-To: pkg-roundcube-maintainers@lists.alioth.debian.org\n" -"POT-Creation-Date: 2007-05-26 09:36+0200\n" +"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" +"POT-Creation-Date: 2008-03-05 22:12+0100\n" "PO-Revision-Date: 2007-06-11 13:06+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -21,26 +21,14 @@ msgstr "" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache" -msgstr "apache" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-ssl" -msgstr "apache-ssl" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-perl" -msgstr "apache-perl" +msgid "apache2" +msgstr "apache2" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache2" -msgstr "apache2" +msgid "lighttpd" +msgstr "" #. Type: multiselect #. Description @@ -51,9 +39,13 @@ msgstr "Веб-сервер(ы), которые нужно настроить а #. Type: multiselect #. Description #: ../templates:2002 +#, fuzzy +#| msgid "" +#| "RoundCube supports any web server supported by PHP, however only Apache " +#| "can be configured automatically." msgid "" -"RoundCube supports any web server supported by PHP, however only Apache can " -"be configured automatically." +"RoundCube supports any web server supported by PHP, however only Apache 2 " +"and lighttpd can be configured automatically." msgstr "" "RoundCube работает с любым веб-сервером, поддерживающим PHP, однако " "автоматическая настройка выполняется только для Apache." @@ -147,3 +139,12 @@ msgid "" msgstr "" "Однако, язык по умолчанию будет использован для выдачи приглашения к входу и " "во время первого подключения пользователя." + +#~ msgid "apache" +#~ msgstr "apache" + +#~ msgid "apache-ssl" +#~ msgstr "apache-ssl" + +#~ msgid "apache-perl" +#~ msgstr "apache-perl" diff --git a/debian/po/ta.po b/debian/po/ta.po index 85f394b..08a741d 100644 --- a/debian/po/ta.po +++ b/debian/po/ta.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: roundcube\n" -"Report-Msgid-Bugs-To: pkg-roundcube-maintainers@lists.alioth.debian.org\n" -"POT-Creation-Date: 2007-05-26 09:36+0200\n" +"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" +"POT-Creation-Date: 2008-03-05 22:12+0100\n" "PO-Revision-Date: 2007-06-10 13:35+0530\n" "Last-Translator: Dr.T.Vasudevan \n" "Language-Team: Tamil\n" @@ -18,26 +18,14 @@ msgstr "" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache" -msgstr "அபாசே" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-ssl" -msgstr "அபாசே-எஸ்எஸ்எல்" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-perl" -msgstr "அபாசே-பெர்ல்" +msgid "apache2" +msgstr "அபாசே2" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache2" -msgstr "அபாசே2" +msgid "lighttpd" +msgstr "" #. Type: multiselect #. Description @@ -48,9 +36,13 @@ msgstr "தானியங்கியாக வடிவமைக்க வல #. Type: multiselect #. Description #: ../templates:2002 +#, fuzzy +#| msgid "" +#| "RoundCube supports any web server supported by PHP, however only Apache " +#| "can be configured automatically." msgid "" -"RoundCube supports any web server supported by PHP, however only Apache can " -"be configured automatically." +"RoundCube supports any web server supported by PHP, however only Apache 2 " +"and lighttpd can be configured automatically." msgstr "" "ரவ்ண்ட்க்யூப் பிஹெச்பிஆல் ஆதரிக்கப்பட்ட எந்த வலை சேவையகத்தையும் ஆதரிக்கும். ஆயினுக்ம் அபாசே " "மட்டுமே தானியங்கியாக வடிவமைக்கப்பட முடியும்." @@ -141,3 +133,12 @@ msgid "" "first connection of users." msgstr "" "ஆயினும் உள்நுழைவின் போதும் முதல் பயனர் இணைப்பின் போதும் முன்னிருப்பு மொழியே பயன் படும்." + +#~ msgid "apache" +#~ msgstr "அபாசே" + +#~ msgid "apache-ssl" +#~ msgstr "அபாசே-எஸ்எஸ்எல்" + +#~ msgid "apache-perl" +#~ msgstr "அபாசே-பெர்ல்" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index b6de010..42e4789 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: pkg-roundcube-maintainers@lists.alioth.debian.org\n" -"POT-Creation-Date: 2007-05-26 09:36+0200\n" +"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" +"POT-Creation-Date: 2008-03-05 22:12+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,25 +19,13 @@ msgstr "" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache" -msgstr "" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-ssl" -msgstr "" - -#. Type: multiselect -#. Choices -#: ../templates:2001 -msgid "apache-perl" +msgid "apache2" msgstr "" #. Type: multiselect #. Choices #: ../templates:2001 -msgid "apache2" +msgid "lighttpd" msgstr "" #. Type: multiselect @@ -50,8 +38,8 @@ msgstr "" #. Description #: ../templates:2002 msgid "" -"RoundCube supports any web server supported by PHP, however only Apache can " -"be configured automatically." +"RoundCube supports any web server supported by PHP, however only Apache 2 " +"and lighttpd can be configured automatically." msgstr "" #. Type: multiselect diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst index 33d6912..fe3094f 100644 --- a/debian/roundcube-core.postinst +++ b/debian/roundcube-core.postinst @@ -17,6 +17,25 @@ dbc_dbname=roundcube dbc_go roundcube $@ +lighttpd_install() { + if [ ! -f /etc/lighttpd/conf-available/50-roundcube.conf ] ; then + if [ ! -x /usr/sbin/lighty-enable-mod ] ; then + echo "Lighttpd not installed, skipping" + else + ln -s /etc/roundcube/lighttpd.conf /etc/lighttpd/conf-available/50-roundcube.conf + /usr/sbin/lighty-enable-mod roundcube + fi + fi +} + +apache_install() { + webserver=$1 + if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/roundcube ]; then + ln -s /etc/roundcube/apache.conf /etc/$webserver/conf.d/roundcube + fi +} + + case "$1" in configure) @@ -117,11 +136,12 @@ EOF for webserver in $webservers; do webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_install + else + apache_install $webserver + fi test -x /usr/sbin/$webserver || continue - - if [ ! -f /etc/$webserver/conf.d/roundcube ] && [ ! -h /etc/$webserver/conf.d/roundcube ]; then - ln -s /etc/roundcube/apache.conf /etc/$webserver/conf.d/roundcube - fi restart="$restart $webserver" done diff --git a/debian/roundcube-core.postrm b/debian/roundcube-core.postrm index 9159d97..ae7bbd9 100644 --- a/debian/roundcube-core.postrm +++ b/debian/roundcube-core.postrm @@ -13,6 +13,29 @@ if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then dbc_go roundcube $@ fi +lighttpd_remove() { + if [ -f /etc/lighttpd/conf-available/50-roundcube.conf ] ; then + rm -f /etc/lighttpd/conf-available/50-roundcube.conf + if [ ! -x /usr/sbin/lighty-disable-mod ] ; then + echo "Lighttpd not installed, skipping" + else + /usr/sbin/lighty-disable-mod roundcube + fi + # See bug #448682 + if [ -h /etc/lighttpd/conf-enabled/50-roundcube.conf ] ; then + echo 'Manually deleting lighttpd/roundcube configuration link' + rm /etc/lighttpd/conf-enabled/50-roundcube.conf + fi + fi +} + +apache_remove() { + if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/roundcube ]; then + rm -f /etc/$webserver/conf.d/roundcube + fi +} + + case "$1" in upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; @@ -28,14 +51,20 @@ case "$1" in webserver=${webserver%,} case "$webserver" in - apache|apache-perl|apache-ssl|apache2) - rm -f /etc/$webserver/conf.d/roundcube - test -x /usr/sbin/$webserver || continue - restart="$restart $webserver" - ;; + apache*) + apache_remove $webserver + ;; + lighttpd) + lighttpd_remove + ;; *) + echo "Unknown webserver $webserver" ;; esac + + test -x /usr/sbin/$webserver || continue + restart="$restart $webserver" + done db_get roundcube/restart-webserver diff --git a/debian/rules b/debian/rules index 4c71ac6..e60c4ad 100755 --- a/debian/rules +++ b/debian/rules @@ -28,6 +28,8 @@ binary-install/roundcube-core:: install -m 0644 $(CURDIR)/SQL/sqlite.update.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/sqlite/0.1~rc1~dfsg-1 # Some files are executable while not being scripts or binary... find $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/localization -type f -print0 | xargs -0 chmod -x + # Remove useless file + rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/lib/magic # Remove files shipped in tinymce package rm -rf $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/js/tiny_mce dh_link -proundcube-core usr/share/tinymce/www usr/share/roundcube/program/js/tiny_mce diff --git a/debian/templates b/debian/templates index 30c0100..fb0b9f0 100644 --- a/debian/templates +++ b/debian/templates @@ -9,11 +9,11 @@ Template: roundcube/reconfigure-webserver Type: multiselect -__Choices: apache, apache-ssl, apache-perl, apache2 -Default: apache, apache-ssl, apache-perl, apache2 +__Choices: apache2, lighttpd +Default: apache2, lighttpd _Description: Web server(s) to configure automatically: RoundCube supports any web server supported by PHP, however only - Apache can be configured automatically. + Apache 2 and lighttpd can be configured automatically. . Please select the web server(s) that should be configured automatically for RoundCube. diff --git a/debian/watch b/debian/watch index 0423c51..b8625fd 100644 --- a/debian/watch +++ b/debian/watch @@ -1,5 +1,2 @@ -# Compulsory line, this is a version 3 file version=3 - -# Uncomment to find new files on sourceforge, for debscripts >= 2.9 -opts=dversionmangle=s/~/-/g;s/$/-dep/ http://sf.net/roundcubemail/roundcubemail-([\d\.]+.*)\.tar\.gz +opts="uversionmangle=s/-rc/~rc/" http://sf.net/roundcubemail/roundcubemail-([\d\.]+.*)-dep\.tar\.gz