SOURCES: horde-path.patch - :%s#dirname(__FILE__) . '/..#'/usr/sha...
glen
glen at pld-linux.org
Mon Aug 27 11:44:34 CEST 2007
Author: glen Date: Mon Aug 27 09:44:34 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- :%s#dirname(__FILE__) . '/..#'/usr/share/horde#g
(partial merge)
---- Files affected:
SOURCES:
horde-path.patch (1.16 -> 1.17)
---- Diffs:
================================================================
Index: SOURCES/horde-path.patch
diff -u SOURCES/horde-path.patch:1.16 SOURCES/horde-path.patch:1.17
--- SOURCES/horde-path.patch:1.16 Thu Mar 1 23:41:41 2007
+++ SOURCES/horde-path.patch Mon Aug 27 11:44:29 2007
@@ -1,398 +1,294 @@
---- horde-3.1.4-rc1/config/registry.php.dist~ 2006-11-24 12:48:30.000000000 +0200
-+++ horde-3.1.4-rc1/config/registry.php.dist 2007-03-02 00:39:31.121884000 +0200
-@@ -44,24 +44,24 @@
+--- horde-3.2-alpha/config/registry.php.dist~ 2007-08-27 12:39:20.810324487 +0300
++++ horde-3.2-alpha/config/registry.php.dist 2007-08-27 12:40:41.772154077 +0300
+@@ -44,31 +44,31 @@
// 'horde' stanza below.
$this->applications['horde'] = array(
- 'fileroot' => dirname(__FILE__) . '/..',
-+ 'fileroot' => '/usr/share/horde',
++ 'fileroot' => '/usr/share/horde',
'webroot' => _detect_webroot(),
'initial_page' => 'login.php',
'name' => _("Horde"),
'status' => 'active',
- 'templates' => dirname(__FILE__) . '/../templates',
-+ 'templates' => '/usr/share/horde/templates',
- 'provides' => 'horde'
++ 'templates' => '/usr/share/horde/templates',
+ 'provides' => 'horde',
);
$this->applications['mimp'] = array(
- 'fileroot' => dirname(__FILE__) . '/../mimp',
-+ 'fileroot' => '/usr/share/horde/mimp',
++ 'fileroot' => '/usr/share/horde/mimp',
'webroot' => $this->applications['horde']['webroot'] . '/mimp',
'name' => _("Mobile Mail"),
- 'status' => 'notoolbar'
+ 'status' => 'notoolbar',
+ );
+
+ $this->applications['dimp'] = array(
+- 'fileroot' => dirname(__FILE__) . '/../dimp',
++ 'fileroot' => '/usr/share/horde/dimp',
+ 'webroot' => $this->applications['horde']['webroot'] . '/dimp',
+ 'name' => _("Dynamic Mail"),
+ 'status' => 'notoolbar',
);
$this->applications['imp'] = array(
- 'fileroot' => dirname(__FILE__) . '/../imp',
-+ 'fileroot' => '/usr/share/horde/imp',
++ 'fileroot' => '/usr/share/horde/imp',
'webroot' => $this->applications['horde']['webroot'] . '/imp',
'name' => _("Mail"),
'status' => 'active',
-@@ -69,7 +69,7 @@
- );
-
- $this->applications['ingo'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../ingo',
-+ 'fileroot' => '/usr/share/horde/ingo',
- 'webroot' => $this->applications['horde']['webroot'] . '/ingo',
- 'name' => _("Filters"),
- 'status' => 'active',
-@@ -78,7 +78,7 @@
- );
-
- $this->applications['sam'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../sam',
-+ 'fileroot' => '/usr/share/horde/sam',
- 'webroot' => $this->applications['horde']['webroot'] . '/sam',
- 'name' => _("Spam"),
- 'status' => 'inactive',
-@@ -89,7 +89,7 @@
- );
-
- $this->applications['forwards'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../forwards',
-+ 'fileroot' => '/usr/share/horde/forwards',
- 'webroot' => $this->applications['horde']['webroot'] . '/forwards',
- 'name' => _("Forwards"),
- 'status' => 'active',
-@@ -98,7 +98,7 @@
- );
-
- $this->applications['vacation'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../vacation',
-+ 'fileroot' => '/usr/share/horde/vacation',
- 'webroot' => $this->applications['horde']['webroot'] . '/vacation',
- 'name' => _("Vacation"),
- 'status' => 'active',
-@@ -119,7 +119,7 @@
- );
-
- $this->applications['turba'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../turba',
-+ 'fileroot' => '/usr/share/horde/turba',
- 'webroot' => $this->applications['horde']['webroot'] . '/turba',
- 'name' => _("Address Book"),
- 'status' => 'active',
-@@ -135,7 +135,7 @@
- );
-
- $this->applications['kronolith'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../kronolith',
-+ 'fileroot' => '/usr/share/horde/kronolith',
- 'webroot' => $this->applications['horde']['webroot'] . '/kronolith',
- 'name' => _("Calendar"),
- 'status' => 'active',
-@@ -158,7 +158,7 @@
- );
-
- $this->applications['mnemo'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../mnemo',
-+ 'fileroot' => '/usr/share/horde/mnemo',
- 'webroot' => $this->applications['horde']['webroot'] . '/mnemo',
- 'name' => _("Notes"),
- 'status' => 'active',
-@@ -167,7 +167,7 @@
+@@ -165,7 +165,7 @@
);
$this->applications['nag'] = array(
- 'fileroot' => dirname(__FILE__) . '/../nag',
-+ 'fileroot' => '/usr/share/horde/nag',
++ 'fileroot' => '/usr/share/horde/nag',
'webroot' => $this->applications['horde']['webroot'] . '/nag',
'name' => _("Tasks"),
'status' => 'active',
-@@ -176,7 +176,7 @@
- );
-
- $this->applications['genie'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../genie',
-+ 'fileroot' => '/usr/share/horde/genie',
- 'webroot' => $this->applications['horde']['webroot'] . '/genie',
- 'name' => _("Wishlist"),
- 'status' => 'inactive',
-@@ -185,7 +185,7 @@
- );
-
- $this->applications['trean'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../trean',
-+ 'fileroot' => '/usr/share/horde/trean',
- 'webroot' => $this->applications['horde']['webroot'] . '/trean',
- 'name' => _("Bookmarks"),
- 'status' => 'inactive',
-@@ -206,7 +206,7 @@
- );
-
- $this->applications['chora'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../chora',
-+ 'fileroot' => '/usr/share/horde/chora',
- 'webroot' => $this->applications['horde']['webroot'] . '/chora',
- 'name' => _("Version Control"),
- 'status' => 'active',
-@@ -214,16 +214,16 @@
+@@ -249,7 +249,7 @@
);
$this->applications['whups'] = array(
- 'fileroot' => dirname(__FILE__) . '/../whups',
-+ 'fileroot' => '/usr/share/horde/whups',
++ 'fileroot' => '/usr/share/horde/whups',
'webroot' => $this->applications['horde']['webroot'] . '/whups',
'name' => _("Tickets"),
-- 'status' => 'inactive',
-+ 'status' => 'active',
- 'provides' => 'tickets',
- 'menu_parent' => 'devel'
+ 'status' => 'active',
+@@ -258,7 +258,7 @@
);
$this->applications['luxor'] = array(
- 'fileroot' => dirname(__FILE__) . '/../luxor',
-+ 'fileroot' => '/usr/share/horde/luxor',
++ 'fileroot' => '/usr/share/horde/luxor',
'webroot' => $this->applications['horde']['webroot'] . '/luxor',
'name' => _("X-Ref"),
- 'status' => 'inactive',
-@@ -231,7 +231,7 @@
- );
-
- $this->applications['nic'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../nic',
-+ 'fileroot' => '/usr/share/horde/nic',
- 'webroot' => $this->applications['horde']['webroot'] . '/nic',
- 'name' => _("Network"),
- 'status' => 'inactive',
-@@ -244,7 +244,7 @@
+ 'status' => 'active',
+@@ -271,7 +271,7 @@
);
$this->applications['klutz'] = array(
- 'fileroot' => dirname(__FILE__) . '/../klutz',
-+ 'fileroot' => '/usr/share/horde/klutz',
++ 'fileroot' => '/usr/share/horde/klutz',
'webroot' => $this->applications['horde']['webroot'] . '/klutz',
'name' => _("Comics"),
- 'status' => 'inactive',
-@@ -253,7 +253,7 @@
+ 'status' => 'active',
+@@ -280,7 +280,7 @@
);
$this->applications['occam'] = array(
- 'fileroot' => dirname(__FILE__) . '/../occam',
-+ 'fileroot' => '/usr/share/horde/occam',
++ 'fileroot' => '/usr/share/horde/occam',
'webroot' => $this->applications['horde']['webroot'] . '/occam',
'name' => _("Courses"),
- 'status' => 'inactive',
-@@ -261,7 +261,7 @@
+ 'status' => 'active',
+@@ -288,7 +288,7 @@
);
$this->applications['mottle'] = array(
- 'fileroot' => dirname(__FILE__) . '/../mottle',
-+ 'fileroot' => '/usr/share/horde/mottle',
++ 'fileroot' => '/usr/share/horde/mottle',
'webroot' => $this->applications['horde']['webroot'] . '/mottle',
'name' => _("MOTD"),
- 'status' => 'inactive',
-@@ -269,7 +269,7 @@
+ 'status' => 'active',
+@@ -296,7 +296,7 @@
);
$this->applications['jonah'] = array(
- 'fileroot' => dirname(__FILE__) . '/../jonah',
-+ 'fileroot' => '/usr/share/horde/jonah',
++ 'fileroot' => '/usr/share/horde/jonah',
'webroot' => $this->applications['horde']['webroot'] . '/jonah',
'name' => _("News"),
- 'status' => 'inactive',
-@@ -285,7 +285,7 @@
- );
-
- $this->applications['troll'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../troll',
-+ 'fileroot' => '/usr/share/horde/troll',
- 'webroot' => $this->applications['horde']['webroot'] . '/troll',
- 'name' => _("Newsgroups"),
- 'status' => 'inactive',
-@@ -300,7 +300,7 @@
+ 'status' => 'active',
+@@ -312,7 +312,7 @@
);
$this->applications['goops'] = array(
- 'fileroot' => dirname(__FILE__) . '/../goops',
-+ 'fileroot' => '/usr/share/horde/goops',
++ 'fileroot' => '/usr/share/horde/goops',
'webroot' => $this->applications['horde']['webroot'] . '/goops',
'name' => _("Search Engines"),
- 'status' => 'inactive',
-@@ -313,7 +313,7 @@
+ 'status' => 'active',
+@@ -325,7 +325,7 @@
);
$this->applications['juno'] = array(
- 'fileroot' => dirname(__FILE__) . '/../juno',
-+ 'fileroot' => '/usr/share/horde/juno',
++ 'fileroot' => '/usr/share/horde/juno',
'webroot' => $this->applications['horde']['webroot'] . '/juno',
'name' => _("Accounting"),
- 'status' => 'inactive',
-@@ -321,7 +321,7 @@
+ 'status' => 'active',
+@@ -333,7 +333,7 @@
);
$this->applications['midas'] = array(
- 'fileroot' => dirname(__FILE__) . '/../midas',
-+ 'fileroot' => '/usr/share/horde/midas',
++ 'fileroot' => '/usr/share/horde/midas',
'webroot' => $this->applications['horde']['webroot'] . '/midas',
'name' => _("Ads"),
- 'status' => 'inactive',
-@@ -329,7 +329,7 @@
+ 'status' => 'active',
+@@ -341,7 +341,7 @@
);
$this->applications['hylax'] = array(
- 'fileroot' => dirname(__FILE__) . '/../hylax',
-+ 'fileroot' => '/usr/share/horde/hylax',
++ 'fileroot' => '/usr/share/horde/hylax',
'webroot' => $this->applications['horde']['webroot'] . '/hylax',
'name' => _("Faxes"),
- 'status' => 'inactive',
-@@ -337,7 +337,7 @@
+ 'status' => 'active',
+@@ -349,7 +349,7 @@
);
$this->applications['sesha'] = array(
- 'fileroot' => dirname(__FILE__) . '/../sesha',
-+ 'fileroot' => '/usr/share/horde/sesha',
++ 'fileroot' => '/usr/share/horde/sesha',
'webroot' => $this->applications['horde']['webroot'] . '/sesha',
'name' => _("Inventory"),
- 'status' => 'inactive',
-@@ -349,7 +349,7 @@
+ 'status' => 'active',
+@@ -361,7 +361,7 @@
);
$this->applications['thor'] = array(
- 'fileroot' => dirname(__FILE__) . '/../thor',
-+ 'fileroot' => '/usr/share/horde/thor',
++ 'fileroot' => '/usr/share/horde/thor',
'webroot' => $this->applications['horde']['webroot'] . '/thor',
'name' => _("Projects"),
- 'status' => 'inactive',
-@@ -358,7 +358,7 @@
+ 'status' => 'active',
+@@ -370,7 +370,7 @@
);
$this->applications['rakim'] = array(
- 'fileroot' => dirname(__FILE__) . '/../rakim',
-+ 'fileroot' => '/usr/share/horde/rakim',
++ 'fileroot' => '/usr/share/horde/rakim',
'webroot' => $this->applications['horde']['webroot'] . '/rakim',
'name' => _("Support"),
- 'status' => 'inactive',
-@@ -366,7 +366,7 @@
+ 'status' => 'active',
+@@ -378,7 +378,7 @@
);
$this->applications['hermes'] = array(
- 'fileroot' => dirname(__FILE__) . '/../hermes',
-+ 'fileroot' => '/usr/share/horde/hermes',
++ 'fileroot' => '/usr/share/horde/hermes',
'webroot' => $this->applications['horde']['webroot'] . '/hermes',
'name' => _("Time Tracking"),
- 'status' => 'inactive',
-@@ -387,7 +387,7 @@
+ 'status' => 'active',
+@@ -406,7 +406,7 @@
);
$this->applications['gollem'] = array(
- 'fileroot' => dirname(__FILE__) . '/../gollem',
-+ 'fileroot' => '/usr/share/horde/gollem',
++ 'fileroot' => '/usr/share/horde/gollem',
'webroot' => $this->applications['horde']['webroot'] . '/gollem',
'name' => _("File Manager"),
'status' => 'active',
-@@ -403,7 +403,7 @@
+@@ -422,7 +422,7 @@
);
$this->applications['passwd'] = array(
- 'fileroot' => dirname(__FILE__) . '/../passwd',
-+ 'fileroot' => '/usr/share/horde/passwd',
++ 'fileroot' => '/usr/share/horde/passwd',
'webroot' => $this->applications['horde']['webroot'] . '/passwd',
'name' => _("Password"),
'status' => 'active',
-@@ -411,7 +411,7 @@
+@@ -430,7 +430,7 @@
);
$this->applications['jeta'] = array(
- 'fileroot' => dirname(__FILE__) . '/../jeta',
-+ 'fileroot' => '/usr/share/horde/jeta',
++ 'fileroot' => '/usr/share/horde/jeta',
'webroot' => $this->applications['horde']['webroot'] . '/jeta',
'name' => _("SSH"),
- 'status' => 'inactive',
-@@ -424,7 +424,7 @@
+ 'status' => 'active',
+@@ -443,7 +443,7 @@
);
$this->applications['giapeto'] = array(
- 'fileroot' => dirname(__FILE__) . '/../giapeto',
-+ 'fileroot' => '/usr/share/horde/giapeto',
++ 'fileroot' => '/usr/share/horde/giapeto',
'webroot' => $this->applications['horde']['webroot'] . '/giapeto',
'name' => _("CMS"),
- 'status' => 'inactive',
-@@ -433,7 +433,7 @@
+ 'status' => 'active',
+@@ -452,7 +452,7 @@
);
$this->applications['agora'] = array(
- 'fileroot' => dirname(__FILE__) . '/../agora',
-+ 'fileroot' => '/usr/share/horde/agora',
++ 'fileroot' => '/usr/share/horde/agora',
'webroot' => $this->applications['horde']['webroot'] . '/agora',
'name' => _("Forums"),
- 'status' => 'inactive',
-@@ -442,7 +442,7 @@
+ 'status' => 'active',
+@@ -461,7 +461,7 @@
);
$this->applications['ulaform'] = array(
- 'fileroot' => dirname(__FILE__) . '/../ulaform',
-+ 'fileroot' => '/usr/share/horde/ulaform',
++ 'fileroot' => '/usr/share/horde/ulaform',
'webroot' => $this->applications['horde']['webroot'] . '/ulaform',
'name' => _("Forms"),
- 'status' => 'inactive',
-@@ -450,7 +450,7 @@
+ 'status' => 'active',
+@@ -469,7 +469,7 @@
);
$this->applications['volos'] = array(
- 'fileroot' => dirname(__FILE__) . '/../volos',
-+ 'fileroot' => '/usr/share/horde/volos',
++ 'fileroot' => '/usr/share/horde/volos',
'webroot' => $this->applications['horde']['webroot'] . '/volos',
'name' => _("Guestbook"),
- 'status' => 'inactive',
-@@ -458,7 +458,7 @@
+ 'status' => 'active',
+@@ -477,7 +477,7 @@
);
$this->applications['ansel'] = array(
- 'fileroot' => dirname(__FILE__) . '/../ansel',
-+ 'fileroot' => '/usr/share/horde/ansel',
++ 'fileroot' => '/usr/share/horde/ansel',
'webroot' => $this->applications['horde']['webroot'] . '/ansel',
'name' => _("Photos"),
- 'status' => 'inactive',
-@@ -467,7 +467,7 @@
+ 'status' => 'active',
+@@ -486,7 +486,7 @@
);
$this->applications['scry'] = array(
- 'fileroot' => dirname(__FILE__) . '/../scry',
-+ 'fileroot' => '/usr/share/horde/scry',
++ 'fileroot' => '/usr/share/horde/scry',
'webroot' => $this->applications['horde']['webroot'] . '/scry',
'name' => _("Polls"),
- 'status' => 'inactive',
-@@ -476,7 +476,7 @@
+ 'status' => 'active',
+@@ -495,7 +495,7 @@
);
$this->applications['merk'] = array(
- 'fileroot' => dirname(__FILE__) . '/../merk',
-+ 'fileroot' => '/usr/share/horde/merk',
++ 'fileroot' => '/usr/share/horde/merk',
'webroot' => $this->applications['horde']['webroot'] . '/merk',
'name' => _("Shopping"),
- 'status' => 'inactive',
-@@ -484,7 +484,7 @@
+ 'status' => 'active',
+@@ -504,7 +504,7 @@
);
$this->applications['swoosh'] = array(
- 'fileroot' => dirname(__FILE__) . '/../swoosh',
-+ 'fileroot' => '/usr/share/horde/swoosh',
++ 'fileroot' => '/usr/share/horde/swoosh',
'webroot' => $this->applications['horde']['webroot'] . '/swoosh',
'name' => _("SMS Messaging"),
- 'status' => 'inactive',
-@@ -493,16 +493,16 @@
+ 'status' => 'active',
+@@ -513,7 +513,7 @@
);
$this->applications['wicked'] = array(
- 'fileroot' => dirname(__FILE__) . '/../wicked',
-+ 'fileroot' => '/usr/share/horde/wicked',
++ 'fileroot' => '/usr/share/horde/wicked',
'webroot' => $this->applications['horde']['webroot'] . '/wicked',
'name' => _("Wiki"),
-- 'status' => 'inactive',
-+ 'status' => 'active',
- 'provides' => 'wiki',
- 'menu_parent' => 'website'
+ 'status' => 'active',
+@@ -522,7 +522,7 @@
);
$this->applications['vilma'] = array(
- 'fileroot' => dirname(__FILE__) . '/../vilma',
-+ 'fileroot' => '/usr/share/horde/vilma',
++ 'fileroot' => '/usr/share/horde/vilma',
'webroot' => $this->applications['horde']['webroot'] . '/vilma',
'name' => _("Mail Admin"),
- 'status' => 'inactive',
+ 'status' => 'active',
@@ -521,7 +521,7 @@
$webroot = preg_replace(';/' . $hordedir . '.*;', '/' . $hordedir, $path);
} elseif (isset($_SERVER['PHP_SELF'])) {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/horde-path.patch?r1=1.16&r2=1.17&f=u
More information about the pld-cvs-commit
mailing list