[pkg-horde] [SCM] Debian Horde Packages repository: horde3 package branch, upstream+patches, updated. 01f398053d80a451c83b70aa3a7498fedf807e21

[Mathieu Parent]

The following commit has been merged in the upstream+patches branch:
commit 01f398053d80a451c83b70aa3a7498fedf807e21
Merge: 1c7c93dde0c1cddfbc24644c8d15f696b63c6ce0 b283999a2236998d71833f4f13a681177fabb466
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sat Jan 7 10:50:51 2012 +0100

    Merge branch 'upstream' into upstream+patches

diff --combined config/conf.php.dist
index d67e17b,0db74f4..e17521b
--- a/config/conf.php.dist
+++ b/config/conf.php.dist
@@@ -1,7 -1,4 +1,7 @@@
  <?php
 +echo "Horde3 configuration disabled by default because the administration/install wizard gives the whole world too much access to the system. Read /usr/share/doc/horde3/README.Debian.gz on how to allow access.";
 +exit (0);
 +
  /**
   * Horde Configuration File
   *
@@@ -18,7 -15,7 +18,7 @@@
   * Integers should be given literally (without quotes).
   * Boolean values may be true or false (never quotes).
   *
-  * $Horde: horde/config/conf.php.dist,v 1.94.10.4 2008/10/03 00:19:58 chuck Exp $
+  * $Horde: horde/config/conf.php.dist,v 1.94.10.5 2010/09/27 15:58:28 jan Exp $
   */
  
  // Determines how we generate full URLs (for location headers and
@@@ -50,16 -47,19 +50,19 @@@ $conf['server']['port'] = $_SERVER['SER
  $conf['cookie']['domain'] = $_SERVER['SERVER_NAME'];
  
  // What path should we set cookies to? This should match where Horde
 -// is on your webserver - if it is at /horde, then this should be
 -// '/horde'. If Horde is installed as the document root, then this
 +// is on your webserver - if it is at /horde3, then this should be
 +// '/horde3'. If Horde is installed as the document root, then this
  // needs to be '/' - NOT ''.
  // ** BUT, if IE will be used to access Horde modules, you should read
  //    this first (discussing issues with IE's Content Advisor):
  //    http://lists.horde.org/archives/imp/Week-of-Mon-20030113/029149.html
 -$conf['cookie']['path'] = '/horde';
 +$conf['cookie']['path'] = '/horde3';
  
  // YOU SHOULDN'T CHANGE ANTHING BELOW THIS LINE.
  $conf['debug_level'] = E_ALL & ~E_NOTICE;
+ if (defined('E_DEPRECATED')) {
+    $conf['debug_level'] &= ~E_DEPRECATED;
+ }
  $conf['umask'] = 077;
  $conf['compress_pages'] = true;
  $conf['session']['name'] = 'Horde';
diff --combined config/nls.php.dist
index 27dd3f9,7fe5d14..705d7a2
--- a/config/nls.php.dist
+++ b/config/nls.php.dist
@@@ -2,7 -2,7 +2,7 @@@
  /**
   * NLS (National Language Support) configuration file.
   *
-  * $Horde: horde/config/nls.php.dist,v 1.59.10.17 2009/10/14 16:54:16 jan Exp $
+  * $Horde: horde/config/nls.php.dist,v 1.59.10.18 2010/05/04 17:29:11 jan Exp $
   */
  
  /**
@@@ -128,6 -128,7 +128,7 @@@ $nls['charsets']['bg_BG'] = 'windows-12
  $nls['charsets']['bs_BA'] = 'ISO-8859-2';
  $nls['charsets']['cs_CZ'] = 'ISO-8859-2';
  $nls['charsets']['el_GR'] = 'ISO-8859-7';
+ $nls['charsets']['et_EE'] = 'ISO-8859-13';
  $nls['charsets']['eu_ES'] = 'UTF-8';
  $nls['charsets']['fa_IR'] = 'UTF-8';
  $nls['charsets']['he_IL'] = 'UTF-8';
@@@ -161,6 -162,7 +162,7 @@@ if (strpos(PHP_OS, 'BSD') !== false) 
      $nls['charsets']['bs_BA'] = 'ISO8859-2';
      $nls['charsets']['cs_CZ'] = 'ISO8859-2';
      $nls['charsets']['el_GR'] = 'ISO8859-7';
+     $nls['charsets']['et_EE'] = 'ISO8859-13';
      $nls['charsets']['eu_ES'] = 'UTF-8';
      $nls['charsets']['fa_IR'] = 'UTF-8';
      $nls['charsets']['he_IL'] = 'UTF-8';
@@@ -261,7 -263,7 +263,7 @@@ $nls['spelling']['fr_FR'] = '-d francai
  $nls['spelling']['it_IT'] = '-T latin1 -d italian';
  $nls['spelling']['nl_NL'] = '-d nederlands';
  $nls['spelling']['pl_PL'] = '-d polish';
 -$nls['spelling']['pt_BR'] = '-d br';
 +$nls['spelling']['pt_BR'] = '-d brasileiro';
  $nls['spelling']['pt_PT'] = '-T latin1 -d portuguese';
  $nls['spelling']['ru_RU'] = '-d russian';
  $nls['spelling']['sl_SI'] = '-d slovensko';

-- 
Debian Horde Packages repository: horde3 package