]> git.donarmstrong.com Git - roundcube.git/commitdiff
Imported Debian patch 0.3.1-4
authorVincent Bernat <bernat@debian.org>
Sat, 17 Jul 2010 15:23:30 +0000 (17:23 +0200)
committerJérémy Bobbio <lunar@debian.org>
Sat, 18 Jun 2011 18:38:45 +0000 (20:38 +0200)
34 files changed:
debian/changelog
debian/control
debian/control.in
debian/patches/changeset_r3170.patch
debian/patches/changeset_r3202.patch
debian/patches/correct-magic-path.patch
debian/patches/correct_install_path.patch
debian/patches/dbconfig-common_support.patch
debian/patches/default-charset-utf8.patch [new file with mode: 0644]
debian/patches/disable-dns-prefetch.patch
debian/patches/dont-limit-email-local-part.patch
debian/patches/loginbox-size.patch
debian/patches/series
debian/patches/use_packaged_tinymce.patch
debian/patches/use_pspell.patch
debian/po/ar.po
debian/po/cs.po
debian/po/de.po
debian/po/es.po
debian/po/eu.po
debian/po/fi.po
debian/po/fr.po
debian/po/gl.po
debian/po/it.po
debian/po/ja.po
debian/po/pt.po
debian/po/pt_BR.po [new file with mode: 0644]
debian/po/ru.po
debian/po/sk.po
debian/po/sv.po
debian/po/ta.po
debian/roundcube-core.README.Debian
debian/rules
debian/source/format [new file with mode: 0644]

index 897699faffa5df8acbe81fe7d6e6e70ef6729558..c286dbd1982a7ea8d5068dc6faafcebfaf61068e 100644 (file)
@@ -1,3 +1,21 @@
+roundcube (0.3.1-4) unstable; urgency=low
+
+  * Update README.Debian to state that the variable to modify is
+    'htmleditor' instead of 'enable_htmleditor'. Thanks to Hans
+    Spaans. Closes: #575556.
+  * Add Brazilian Portuguese debconf translation, thanks to Eder
+    L. Marques. Closes: #581745.
+  * Switch default encoding to UTF-8 instead of ISO-8859-1.
+    Closes: #588084.
+  * Add more explanations on how to install roundcube in a Debian system
+    in README.Debian. Closes: #584458, #582894.
+  * Bump Standards-Version. No changes required.
+  * Switch to 3.0 (quilt) format.
+  * Use Breaks instead of Conflicts to move files from older roundcube
+    installations.
+
+ -- Vincent Bernat <bernat@debian.org>  Sat, 17 Jul 2010 17:23:30 +0200
+
 roundcube (0.3.1-3) unstable; urgency=high
 
   * RFC 5321, section 4.5.3.1, asks to not impose any limits on length if
index bb592d6044aa4523979f9e55e80dbf9612b0c3df..bc79c1a78ec4380b463244136262bbc0827cdaca 100644 (file)
@@ -3,9 +3,9 @@ Section: web
 Priority: extra
 Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth.debian.org>
 Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), po-debconf
+Build-Depends: cdbs, debhelper (>= 5), cdbs (>= 0.4.27), po-debconf
 Homepage: http://www.roundcube.net/
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-roundcube/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/trunk/
 
@@ -14,7 +14,7 @@ Architecture: all
 Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1, php5-pspell, libjs-jquery (>= 1.3.3)
 Suggests: php-auth-sasl
 Replaces: roundcube
-Conflicts: roundcube (<< 0.1~rc2-2)
+Breaks: roundcube (<< 0.1~rc2-2)
 Description: skinnable AJAX based webmail solution for IMAP servers
  RoundCube Webmail is a browser-based multilingual IMAP client with an
  application-like user interface. It provides full functionality
index a00682906ccf9acb8f2b250b275d30238527126b..a0772fec74c7f683ef7aac05cb699e9b49dace98 100644 (file)
@@ -5,7 +5,7 @@ Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth
 Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>
 Build-Depends: @cdbs@, po-debconf
 Homepage: http://www.roundcube.net/
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-roundcube/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/trunk/
 
@@ -14,7 +14,7 @@ Architecture: all
 Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1, php5-pspell, libjs-jquery (>= 1.3.3)
 Suggests: php-auth-sasl
 Replaces: roundcube
-Conflicts: roundcube (<< 0.1~rc2-2)
+Breaks: roundcube (<< 0.1~rc2-2)
 Description: skinnable AJAX based webmail solution for IMAP servers
  RoundCube Webmail is a browser-based multilingual IMAP client with an
  application-like user interface. It provides full functionality
index f820edcd32ad4695b80e3e77151a95a7316d8c1c..962a62698eeabaeafd3924b6d4e2f517a97a8dc3 100644 (file)
 Use json_encode to ensure compatibility with JQuery 1.4.\r
 \r
-Index: roundcubemail/program/include/rcube_template.php\r
-===================================================================\r
---- roundcubemail/program/include/rcube_template.php (revision 2980)\r
-+++ roundcubemail/program/include/rcube_template.php (revision 3170)\r
-@@ -415,10 +415,10 @@\r
-         $out = '';\r
-         if (!$this->framed && !empty($this->js_env)) {\r
--            $out .= JS_OBJECT_NAME . '.set_env('.json_serialize($this->js_env).");\n";\r
-+            $out .= JS_OBJECT_NAME . '.set_env('.json_encode($this->js_env).");\n";\r
-         }\r
-         foreach ($this->js_commands as $i => $args) {\r
-             $method = array_shift($args);\r
-             foreach ($args as $i => $arg) {\r
--                $args[$i] = json_serialize($arg);\r
-+                $args[$i] = json_encode($arg);\r
-             }\r
-             $parent = $this->framed || preg_match('/^parent\./', $method);\r
-Index: roundcubemail/program/include/rcube_shared.inc\r
-===================================================================\r
---- roundcubemail/program/include/rcube_shared.inc (revision 3132)\r
-+++ roundcubemail/program/include/rcube_shared.inc (revision 3170)\r
-@@ -106,95 +106,4 @@\r
-     exit;\r
-     }\r
--}\r
--\r
--\r
--/**\r
-- * Returns whether an $str is a reserved word for any of the version of Javascript or ECMAScript\r
-- * @param str String to check\r
-- * @return boolean True if $str is a reserver word, False if not\r
-- */\r
--function is_js_reserved_word($str)\r
--{\r
--  return in_array($str, array(\r
--    // ECMASript ver 4 reserved words\r
--    'as','break','case','catch','class','const','continue',\r
--    'default','delete','do','else','export','extends','false','finally','for','function',\r
--    'if','import','in','instanceof','is','namespace','new','null','package','private',\r
--    'public','return','super','switch','this','throw','true','try','typeof','use','var',\r
--    'void','while','with',\r
--    // ECMAScript ver 4 future reserved words\r
--    'abstract','debugger','enum','goto','implements','interface','native','protected',\r
--    'synchronized','throws','transient','volatile',\r
--    // special meaning in some contexts\r
--    'get','set',\r
--    // were reserved in ECMAScript ver 3\r
--    'boolean','byte','char','double','final','float','int','long','short','static'\r
--  ));\r
--}\r
--\r
--\r
--/**\r
-- * Convert a variable into a javascript object notation\r
-- *\r
-- * @param mixed Input value\r
-- * @return string Serialized JSON string\r
-- */\r
--function json_serialize($var)\r
--{\r
--  if (is_object($var))\r
--    $var = get_object_vars($var);\r
--\r
--  if (is_array($var))\r
--  {\r
--    // empty array\r
--    if (!sizeof($var))\r
--      return '[]';\r
--    else\r
--    {\r
--      $keys_arr = array_keys($var);\r
--      $is_assoc = $have_numeric = 0;\r
--\r
--      for ($i=0; $i<sizeof($keys_arr); ++$i)\r
--      {\r
--        if (is_numeric($keys_arr[$i]))\r
--          $have_numeric = 1;\r
--        if (!is_numeric($keys_arr[$i]) || $keys_arr[$i] != $i)\r
--          $is_assoc = 1;\r
--        if ($is_assoc && $have_numeric)\r
--          break;\r
--      }\r
--      \r
--      $brackets = $is_assoc ? '{}' : '[]';\r
--      $pairs = array();\r
--\r
--      foreach ($var as $key => $value)\r
--      {\r
--        // enclose key with quotes if it is not variable-name conform\r
--        if (!preg_match('/^[_a-zA-Z]{1}[_a-zA-Z0-9]*$/', $key) || is_js_reserved_word($key))\r
--          $key = "'$key'";\r
--\r
--        $pairs[] = sprintf("%s%s", $is_assoc ? "$key:" : '', json_serialize($value));\r
--      }\r
--\r
--      return $brackets{0} . implode(',', $pairs) . $brackets{1};\r
--    }\r
--  }\r
--  else if (!is_string($var) && strval(intval($var)) === strval($var))\r
--    return $var;\r
--  else if (is_bool($var))\r
--    return $var ? '1' : '0';\r
--  else\r
--    return "'".JQ($var)."'";\r
--}\r
--\r
--\r
--/**\r
-- * Function to convert an array to a javascript array\r
-- * Actually an alias function for json_serialize()\r
-- * @deprecated\r
-- */\r
--function array2js($arr, $type='')\r
--{\r
--  return json_serialize($arr);\r
- }\r
\r
-Index: roundcubemail/program/include/rcube_json_output.php\r
-===================================================================\r
---- roundcubemail/program/include/rcube_json_output.php (revision 2905)\r
-+++ roundcubemail/program/include/rcube_json_output.php (revision 3170)\r
-@@ -240,5 +240,5 @@\r
-           $response['callbacks'] = $this->callbacks;\r
\r
--        echo json_serialize($response);\r
-+        echo json_encode($response);\r
-     }\r
-     \r
-@@ -256,5 +256,5 @@\r
-             $method = array_shift($args);\r
-             foreach ($args as $i => $arg) {\r
--                $args[$i] = json_serialize($arg);\r
-+                $args[$i] = json_encode($arg);\r
-             }\r
\r
-Index: roundcubemail/program/steps/mail/func.inc\r
-===================================================================\r
---- roundcubemail/program/steps/mail/func.inc (revision 3099)\r
-+++ roundcubemail/program/steps/mail/func.inc (revision 3170)\r
-@@ -523,5 +523,5 @@\r
-   if (is_array($quota)) {\r
-     $OUTPUT->add_script('$(document).ready(function(){\r
--      rcmail.set_quota('.json_serialize($quota).')});', 'foot');\r
-+      rcmail.set_quota('.json_encode($quota).')});', 'foot');\r
-     $quota = '';\r
-     }\r
-Index: roundcubemail/program/steps/mail/compose.inc\r
-===================================================================\r
---- roundcubemail/program/steps/mail/compose.inc (revision 3166)\r
-+++ roundcubemail/program/steps/mail/compose.inc (revision 3170)\r
-@@ -507,5 +507,5 @@\r
-       JQ(Q(rcube_label('revertto'))),\r
-       JQ(Q(rcube_label('nospellerrors'))),\r
--      json_serialize($spellcheck_langs),\r
-+      json_encode($spellcheck_langs),\r
-       $lang,\r
-       $attrib['id'],\r
+Index: b/program/include/rcube_json_output.php
+===================================================================
+--- a/program/include/rcube_json_output.php    2009-09-01 17:13:45.000000000 +0200
++++ b/program/include/rcube_json_output.php    2010-07-17 17:33:24.000000000 +0200
+@@ -239,7 +239,7 @@
+         if (!empty($this->callbacks))
+           $response['callbacks'] = $this->callbacks;
+-        echo json_serialize($response);
++        echo json_encode($response);
+     }
+     
+     
+@@ -255,7 +255,7 @@
+         foreach ($this->commands as $i => $args) {
+             $method = array_shift($args);
+             foreach ($args as $i => $arg) {
+-                $args[$i] = json_serialize($arg);
++                $args[$i] = json_encode($arg);
+             }
+             $out .= sprintf(
+Index: b/program/include/rcube_shared.inc
+===================================================================
+--- a/program/include/rcube_shared.inc 2009-10-27 10:43:39.000000000 +0100
++++ b/program/include/rcube_shared.inc 2010-07-17 17:33:24.000000000 +0200
+@@ -109,97 +109,6 @@
+ /**
+- * Returns whether an $str is a reserved word for any of the version of Javascript or ECMAScript
+- * @param str String to check
+- * @return boolean True if $str is a reserver word, False if not
+- */
+-function is_js_reserved_word($str)
+-{
+-  return in_array($str, array(
+-    // ECMASript ver 4 reserved words
+-    'as','break','case','catch','class','const','continue',
+-    'default','delete','do','else','export','extends','false','finally','for','function',
+-    'if','import','in','instanceof','is','namespace','new','null','package','private',
+-    'public','return','super','switch','this','throw','true','try','typeof','use','var',
+-    'void','while','with',
+-    // ECMAScript ver 4 future reserved words
+-    'abstract','debugger','enum','goto','implements','interface','native','protected',
+-    'synchronized','throws','transient','volatile',
+-    // special meaning in some contexts
+-    'get','set',
+-    // were reserved in ECMAScript ver 3
+-    'boolean','byte','char','double','final','float','int','long','short','static'
+-  ));
+-}
+-
+-
+-/**
+- * Convert a variable into a javascript object notation
+- *
+- * @param mixed Input value
+- * @return string Serialized JSON string
+- */
+-function json_serialize($var)
+-{
+-  if (is_object($var))
+-    $var = get_object_vars($var);
+-
+-  if (is_array($var))
+-  {
+-    // empty array
+-    if (!sizeof($var))
+-      return '[]';
+-    else
+-    {
+-      $keys_arr = array_keys($var);
+-      $is_assoc = $have_numeric = 0;
+-
+-      for ($i=0; $i<sizeof($keys_arr); ++$i)
+-      {
+-        if (is_numeric($keys_arr[$i]))
+-          $have_numeric = 1;
+-        if (!is_numeric($keys_arr[$i]) || $keys_arr[$i] != $i)
+-          $is_assoc = 1;
+-        if ($is_assoc && $have_numeric)
+-          break;
+-      }
+-      
+-      $brackets = $is_assoc ? '{}' : '[]';
+-      $pairs = array();
+-
+-      foreach ($var as $key => $value)
+-      {
+-        // enclose key with quotes if it is not variable-name conform
+-        if (!preg_match('/^[_a-zA-Z]{1}[_a-zA-Z0-9]*$/', $key) || is_js_reserved_word($key))
+-          $key = "'$key'";
+-
+-        $pairs[] = sprintf("%s%s", $is_assoc ? "$key:" : '', json_serialize($value));
+-      }
+-
+-      return $brackets{0} . implode(',', $pairs) . $brackets{1};
+-    }
+-  }
+-  else if (!is_string($var) && strval(intval($var)) === strval($var))
+-    return $var;
+-  else if (is_bool($var))
+-    return $var ? '1' : '0';
+-  else
+-    return "'".JQ($var)."'";
+-}
+-
+-
+-/**
+- * Function to convert an array to a javascript array
+- * Actually an alias function for json_serialize()
+- * @deprecated
+- */
+-function array2js($arr, $type='')
+-{
+-  return json_serialize($arr);
+-}
+-
+-
+-/**
+  * Similar function as in_array() but case-insensitive
+  *
+  * @param mixed Needle value
+Index: b/program/include/rcube_template.php
+===================================================================
+--- a/program/include/rcube_template.php       2009-09-22 20:08:45.000000000 +0200
++++ b/program/include/rcube_template.php       2010-07-17 17:33:24.000000000 +0200
+@@ -414,12 +414,12 @@
+     {
+         $out = '';
+         if (!$this->framed && !empty($this->js_env)) {
+-            $out .= JS_OBJECT_NAME . '.set_env('.json_serialize($this->js_env).");\n";
++            $out .= JS_OBJECT_NAME . '.set_env('.json_encode($this->js_env).");\n";
+         }
+         foreach ($this->js_commands as $i => $args) {
+             $method = array_shift($args);
+             foreach ($args as $i => $arg) {
+-                $args[$i] = json_serialize($arg);
++                $args[$i] = json_encode($arg);
+             }
+             $parent = $this->framed || preg_match('/^parent\./', $method);
+             $out .= sprintf(
+Index: b/program/steps/mail/compose.inc
+===================================================================
+--- a/program/steps/mail/compose.inc   2009-10-06 08:55:08.000000000 +0200
++++ b/program/steps/mail/compose.inc   2010-07-17 17:33:24.000000000 +0200
+@@ -493,7 +493,7 @@
+       JQ(Q(rcube_label('close'))),
+       JQ(Q(rcube_label('revertto'))),
+       JQ(Q(rcube_label('nospellerrors'))),
+-      json_serialize($spellcheck_langs),
++      json_encode($spellcheck_langs),
+       $lang,
+       $attrib['id'],
+       JS_OBJECT_NAME), 'foot');
+Index: b/program/steps/mail/func.inc
+===================================================================
+--- a/program/steps/mail/func.inc      2009-10-24 21:09:23.000000000 +0200
++++ b/program/steps/mail/func.inc      2010-07-17 17:33:24.000000000 +0200
+@@ -522,7 +522,7 @@
+   
+   if (is_array($quota)) {
+     $OUTPUT->add_script('$(document).ready(function(){
+-      rcmail.set_quota('.json_serialize($quota).')});', 'foot');
++      rcmail.set_quota('.json_encode($quota).')});', 'foot');
+     $quota = '';
+     }
+   
index 645734beb28dc823301c6438653ab8c2032ff520..5b889ee0d07665ce88f3f9c136aa0ce6270af327 100644 (file)
@@ -1,12 +1,14 @@
 Compatibility with jQuery 1.4.\r
 \r
-Index: roundcubemail/program/include/rcube_json_output.php\r
-===================================================================\r
---- roundcubemail/program/include/rcube_json_output.php (revision 3175)\r
-+++ roundcubemail/program/include/rcube_json_output.php (revision 3202)\r
-@@ -219,5 +219,4 @@\r
-             send_nocacheing_headers();\r
-             header('Content-Type: text/plain; charset=' . $this->get_charset());\r
--            print '/** ajax response ['.date('d/M/Y h:i:s O')."] **/\n";\r
-         }\r
\r
+Index: b/program/include/rcube_json_output.php
+===================================================================
+--- a/program/include/rcube_json_output.php    2010-07-17 17:33:24.000000000 +0200
++++ b/program/include/rcube_json_output.php    2010-07-17 17:33:24.000000000 +0200
+@@ -218,7 +218,6 @@
+             $s_header_sent = true;
+             send_nocacheing_headers();
+             header('Content-Type: text/plain; charset=' . $this->get_charset());
+-            print '/** ajax response ['.date('d/M/Y h:i:s O')."] **/\n";
+         }
+         // unset default env vars
index de9330f217e418d01c34fcaaa9ca7955d7ada2e9..e2ca99fa8e487826ab1a94c92956a8fad8504033 100644 (file)
@@ -1,13 +1,15 @@
 On Debian, the magic file is in /usr/share/file/magic.
 
---- 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 @@
+Index: b/config/main.inc.php.dist
+===================================================================
+--- a/config/main.inc.php.dist 2009-10-21 10:47:40.000000000 +0200
++++ b/config/main.inc.php.dist 2010-07-17 17:33:23.000000000 +0200
+@@ -338,7 +338,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
- ?>
+ // default sort col
+ $rcmail_config['message_sort_col'] = 'date';
index b8e6daa45abcec466b34ac85a7ecabf65bf0df84..04ec738a1c854a90511b0e9d39611721e8bb9750 100644 (file)
@@ -1,7 +1,9 @@
 Install path is /var/lib/roundcube for Debian. Don't try to guess it.
 
---- a/program/include/iniset.php~      2008-06-09 22:57:53.000000000 +0200
-+++ a/program/include/iniset.php       2008-06-22 12:10:55.000000000 +0200
+Index: b/program/include/iniset.php
+===================================================================
+--- a/program/include/iniset.php       2010-07-17 17:33:04.000000000 +0200
++++ b/program/include/iniset.php       2010-07-17 17:33:23.000000000 +0200
 @@ -27,7 +27,7 @@
  define('JS_OBJECT_NAME', 'rcmail');
  
@@ -10,4 +12,4 @@ Install path is /var/lib/roundcube for Debian. Don't try to guess it.
 +  define('INSTALL_PATH', '/var/lib/roundcube/');
  }
  
- // make sure path_separator is defined
+ define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
index 61938fa841b027cb52fb7fc58f8320c1fdd7b95b..fbc2c0e0589e2a9db3b834f00551050d98268c60 100644 (file)
@@ -1,22 +1,23 @@
 The default db.inc.php is modified to adapt it to the use of dbconfig-common package.
 
---- roundcube_0.1~beta2.2/config/db.inc.php.dist        2006-03-20 23:08:51.000000000 +0100
-+++ roundcube_0.1~beta2.2/config/db.inc.php.dist  2007-03-13 14:33:38.000000000 +0100
+Index: b/config/db.inc.php.dist
+===================================================================
+--- a/config/db.inc.php.dist   2010-07-17 17:33:04.000000000 +0200
++++ b/config/db.inc.php.dist   2010-07-17 17:33:23.000000000 +0200
 @@ -14,15 +14,20 @@
-
  $rcmail_config = array();
-
 -// PEAR database DSN for read/write operations
 -// format is db_provider://user:password@host/database 
 -// For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php
 -// currently supported db_providers: mysql, mysqli, pgsql, sqlite, mssql
--
++/* Do not set db_dsnw here, use dpkg-reconfigure roundcube to configure database ! */
 -$rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail';
 -// postgres example: 'pgsql://roundcube:pass@localhost/roundcubemail';
 -// Warning: for SQLite use absolute path in DSN:
 -// sqlite example: 'sqlite:////full/path/to/sqlite.db?mode=0646';
-+/* Do not set db_dsnw here, use dpkg-reconfigure roundcube to configure database ! */
-+
 +include_once("/etc/roundcube/debian-db.php");
 +
 +switch ($dbtype) {
@@ -29,6 +30,6 @@ The default db.inc.php is modified to adapt it to the use of dbconfig-common pac
 +   $rcmail_config['db_dsnw'] = "$dbtype://$dbuser:$dbpass@$dbserver$dbport/$dbname";
 +   break;
 + }
-
  // PEAR database DSN for read only operations (if empty write database will be used)
  // useful for database replication
diff --git a/debian/patches/default-charset-utf8.patch b/debian/patches/default-charset-utf8.patch
new file mode 100644 (file)
index 0000000..24c3ea5
--- /dev/null
@@ -0,0 +1,15 @@
+Switch to UTF-8 as default charset
+
+Index: b/config/main.inc.php.dist
+===================================================================
+--- a/config/main.inc.php.dist 2010-07-17 17:33:24.000000000 +0200
++++ b/config/main.inc.php.dist 2010-07-17 17:33:25.000000000 +0200
+@@ -215,7 +215,7 @@
+ $rcmail_config['mdn_requests'] = 0;
+ // Use this charset as fallback for message decoding
+-$rcmail_config['default_charset'] = 'ISO-8859-1';
++$rcmail_config['default_charset'] = 'UTF-8';
+ // Make use of the built-in spell checker. It is based on GoogieSpell.
+ // Since Google only accepts connections over https your PHP installatation
index 450145fb77ea4d2cb21188cc137d711865d2128c..6f6c6d8e14c7d85d4f03e41ea79ee9b159ecbeed 100644 (file)
@@ -1,9 +1,9 @@
 Disable DNS prefetching to solve CVE-2010-0464.
 
-Index: program/include/rcube_html_page.php
+Index: b/program/include/rcube_html_page.php
 ===================================================================
---- rcube/program/include/rcube_html_page.php  (revision 3214)
-+++ rcube/program/include/rcube_html_page.php  (working copy)
+--- a/program/include/rcube_html_page.php      2009-06-22 18:20:34.000000000 +0200
++++ b/program/include/rcube_html_page.php      2010-07-17 17:33:25.000000000 +0200
 @@ -165,6 +165,13 @@
              $__page_header.= $this->charset . '" />'."\n";
          }
index c9852aa2dd37158a0cdb22bc014da5cfea74a162..27cb519066147010e6ff93bb65ff6a9c0cfc58ef 100644 (file)
@@ -1,6 +1,8 @@
 To fix #568360 and #568537, don't limit local part size.
---- roundcube-0.3.1/program/include/main.inc~  2009-10-31 14:44:19.751802878 +0100
-+++ roundcube-0.3.1/program/include/main.inc   2010-02-05 19:46:12.000000000 +0100
+Index: b/program/include/main.inc
+===================================================================
+--- a/program/include/main.inc 2009-10-31 14:44:19.000000000 +0100
++++ b/program/include/main.inc 2010-07-17 17:33:25.000000000 +0200
 @@ -1427,7 +1427,7 @@
      return false;
  
index 7e04ce5c31922ae845b4cbcf8a874993211a1bf0..ce56b9f1d9f89ca36d76eced5d9581ccee72c3db 100644 (file)
@@ -1,8 +1,10 @@
 Fix size of login box to accommodate sk_SK locale
 
---- r/skins/default/common.css~        2009-09-04 12:42:24.000000000 +0200
-+++ r/skins/default/common.css 2009-09-27 11:27:25.000000000 +0200
-@@ -494,7 +494,7 @@
+Index: b/skins/default/common.css
+===================================================================
+--- a/skins/default/common.css 2009-10-06 12:00:33.000000000 +0200
++++ b/skins/default/common.css 2010-07-17 17:33:24.000000000 +0200
+@@ -506,7 +506,7 @@
    margin-left: auto;
    margin-right: auto;
    margin-top: 50px;
index b76ac529f3ff582f07ab1ddb5bdbac1d607b308c..dae62da635ebe7eb0209062895a60ce439a8a197 100644 (file)
@@ -8,3 +8,4 @@ changeset_r3170.patch
 changeset_r3202.patch
 dont-limit-email-local-part.patch
 disable-dns-prefetch.patch
+default-charset-utf8.patch
index f2a7a91b4b6f455476c66b88a8c853b48c8cd91e..a498c599608b568ccaf0bf5f296aad89da98a285 100644 (file)
@@ -1,8 +1,10 @@
 Use tinymce from tinycme package instead of the shipped one.
 
---- roundcube-0.1~rc2.orig/program/steps/mail/sendmail.inc     2007-11-26 11:42:36.000000000 +0100
-+++ roundcube-0.1~rc2/program/steps/mail/sendmail.inc  2007-11-26 11:44:04.000000000 +0100
-@@ -123,7 +123,7 @@
+Index: b/program/steps/mail/sendmail.inc
+===================================================================
+--- a/program/steps/mail/sendmail.inc  2009-10-14 12:52:27.000000000 +0200
++++ b/program/steps/mail/sendmail.inc  2010-07-17 17:33:23.000000000 +0200
+@@ -128,7 +128,7 @@
  
          // sanitize image name so resulting attachment doesn't leave images dir
          $image_name = preg_replace('/[^a-zA-Z0-9_\.\-]/i', '', $image_name);
index 843097df77c2e957c1b19f06b7bb29ce47046cf4..d3ade031ee4ce024aba4f7d797f614214976d216 100644 (file)
@@ -1,8 +1,10 @@
 Instead of using Google by default, we use pspell to avoid to send each mail to Google...
 
---- roundcube-0.1/config/main.inc.php.dist~    2009-05-15 12:22:29.000000000 +0200
-+++ roundcube-0.1/config/main.inc.php.dist     2009-07-05 09:59:26.000000000 +0200
-@@ -199,7 +199,7 @@
+Index: b/config/main.inc.php.dist
+===================================================================
+--- a/config/main.inc.php.dist 2010-07-17 17:33:23.000000000 +0200
++++ b/config/main.inc.php.dist 2010-07-17 17:33:24.000000000 +0200
+@@ -224,7 +224,7 @@
  
  // Set the spell checking engine. 'googie' is the default. 'pspell' is also available,
  // but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here.
index 03c7102f933bbfba5db56b96c2b8d39b6202a0c9..45403105e77c73feaf448e1fd436470dcdddf11b 100644 (file)
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2008-03-18 15:29+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
index 3e23c4547487b45270aa1d5b6b33cea2c0522c95..0349a9f29fd4eac5553f77b40de1d18fb4281a4a 100644 (file)
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2009-09-13 09:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
index 8871f95e7f0629a08c601f50a8201af6905c79bf..c0d09fd523f288bf2ca0db336c86b0ef60b87bf3 100644 (file)
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2009-03-16 21:15+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
index 7f903a895bb87c971a9034c9c36ab9a30d74f237..cd7109947b14db0141abc0a1d494cce8b702d550 100644 (file)
@@ -35,6 +35,7 @@ msgstr ""
 "PO-Revision-Date: 2008-04-01 18:21+0200\n"
 "Last-Translator: Carlos Galisteo <cgalisteo@k-rolus.net>\n"
 "Language-Team: Debian l10n Spanishf <debian-l10n-spanish@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
index 3998bd37f15302d3287c960dad538719ae047be4..68a01cd2db3c52bbce73d040e10b130559a76fab 100644 (file)
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2008-03-14 09:03+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <Librezale@librezale.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
index 3bb5e86c059234ea9d2c6b1a68d28df1b441b0b9..5b0a4fa74e7684719373dcb2195ce9454cde3853 100644 (file)
@@ -6,6 +6,7 @@ msgstr ""
 "PO-Revision-Date: 2008-03-08 00:45+0200\n"
 "Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
index 01a094c6f8502179b5c10de46ac58649705ff0e0..30cfe6cb7d40f3ba0d75d120c2b62e12329244f7 100644 (file)
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2008-03-08 11:24+0100\n"
 "Last-Translator: Vincent Bernat <bernat@luffy.cx>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
index f4d8d88dff31fff83069796ad6bdb5ccaa924b8c..e317834b0b314300584ba93a50d5747c9f6b5a25 100644 (file)
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2008-03-07 16:27+0000\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
index 922fc921b780a886c654fca3a3981f09398d24df..0af6c09b9530791f0fc48081d1254449de117fe5 100644 (file)
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2009-08-30 12:09+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
index c2237658518a072d4399e02454cc289e4f7f7e5a..83c5c01dcd523ca39906c9d61023b7fb82b8415c 100644 (file)
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2009-03-06 06:26+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
index eb3b9b31b0aa8739d8ebdd91443f3699f3c240f4..bd0304abf3ee343d47f349660dc57bda42ffb45c 100644 (file)
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2008-03-09 14:12+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
new file mode 100644 (file)
index 0000000..af65c44
--- /dev/null
@@ -0,0 +1,139 @@
+# roundcube Brazilian Portuguese translation.
+# Copyright (C) 2009 roundcube's COPYRIGHT HOLDER
+# This file is distributed under the same license as the roundcube package.
+# Bruno Gurgel Gomes de Oliveira <bruno.gurgel@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: roundcube\n"
+"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n"
+"POT-Creation-Date: 2009-02-15 17:05+0100\n"
+"PO-Revision-Date: 2009-03-11 13:15+1200\n"
+"Last-Translator: Bruno Gurgel Gomes de Oliveira <bruno.gurgel@gmail.com>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"pt_BR utf-8\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 "Servidor(es) web para configurar automaticamente:"
+
+#. 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 ""
+"O RoundCube dá suporte a qualquer servidor web que tenha suporte a PHP, no "
+"entanto, somente o Apache2 e o lighttpd podem ser configurados "
+"automaticamente."
+
+#. Type: multiselect
+#. Description
+#: ../templates:2002
+msgid ""
+"Please select the web server(s) that should be configured automatically for "
+"RoundCube."
+msgstr ""
+"Por favor, selecione o(s) servidor(es) web que deve(m) ser configurado(s) "
+"automaticamente para o RoundCube."
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid "Should the webserver(s) be restarted now?"
+msgstr "O(s) servidor(es) web deve(m) ser reiniciado(s) agora?"
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid ""
+"In order to activate the new configuration, the reconfigured web server(s) "
+"have to be restarted."
+msgstr ""
+"Para ativar a nova configuração, o(s) servidor(es) web reconfigurado(s) deve"
+"(m) ser reiniciado(s)."
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid "IMAP server(s) used with RoundCube:"
+msgstr "Servidor(es) IMAP usado(s) pelo RoundCube:"
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid "Please select the IMAP server(s) that should be used with RoundCube."
+msgstr ""
+"Por favor, selecione o(s) servidor(es) IMAP que deve(m) ser usado(s) com o "
+"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 ""
+"Se isto for deixado em branco, uma caixa de texto será mostrada no login. "
+"Informando uma lista de hosts separados por espaço exibirá um menu suspenso. "
+"Informando um único host forçará o uso do mesmo."
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid ""
+"To use SSL connections, please enter host names as 'ssl://hostname:993'."
+msgstr ""
+"Para usar conexões SSL, por favor, informe os nomes de máquina como: 'ssl://"
+"nome-da-máquina:993'."
+
+#. Type: select
+#. Description
+#: ../templates:5001
+msgid "Default language:"
+msgstr "Idioma padrão:"
+
+#. Type: select
+#. Description
+#: ../templates:5001
+msgid "Please choose the default language for RoundCube."
+msgstr "Por favor, escolha o idioma padrão para o RoundCube."
+
+#. Type: select
+#. Description
+#: ../templates:5001
+msgid "This choice can be overridden by individual users in their preferences."
+msgstr ""
+"Esta escolha poderá ser sobrescrita por usuários em suas preferências "
+"individuais."
+
+#. Type: select
+#. Description
+#: ../templates:5001
+msgid ""
+"However, the default language will be used for the login screen and the "
+"first connection of users."
+msgstr ""
+"No entanto, o idioma padrão será usado para a tela de login e a primeira "
+"conexão dos usuários."
index 8f75ef2478f51955cdb5a253fbe70b71e1f88fa4..11a85f67784b1d493fdad2ec1ece8ce9691ecc21 100644 (file)
@@ -12,12 +12,13 @@ msgstr ""
 "PO-Revision-Date: 2009-05-15 21:20+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: multiselect
 #. Choices
index 3d5321ad48f7d441dc28051bc1e7127e6187b3f6..f9ca1d02d6d8bcbe664151093a88f3b0783b6fe5 100644 (file)
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2008-05-15 17:59+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
index cb5dfa2d27c102b047a02e1d427624b8c63c34e7..dde68623af54085cba2b0a2d1aeee06542d8f888 100644 (file)
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2009-02-23 01:41+0100\n"
 "Last-Translator: Martin Bagge <brother@bsnet.se>\n"
 "Language-Team: swedish <debian-l10n-swedish@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
index 38d6322bffd9c87368fd77d28ab6f6aca0c6e479..faec187e6bc9514700cd144b7e3d00d81f1d1ea8 100644 (file)
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2008-03-07 19:05+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
 "Language-Team: Tamil <ubuntu>\n"
+"Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
index ce57edd97e05bc97999da5448b58718e15ea5214..f38c6fd0a3abd13bc7be23288d084280f3fa2212 100644 (file)
@@ -1,11 +1,27 @@
+This package ships with configuration files for Apache and
+lighttpd. However, it is not possible to cover all cases and you still
+need to do some manual steps to adapt the installation to your site
+configuration.
+
+You can uncomment the Alias directives in
+`/etc/roundcube/apache.conf'. You can then access your roundcube
+installation under `/roundcube' in all virtual hosts. If you want to
+create a specific virtual host, just point DocumentRoot to
+`/var/lib/roundcube'.
+
+It is important to keep in mind that the root installation of
+roundcube is `/var/lib/roundcube' and not `/usr/share/roundcube'. You
+also need to keep the configuration file provided. Otherwise, your
+installation will be non functional and insecure.
+
 For better compatibility, the schema used for MySQL is the one
 targeted at MySQL 4.0, not the one for MySQL 4.1 or MySQL 5.x.
 
 To use tinymce editor:
- - set $rcmail_config['enable_htmleditor'] to TRUE in
+ - set $rcmail_config['htmleditor'] to TRUE in
    /etc/roundcube/main.inc.php
 
 No plugins are shipped (except core plugins) with this package of
 roundcube. Add your plugin in /var/lib/roundcube/plugins.
 
- -- Vincent Bernat <bernat@debian.org>, Sun, 27 Sep 2009 10:21:40 +0200
+ -- Vincent Bernat <bernat@debian.org>, Sat, 10 Jul 2010 18:19:35 +0200
index 9b7dccb4266a016d25e0e4a2ef2f0ab6f18cb18e..92d44a21ef4f992225bfbe47e0847fe989064256 100755 (executable)
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_INSTALL_CHANGELOGS_ALL=CHANGELOG
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)