SOURCES: horde-path.patch - updated to horde 3.3
baggins
baggins at pld-linux.org
Thu Oct 9 16:37:00 CEST 2008
Author: baggins Date: Thu Oct 9 14:37:00 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated to horde 3.3
---- Files affected:
SOURCES:
horde-path.patch (1.18 -> 1.19)
---- Diffs:
================================================================
Index: SOURCES/horde-path.patch
diff -u SOURCES/horde-path.patch:1.18 SOURCES/horde-path.patch:1.19
--- SOURCES/horde-path.patch:1.18 Thu Feb 7 00:09:14 2008
+++ SOURCES/horde-path.patch Thu Oct 9 16:36:54 2008
@@ -1,6 +1,6 @@
---- 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-3.3/config/registry.php~ 2008-10-09 16:26:10.000000000 +0200
++++ horde-3.3/config/registry.php 2008-10-09 16:35:56.000000000 +0200
+@@ -44,24 +44,24 @@
// 'horde' stanza below.
$this->applications['horde'] = array(
@@ -29,6 +29,7 @@
'webroot' => $this->applications['horde']['webroot'] . '/dimp',
'name' => _("Dynamic Mail"),
'status' => 'notoolbar',
+@@ -69,7 +69,7 @@
);
$this->applications['imp'] = array(
@@ -37,7 +38,61 @@
'webroot' => $this->applications['horde']['webroot'] . '/imp',
'name' => _("Mail"),
'status' => 'active',
-@@ -165,7 +165,7 @@
+@@ -77,7 +77,7 @@
+ );
+
+ $this->applications['ingo'] = array(
+- 'fileroot' => dirname(__FILE__) . '/../ingo',
++ 'fileroot' => '/usr/share/horde/ingo',
+ 'webroot' => $this->applications['horde']['webroot'] . '/ingo',
+ 'name' => _("Filters"),
+ 'status' => 'active',
+@@ -86,7 +86,7 @@
+ );
+
+ $this->applications['sam'] = array(
+- 'fileroot' => dirname(__FILE__) . '/../sam',
++ 'fileroot' => '/usr/share/horde/sam',
+ 'webroot' => $this->applications['horde']['webroot'] . '/sam',
+ 'name' => _("Spam"),
+ 'status' => 'active',
+@@ -97,7 +97,7 @@
+ );
+
+ $this->applications['forwards'] = array(
+- 'fileroot' => dirname(__FILE__) . '/../forwards',
++ 'fileroot' => '/usr/share/horde/forwards',
+ 'webroot' => $this->applications['horde']['webroot'] . '/forwards',
+ 'name' => _("Forwards"),
+ 'status' => 'active',
+@@ -106,7 +106,7 @@
+ );
+
+ $this->applications['vacation'] = array(
+- 'fileroot' => dirname(__FILE__) . '/../vacation',
++ 'fileroot' => '/usr/share/horde/vacation',
+ 'webroot' => $this->applications['horde']['webroot'] . '/vacation',
+ 'name' => _("Vacation"),
+ 'status' => 'active',
+@@ -127,7 +127,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',
+@@ -143,7 +143,7 @@
+ );
+
+ $this->applications['kronolith'] = array(
+- 'fileroot' => dirname(__FILE__) . '/../kronolith',
++ 'fileroot' => '/usr/share/horde/kronolith',
+ 'webroot' => $this->applications['horde']['webroot'] . '/kronolith',
+ 'name' => _("Calendar"),
+ 'status' => 'active',
+@@ -166,7 +166,7 @@
);
$this->applications['nag'] = array(
@@ -46,7 +101,43 @@
'webroot' => $this->applications['horde']['webroot'] . '/nag',
'name' => _("Tasks"),
'status' => 'active',
-@@ -249,7 +249,7 @@
+@@ -189,7 +189,7 @@
+ );
+
+ $this->applications['mnemo'] = array(
+- 'fileroot' => dirname(__FILE__) . '/../mnemo',
++ 'fileroot' => '/usr/share/horde/mnemo',
+ 'webroot' => $this->applications['horde']['webroot'] . '/mnemo',
+ 'name' => _("Notes"),
+ 'status' => 'active',
+@@ -205,7 +205,7 @@
+ );
+
+ $this->applications['genie'] = array(
+- 'fileroot' => dirname(__FILE__) . '/../genie',
++ 'fileroot' => '/usr/share/horde/genie',
+ 'webroot' => $this->applications['horde']['webroot'] . '/genie',
+ 'name' => _("Wishlist"),
+ 'status' => 'active',
+@@ -214,7 +214,7 @@
+ );
+
+ $this->applications['trean'] = array(
+- 'fileroot' => dirname(__FILE__) . '/../trean',
++ 'fileroot' => '/usr/share/horde/trean',
+ 'webroot' => $this->applications['horde']['webroot'] . '/trean',
+ 'name' => _("Bookmarks"),
+ 'status' => 'active',
+@@ -235,7 +235,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',
+@@ -250,7 +250,7 @@
);
$this->applications['whups'] = array(
@@ -55,7 +146,7 @@
'webroot' => $this->applications['horde']['webroot'] . '/whups',
'name' => _("Tickets"),
'status' => 'active',
-@@ -258,7 +258,7 @@
+@@ -266,7 +266,7 @@
);
$this->applications['luxor'] = array(
@@ -64,7 +155,7 @@
'webroot' => $this->applications['horde']['webroot'] . '/luxor',
'name' => _("X-Ref"),
'status' => 'active',
-@@ -271,7 +271,7 @@
+@@ -279,7 +279,7 @@
);
$this->applications['klutz'] = array(
@@ -73,15 +164,6 @@
'webroot' => $this->applications['horde']['webroot'] . '/klutz',
'name' => _("Comics"),
'status' => 'active',
-@@ -280,7 +280,7 @@
- );
-
- $this->applications['occam'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../occam',
-+ 'fileroot' => '/usr/share/horde/occam',
- 'webroot' => $this->applications['horde']['webroot'] . '/occam',
- 'name' => _("Courses"),
- 'status' => 'active',
@@ -288,7 +288,7 @@
);
@@ -130,40 +212,13 @@
@@ -341,7 +341,7 @@
);
- $this->applications['hylax'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../hylax',
-+ 'fileroot' => '/usr/share/horde/hylax',
- 'webroot' => $this->applications['horde']['webroot'] . '/hylax',
- 'name' => _("Faxes"),
- 'status' => 'active',
-@@ -349,7 +349,7 @@
- );
-
$this->applications['sesha'] = array(
- 'fileroot' => dirname(__FILE__) . '/../sesha',
+ 'fileroot' => '/usr/share/horde/sesha',
'webroot' => $this->applications['horde']['webroot'] . '/sesha',
'name' => _("Inventory"),
'status' => 'active',
-@@ -361,7 +361,7 @@
- );
-
- $this->applications['thor'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../thor',
-+ 'fileroot' => '/usr/share/horde/thor',
- 'webroot' => $this->applications['horde']['webroot'] . '/thor',
- 'name' => _("Projects"),
- 'status' => 'active',
-@@ -370,7 +370,7 @@
- );
-
- $this->applications['rakim'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../rakim',
-+ 'fileroot' => '/usr/share/horde/rakim',
- 'webroot' => $this->applications['horde']['webroot'] . '/rakim',
- 'name' => _("Support"),
- 'status' => 'active',
-@@ -378,7 +378,7 @@
+@@ -353,7 +353,7 @@
);
$this->applications['hermes'] = array(
@@ -172,7 +227,7 @@
'webroot' => $this->applications['horde']['webroot'] . '/hermes',
'name' => _("Time Tracking"),
'status' => 'active',
-@@ -406,7 +406,7 @@
+@@ -381,7 +381,7 @@
);
$this->applications['gollem'] = array(
@@ -181,7 +236,7 @@
'webroot' => $this->applications['horde']['webroot'] . '/gollem',
'name' => _("File Manager"),
'status' => 'active',
-@@ -422,7 +422,7 @@
+@@ -397,7 +397,7 @@
);
$this->applications['passwd'] = array(
@@ -190,7 +245,7 @@
'webroot' => $this->applications['horde']['webroot'] . '/passwd',
'name' => _("Password"),
'status' => 'active',
-@@ -430,7 +430,7 @@
+@@ -405,7 +405,7 @@
);
$this->applications['jeta'] = array(
@@ -199,7 +254,7 @@
'webroot' => $this->applications['horde']['webroot'] . '/jeta',
'name' => _("SSH"),
'status' => 'active',
-@@ -452,7 +452,7 @@
+@@ -418,7 +418,7 @@
);
$this->applications['agora'] = array(
@@ -208,7 +263,7 @@
'webroot' => $this->applications['horde']['webroot'] . '/agora',
'name' => _("Forums"),
'status' => 'active',
-@@ -461,7 +461,7 @@
+@@ -427,7 +427,7 @@
);
$this->applications['ulaform'] = array(
@@ -217,7 +272,7 @@
'webroot' => $this->applications['horde']['webroot'] . '/ulaform',
'name' => _("Forms"),
'status' => 'active',
-@@ -469,7 +469,7 @@
+@@ -435,7 +435,7 @@
);
$this->applications['volos'] = array(
@@ -226,7 +281,7 @@
'webroot' => $this->applications['horde']['webroot'] . '/volos',
'name' => _("Guestbook"),
'status' => 'active',
-@@ -477,7 +477,7 @@
+@@ -443,7 +443,7 @@
);
$this->applications['ansel'] = array(
@@ -235,7 +290,7 @@
'webroot' => $this->applications['horde']['webroot'] . '/ansel',
'name' => _("Photos"),
'status' => 'active',
-@@ -486,7 +486,7 @@
+@@ -452,7 +452,7 @@
);
$this->applications['scry'] = array(
@@ -244,7 +299,7 @@
'webroot' => $this->applications['horde']['webroot'] . '/scry',
'name' => _("Polls"),
'status' => 'active',
-@@ -495,7 +495,7 @@
+@@ -461,7 +461,7 @@
);
$this->applications['merk'] = array(
@@ -253,16 +308,7 @@
'webroot' => $this->applications['horde']['webroot'] . '/merk',
'name' => _("Shopping"),
'status' => 'active',
-@@ -504,7 +504,7 @@
- );
-
- $this->applications['swoosh'] = array(
-- 'fileroot' => dirname(__FILE__) . '/../swoosh',
-+ 'fileroot' => '/usr/share/horde/swoosh',
- 'webroot' => $this->applications['horde']['webroot'] . '/swoosh',
- 'name' => _("SMS Messaging"),
- 'status' => 'active',
-@@ -513,7 +513,7 @@
+@@ -470,7 +470,7 @@
);
$this->applications['wicked'] = array(
@@ -271,7 +317,7 @@
'webroot' => $this->applications['horde']['webroot'] . '/wicked',
'name' => _("Wiki"),
'status' => 'active',
-@@ -522,7 +522,7 @@
+@@ -479,7 +479,7 @@
);
$this->applications['vilma'] = array(
@@ -280,8 +326,17 @@
'webroot' => $this->applications['horde']['webroot'] . '/vilma',
'name' => _("Mail Admin"),
'status' => 'active',
-@@ -521,7 +521,7 @@
- $webroot = preg_replace(';/' . $hordedir . '.*;', '/' . $hordedir, $path);
+@@ -487,7 +487,7 @@
+ );
+
+ $this->applications['nic'] = array(
+- 'fileroot' => dirname(__FILE__) . '/../nic',
++ 'fileroot' => '/usr/share/horde/nic',
+ 'webroot' => $this->applications['horde']['webroot'] . '/nic',
+ 'name' => _("Network Tools"),
+ 'status' => 'active',
+@@ -511,7 +511,7 @@
+ }
} elseif (isset($_SERVER['PHP_SELF'])) {
$webroot = preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY);
- $webroot = strstr(dirname(__FILE__), DIRECTORY_SEPARATOR . array_shift($webroot));
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/horde-path.patch?r1=1.18&r2=1.19&f=u
More information about the pld-cvs-commit
mailing list