From: Vincent Bernat Date: Tue, 20 May 2008 18:51:52 +0000 (+0200) Subject: Imported Debian patch 0.1.1-4 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cc0448429d5d9a1ad5dc162f34617e43c9c3be9d;p=roundcube.git Imported Debian patch 0.1.1-4 --- diff --git a/debian/changelog b/debian/changelog index c2f5c14..e2eb11a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +roundcube (0.1.1-4) unstable; urgency=low + + * Add Slovak debconf translation, thanks to Ivan Masár (Closes: #481376) + * Fix debian/copyright: + + RoundCube is GPL-2 licensed, not GPL-2+ + + Add an explanation on the BSD license present at the top of + index.php (Closes: #477119) + * We do not support tinymce 3, yet. Depends on tinymce2 | tinymce (<< + 3). Closes: #481145, #483053, #482295 + + -- Vincent Bernat Tue, 20 May 2008 20:51:52 +0200 + roundcube (0.1.1-3) unstable; urgency=low * Fix an error introduced when fixing bug #476803. Thanks to Micah diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf index 79e3d41..0ab1eb3 100644 --- a/debian/conf/apache.conf +++ b/debian/conf/apache.conf @@ -1,10 +1,10 @@ # Those aliases do not work properly with several hosts on your apache server # Uncomment them to use it or adapt them to your configuration -# Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ +# Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce2/www/ # Alias /roundcube /var/lib/roundcube -# Access to tinymce files - +# Access to tinymce2 files + Options Indexes MultiViews FollowSymLinks AllowOverride None Order allow,deny diff --git a/debian/conf/lighttpd.conf b/debian/conf/lighttpd.conf index d64b232..11e8d50 100644 --- a/debian/conf/lighttpd.conf +++ b/debian/conf/lighttpd.conf @@ -5,7 +5,7 @@ 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" + "/roundcube/program/js/tiny_mce" => "/usr/share/tinymce2/www" ) $HTTP["url"] =~ "^/roundcube" { diff --git a/debian/control b/debian/control index 41c9888..954b66e 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube Package: roundcube-core Architecture: all -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 (>= 1.5.0), ucf, tinymce, ${misc:Depends}, libmagic1 +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 (>= 1.5.0), ucf, tinymce2 | tinymce (<< 3), ${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 a6dae44..39a92cb 100644 --- a/debian/control.in +++ b/debian/control.in @@ -2,16 +2,16 @@ Source: roundcube Section: web Priority: extra Maintainer: Debian Roundcube Maintainers -Uploaders: Vincent Bernat , Romain Beauxis +Uploaders: Vincent Bernat , Romain Beauxis Build-Depends: @cdbs@, po-debconf Homepage: http://www.roundcube.net/ Standards-Version: 3.7.3 -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 | 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 +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 (>= 1.5.0), ucf, tinymce (<< 3), ${misc:Depends}, libmagic1 Replaces: roundcube Conflicts: roundcube (<< 0.1~rc2-2) Description: skinnable AJAX based webmail solution for IMAP servers diff --git a/debian/copyright b/debian/copyright index 82c322e..48995a5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,9 +7,14 @@ Copyright: 2005-2006, RoundCube Dev. - Switzerland License: GPL -RoundCube may be redistributed under the terms of the GNU GPL, -Version 2 or later, found on Debian systems in the file -/usr/share/common-licenses/GPL +RoundCube may be redistributed under the terms of the GNU GPL, Version +2, found on Debian systems in the file /usr/share/common-licenses/GPL + +The file index.php incorrectly states that it is BSD licensed. This +was a mistake and this was changed in SVN: + http://trac.roundcube.net/browser/trunk/roundcubemail/index.php +More info here: + http://lists.roundcube.net/mail-archive/dev/2008-05/0000015.html Some files are taken from other projects : - googiespell from amix@amix.dk, MIT license diff --git a/debian/po/sk.po b/debian/po/sk.po new file mode 100644 index 0000000..9d09b4a --- /dev/null +++ b/debian/po/sk.po @@ -0,0 +1,107 @@ +# Slovak translation of roundcube debconf template +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the roundcube package. +# Ivan Masár , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" +"POT-Creation-Date: 2008-03-05 22:12+0100\n" +"PO-Revision-Date: 2008-05-15 17:59+0100\n" +"Last-Translator: Ivan Masár \n" +"Language-Team: Slovak \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Choices +#: ../templates:2001 +msgid "apache2" +msgstr "apache2" + +#. Type: multiselect +#. Choices +#: ../templates:2001 +msgid "lighttpd" +msgstr "lighttpd" + +#. Type: multiselect +#. Description +#: ../templates:2002 +msgid "Web server(s) to configure automatically:" +msgstr "Nastaviť automaticky nasledovné webové servery:" + +#. Type: multiselect +#. Description +#: ../templates:2002 +msgid "RoundCube supports any web server supported by PHP, however only Apache 2 and lighttpd can be configured automatically." +msgstr "RoundCube podporuje akýkoľvek webový server, ktorý podporuje PHP, avšak iba Apache 2 a lighttpd je možné nastaviť automaticky." + +#. Type: multiselect +#. Description +#: ../templates:2002 +msgid "Please select the web server(s) that should be configured automatically for RoundCube." +msgstr "Prosím, vyberte, ktoré webové servery sa majú nastaviť automaticky pre RoundCube." + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Should the webserver(s) be restarted now?" +msgstr "Majú sa webové servery teraz reštartovať?" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "In order to activate the new configuration, the reconfigured web server(s) have to be restarted." +msgstr "Aby sa aktivovala nové konfigurácia, nastavené webové servery je potrebné reštartovať." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "IMAP server(s) used with RoundCube:" +msgstr "IMAP servery na použitie s RoundCube:" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Please select the IMAP server that should be used with RoundCube." +msgstr "Prosím, vyberte, ktorý IMAP server sa má použiť s RoundCube." + +#. 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 "Ak toto pole necháte prázdne, pri prihlásení sa zobrazí textové pole. Ak zadáte zoznam strojov oddelených čiarkami, zobrazí sa roletová ponuka. Ak zadáte jeden stroj, vynúti sa použitie tohto stroja." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "To use SSL connections, please enter host names as 'ssl://hostname:993'." +msgstr "Aby ste mohli používať SSL spojenia, zadajte prosím názvy strojov v tvare 'ssl://nazovstroja:993'." + +#. Type: select +#. Description +#: ../templates:5001 +msgid "Default language:" +msgstr "Štandardný jazyk:" + +#. Type: select +#. Description +#: ../templates:5001 +msgid "Please choose the default language for RoundCube." +msgstr "Prosím, vyberte štandardný jazyk rozhrania RoundCube." + +#. Type: select +#. Description +#: ../templates:5001 +msgid "This choice can be overridden by individual users in their preferences." +msgstr "Nastavenia jednotlivých používateľov majú prednosť pre touto voľbou." + +#. Type: select +#. Description +#: ../templates:5001 +msgid "However, the default language will be used for the login screen and the first connection of users." +msgstr "Avšak štandardný jazyk sa použije na prihlasovacej obrazovke a pri prvom prihlásení používateľa." + diff --git a/debian/roundcube-core.README.Debian b/debian/roundcube-core.README.Debian index 20edc78..f7735fd 100644 --- a/debian/roundcube-core.README.Debian +++ b/debian/roundcube-core.README.Debian @@ -5,7 +5,12 @@ To use tinymce editor: - set $rcmail_config['enable_htmleditor'] to TRUE in /etc/roundcube/main.inc.php +RoundCube needs tinymce 2. On recent Debian systems, this package is +provided by tinymce2 package. If you use tinymce package from etch, +you will need to check Apache or lighttpd configuration to adapt +paths. + The spellchecker is disabled since it is not present in tinymce Debian package. - -- Vincent Bernat , Fri, 7 Mar 2008 09:54:52 +0100 + -- Vincent Bernat , Tue, 20 May 2008 20:51:28 +0200