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

Gregory Colpart gcolpart at ioakim2.evolix.net
Sun May 9 21:21:40 UTC 2010


The following commit has been merged in the upstream+patches branch:
commit 1c7c93dde0c1cddfbc24644c8d15f696b63c6ce0
Merge: 6c744d9cba5cb9ebf1bef285591b75adf4309aa0 9589b5aca073006912cbfc6640408dcaff2872a4
Author: Gregory Colpart <gcolpart at ioakim2.evolix.net>
Date:   Sun May 9 20:59:53 2010 +0200

    Merge branch 'upstream' into upstream+patches

diff --combined config/conf.php.dist
index 2670ed9,ce4498d..d67e17b
--- 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.4 2008/10/03 00:19:58 chuck Exp $
   */
  
  // Determines how we generate full URLs (for location headers and
@@@ -50,13 -47,13 +50,13 @@@ $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;
diff --combined config/mime_drivers.php.dist
index e5b7530,ff6e74f..973449a
--- a/config/mime_drivers.php.dist
+++ b/config/mime_drivers.php.dist
@@@ -1,6 -1,6 +1,6 @@@
  <?php
  /**
-  * $Horde: horde/config/mime_drivers.php.dist,v 1.97.6.14 2009-11-24 19:53:30 slusarz Exp $
+  * $Horde: horde/config/mime_drivers.php.dist,v 1.97.6.14 2009/11/24 19:53:30 slusarz Exp $
   *
   * Decide which output drivers you want to activate for all Horde
   * applications. Individual Horde applications can override these settings
@@@ -405,7 -405,7 +405,7 @@@ $mime_drivers['horde']['msword'] = arra
   * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/
   */
  $mime_drivers['horde']['msexcel'] = array(
 -    'location' => '/usr/local/bin/xlhtml',
 +    'location' => '/usr/bin/xlhtml',
      'inline' => false,
      'handles' => array(
          'application/vnd.ms-excel', 'application/msexcel',
@@@ -423,7 -423,7 +423,7 @@@
   * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/
   */
  $mime_drivers['horde']['mspowerpoint'] = array(
 -    'location' => '/usr/local/bin/ppthtml',
 +    'location' => '/usr/bin/ppthtml',
      'inline' => false,
      'handles' => array(
          'application/vnd.ms-powerpoint', 'application/mspowerpoint'
diff --combined config/nls.php.dist
index 336b9db,78efa7e..27dd3f9
--- 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.17 2009/10/14 16:54:16 jan Exp $
   */
  
  /**
@@@ -261,7 -261,7 +261,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';
diff --combined config/registry.php.dist
index 463c32c,f53653e..d85d510
--- a/config/registry.php.dist
+++ b/config/registry.php.dist
@@@ -2,7 -2,7 +2,7 @@@
  /**
   * registry.php -- Horde application registry.
   *
-  * $Horde: horde/config/registry.php.dist,v 1.255.2.27 2009-07-24 08:58:06 jan Exp $
+  * $Horde: horde/config/registry.php.dist,v 1.255.2.27 2009/07/24 08:58:06 jan Exp $
   *
   * This configuration file is used by Horde to determine which Horde
   * applications are installed and where, as well as how they interact.
@@@ -45,10 -45,7 +45,10 @@@
  
  $this->applications['horde'] = array(
      'fileroot' => dirname(__FILE__) . '/..',
 -    'webroot' => _detect_webroot(),
 +    // To respect Debian FHS policy, config/ is in /etc/ directory
 +    // Then _detect_webroot() is unusable in Debian
 +    // 'webroot' => _detect_webroot(),
 +    'webroot' => '/horde3',
      'initial_page' => 'login.php',
      'name' => _("Horde"),
      'status' => 'active',
@@@ -75,7 -72,7 +75,7 @@@ $this->applications['imp'] = array
      'fileroot' => dirname(__FILE__) . '/../imp',
      'webroot' => $this->applications['horde']['webroot'] . '/imp',
      'name' => _("Mail"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => array('mail', 'contacts/favouriteRecipients')
  );
  
@@@ -83,7 -80,7 +83,7 @@@ $this->applications['ingo'] = array
      'fileroot' => dirname(__FILE__) . '/../ingo',
      'webroot' => $this->applications['horde']['webroot'] . '/ingo',
      'name' => _("Filters"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => array('filter', 'mail/blacklistFrom', 'mail/showBlacklist', 'mail/whitelistFrom', 'mail/showWhitelist', 'mail/applyFilters', 'mail/canApplyFilters', 'mail/showFilters'),
      'menu_parent' => 'imp'
  );
@@@ -92,7 -89,7 +92,7 @@@ $this->applications['sam'] = array
      'fileroot' => dirname(__FILE__) . '/../sam',
      'webroot' => $this->applications['horde']['webroot'] . '/sam',
      'name' => _("Spam"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      // Uncomment this line if you want Sam to handle the blacklist filter
      // instead of Ingo:
      // 'provides' => array('mail/blacklistFrom', 'mail/showBlacklist', 'mail/whitelistFrom', 'mail/showWhitelist'),
@@@ -103,7 -100,7 +103,7 @@@ $this->applications['forwards'] = array
      'fileroot' => dirname(__FILE__) . '/../forwards',
      'webroot' => $this->applications['horde']['webroot'] . '/forwards',
      'name' => _("Forwards"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => 'forwards',
      'menu_parent' => 'imp',
  );
@@@ -112,7 -109,7 +112,7 @@@ $this->applications['vacation'] = array
      'fileroot' => dirname(__FILE__) . '/../vacation',
      'webroot' => $this->applications['horde']['webroot'] . '/vacation',
      'name' => _("Vacation"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => 'vacation',
      'menu_parent' => 'imp'
  );
@@@ -133,7 -130,7 +133,7 @@@ $this->applications['turba'] = array
      'fileroot' => dirname(__FILE__) . '/../turba',
      'webroot' => $this->applications['horde']['webroot'] . '/turba',
      'name' => _("Address Book"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => array('contacts', 'clients/getClientSource', 'clients/clientFields', 'clients/getClient', 'clients/getClients', 'clients/addClient', 'clients/updateClient', 'clients/deleteClient', 'clients/searchClients'),
      'menu_parent' => 'organizing'
  );
@@@ -149,7 -146,7 +149,7 @@@ $this->applications['kronolith'] = arra
      'fileroot' => dirname(__FILE__) . '/../kronolith',
      'webroot' => $this->applications['horde']['webroot'] . '/kronolith',
      'name' => _("Calendar"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => 'calendar',
      'menu_parent' => 'organizing'
  );
@@@ -172,7 -169,7 +172,7 @@@ $this->applications['nag'] = array
      'fileroot' => dirname(__FILE__) . '/../nag',
      'webroot' => $this->applications['horde']['webroot'] . '/nag',
      'name' => _("Tasks"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => 'tasks',
      'menu_parent' => 'organizing'
  );
@@@ -195,7 -192,7 +195,7 @@@ $this->applications['mnemo'] = array
      'fileroot' => dirname(__FILE__) . '/../mnemo',
      'webroot' => $this->applications['horde']['webroot'] . '/mnemo',
      'name' => _("Notes"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => 'notes',
      'menu_parent' => 'organizing'
  );
@@@ -211,7 -208,7 +211,7 @@@ $this->applications['genie'] = array
      'fileroot' => dirname(__FILE__) . '/../genie',
      'webroot' => $this->applications['horde']['webroot'] . '/genie',
      'name' => _("Wishlist"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => 'wishlist',
      'menu_parent' => 'organizing'
  );
@@@ -220,7 -217,7 +220,7 @@@ $this->applications['trean'] = array
      'fileroot' => dirname(__FILE__) . '/../trean',
      'webroot' => $this->applications['horde']['webroot'] . '/trean',
      'name' => _("Bookmarks"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => 'bookmarks',
      'menu_parent' => 'organizing'
  );
@@@ -241,7 -238,7 +241,7 @@@ $this->applications['chora'] = array
      'fileroot' => dirname(__FILE__) . '/../chora',
      'webroot' => $this->applications['horde']['webroot'] . '/chora',
      'name' => _("Version Control"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'menu_parent' => 'devel'
  );
  
@@@ -256,7 -253,7 +256,7 @@@ $this->applications['whups'] = array
      'fileroot' => dirname(__FILE__) . '/../whups',
      'webroot' => $this->applications['horde']['webroot'] . '/whups',
      'name' => _("Tickets"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => 'tickets',
      'menu_parent' => 'devel',
  );
@@@ -272,7 -269,7 +272,7 @@@ $this->applications['luxor'] = array
      'fileroot' => dirname(__FILE__) . '/../luxor',
      'webroot' => $this->applications['horde']['webroot'] . '/luxor',
      'name' => _("X-Ref"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'menu_parent' => 'devel'
  );
  
@@@ -285,7 -282,7 +285,7 @@@ $this->applications['klutz'] = array
      'fileroot' => dirname(__FILE__) . '/../klutz',
      'webroot' => $this->applications['horde']['webroot'] . '/klutz',
      'name' => _("Comics"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => 'comics',
      'menu_parent' => 'info'
  );
@@@ -294,7 -291,7 +294,7 @@@ $this->applications['mottle'] = array
      'fileroot' => dirname(__FILE__) . '/../mottle',
      'webroot' => $this->applications['horde']['webroot'] . '/mottle',
      'name' => _("MOTD"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'menu_parent' => 'info'
  );
  
@@@ -302,7 -299,7 +302,7 @@@ $this->applications['jonah'] = array
      'fileroot' => dirname(__FILE__) . '/../jonah',
      'webroot' => $this->applications['horde']['webroot'] . '/jonah',
      'name' => _("News"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => 'news',
      'menu_parent' => 'info'
  );
@@@ -318,7 -315,7 +318,7 @@@ $this->applications['goops'] = array
      'fileroot' => dirname(__FILE__) . '/../goops',
      'webroot' => $this->applications['horde']['webroot'] . '/goops',
      'name' => _("Search Engines"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'menu_parent' => 'info'
  );
  
@@@ -331,7 -328,7 +331,7 @@@ $this->applications['juno'] = array
      'fileroot' => dirname(__FILE__) . '/../juno',
      'webroot' => $this->applications['horde']['webroot'] . '/juno',
      'name' => _("Accounting"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'menu_parent' => 'office'
  );
  
@@@ -339,7 -336,7 +339,7 @@@ $this->applications['midas'] = array
      'fileroot' => dirname(__FILE__) . '/../midas',
      'webroot' => $this->applications['horde']['webroot'] . '/midas',
      'name' => _("Ads"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'menu_parent' => 'office'
  );
  
@@@ -347,7 -344,7 +347,7 @@@ $this->applications['sesha'] = array
      'fileroot' => dirname(__FILE__) . '/../sesha',
      'webroot' => $this->applications['horde']['webroot'] . '/sesha',
      'name' => _("Inventory"),
 -    'status' => 'active',
 +    'status' => 'inactive',
  
      // Uncomment this line if you want Sesha to provide queue and version
      // names instead of Whups:
@@@ -359,7 -356,7 +359,7 @@@ $this->applications['hermes'] = array
      'fileroot' => dirname(__FILE__) . '/../hermes',
      'webroot' => $this->applications['horde']['webroot'] . '/hermes',
      'name' => _("Time Tracking"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'menu_parent' => 'office',
      'provides' => 'time'
  );
@@@ -387,7 -384,7 +387,7 @@@ $this->applications['gollem'] = array
      'fileroot' => dirname(__FILE__) . '/../gollem',
      'webroot' => $this->applications['horde']['webroot'] . '/gollem',
      'name' => _("File Manager"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'menu_parent' => 'myaccount',
      'provides' => 'files',
  );
@@@ -403,7 -400,7 +403,7 @@@ $this->applications['passwd'] = array
      'fileroot' => dirname(__FILE__) . '/../passwd',
      'webroot' => $this->applications['horde']['webroot'] . '/passwd',
      'name' => _("Password"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'menu_parent' => 'myaccount'
  );
  
@@@ -411,7 -408,7 +411,7 @@@ $this->applications['jeta'] = array
      'fileroot' => dirname(__FILE__) . '/../jeta',
      'webroot' => $this->applications['horde']['webroot'] . '/jeta',
      'name' => _("SSH"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'menu_parent' => 'myaccount'
  );
  
@@@ -424,7 -421,7 +424,7 @@@ $this->applications['agora'] = array
      'fileroot' => dirname(__FILE__) . '/../agora',
      'webroot' => $this->applications['horde']['webroot'] . '/agora',
      'name' => _("Forums"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => 'forums',
      'menu_parent' => 'website'
  );
@@@ -433,7 -430,7 +433,7 @@@ $this->applications['ulaform'] = array
      'fileroot' => dirname(__FILE__) . '/../ulaform',
      'webroot' => $this->applications['horde']['webroot'] . '/ulaform',
      'name' => _("Forms"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'menu_parent' => 'website'
  );
  
@@@ -441,7 -438,7 +441,7 @@@ $this->applications['volos'] = array
      'fileroot' => dirname(__FILE__) . '/../volos',
      'webroot' => $this->applications['horde']['webroot'] . '/volos',
      'name' => _("Guestbook"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'menu_parent' => 'website'
  );
  
@@@ -449,7 -446,7 +449,7 @@@ $this->applications['ansel'] = array
      'fileroot' => dirname(__FILE__) . '/../ansel',
      'webroot' => $this->applications['horde']['webroot'] . '/ansel',
      'name' => _("Photos"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => 'images',
      'menu_parent' => 'website'
  );
@@@ -458,7 -455,7 +458,7 @@@ $this->applications['scry'] = array
      'fileroot' => dirname(__FILE__) . '/../scry',
      'webroot' => $this->applications['horde']['webroot'] . '/scry',
      'name' => _("Polls"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => 'polls',
      'menu_parent' => 'website'
  );
@@@ -467,7 -464,7 +467,7 @@@ $this->applications['merk'] = array
      'fileroot' => dirname(__FILE__) . '/../merk',
      'webroot' => $this->applications['horde']['webroot'] . '/merk',
      'name' => _("Shopping"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => 'shop',
      'menu_parent' => 'website'
  );
@@@ -476,7 -473,7 +476,7 @@@ $this->applications['wicked'] = array
      'fileroot' => dirname(__FILE__) . '/../wicked',
      'webroot' => $this->applications['horde']['webroot'] . '/wicked',
      'name' => _("Wiki"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'provides' => 'wiki',
      'menu_parent' => 'website'
  );
@@@ -485,7 -482,7 +485,7 @@@ $this->applications['vilma'] = array
      'fileroot' => dirname(__FILE__) . '/../vilma',
      'webroot' => $this->applications['horde']['webroot'] . '/vilma',
      'name' => _("Mail Admin"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'menu_parent' => 'administration'
  );
  
@@@ -493,7 -490,7 +493,7 @@@ $this->applications['nic'] = array
      'fileroot' => dirname(__FILE__) . '/../nic',
      'webroot' => $this->applications['horde']['webroot'] . '/nic',
      'name' => _("Network Tools"),
 -    'status' => 'active',
 +    'status' => 'inactive',
      'menu_parent' => 'administration'
  );
  
@@@ -520,10 -517,10 +520,10 @@@ function _detect_webroot(
          } elseif ($webroot === false) {
              $webroot = '';
          } else {
 -            $webroot = '/horde';
 +            $webroot = '/horde3';
          }
      } else {
 -        $webroot = '/horde';
 +        $webroot = '/horde3';
      }
  
      return $webroot;

-- 
Debian Horde Packages repository: horde3 package



More information about the pkg-horde-hackers mailing list