added support for FHS SOPE, fixed errors in XML templates

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@302 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/Main/GNUmakefile.preamble b/SOGo/Main/GNUmakefile.preamble
index 2b113fa59a3f3482fc4bf308cb0c79ba796b8eb5..6d5bb9acc6d21f02556c2f9d238c8b7e91ce44a3 100644 (file)
--- a/SOGo/Main/GNUmakefile.preamble
+++ b/SOGo/Main/GNUmakefile.preamble
@@ -7,7 +7,8 @@ ADDITIONAL_INCLUDE_DIRS += \
 ADDITIONAL_LIB_DIRS += \
        -L../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)/ \
        -L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
-       -L../../SOGoLogic/$(GNUSTEP_OBJ_DIR)/
+       -L../../SOGoLogic/$(GNUSTEP_OBJ_DIR)/   \
+        -L/usr/local/lib -L/usr/lib
 
 ADDITIONAL_TOOL_LIBS += \
        -lSOGo                  \

diff --git a/SOGo/SoObjects/Appointments/GNUmakefile.preamble b/SOGo/SoObjects/Appointments/GNUmakefile.preamble
index f5fdadee0d9e7289b61621ebde5be8f5596bf3ef..bdd52fe03064200f22c0dd2a4fe938d04478f41a 100644 (file)
--- a/SOGo/SoObjects/Appointments/GNUmakefile.preamble
+++ b/SOGo/SoObjects/Appointments/GNUmakefile.preamble
@@ -7,7 +7,8 @@ ADDITIONAL_INCLUDE_DIRS += \
 ADDITIONAL_LIB_DIRS += \
        -L../SOGo/$(GNUSTEP_OBJ_DIR)/ \
        -L../../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
-       -L../../../SOGoLogic/$(GNUSTEP_OBJ_DIR)/
+       -L../../../SOGoLogic/$(GNUSTEP_OBJ_DIR)/        \
+        -L/usr/local/lib -L/usr/lib
 
 Appointments_BUNDLE_LIBS += \
        -lSOGo -lSOGoLogic \

diff --git a/SOGo/SoObjects/SOGo/GNUmakefile.preamble b/SOGo/SoObjects/SOGo/GNUmakefile.preamble
index 64fb213ac74657fe248a25c039251dd331fac85e..4de78edca078bf47294be24a5afb8db4257b5827 100644 (file)
--- a/SOGo/SoObjects/SOGo/GNUmakefile.preamble
+++ b/SOGo/SoObjects/SOGo/GNUmakefile.preamble
@@ -12,6 +12,7 @@ endif
 
 libSOGo_LIB_DIRS +=                            \
        -L$(RELBUILD_DIR_libOGoContentStore)    \
+        -L/usr/local/lib -L/usr/lib
 
 libSOGo_LIBRARIES_DEPEND_UPON += \
        -lOGoContentStore       \

diff --git a/SOGo/UI/Anais/AnaisAttendeeSelector.wox b/SOGo/UI/Anais/AnaisAttendeeSelector.wox
index 471a88e204365634c3e830da3e1572e0d16a5b71..37e73daec1666fc49abf5a9821d6f268d36d6a48 100644 (file)
--- a/SOGo/UI/Anais/AnaisAttendeeSelector.wox
+++ b/SOGo/UI/Anais/AnaisAttendeeSelector.wox
@@ -4,6 +4,7 @@
   xmlns:var="http://www.skyrix.com/od/binding"
   xmlns:const="http://www.skyrix.com/od/constant"
   xmlns:rsrc="OGo:url"
+  xmlns:label="OGo:label"
   class="aptview_text"
 >
   <script language="JavaScript">

diff --git a/SOGo/UI/Anais/ChangeLog b/SOGo/UI/Anais/ChangeLog
index b88e7289c3d43ac7e8e5aab4f7c5dcf88c1f9881..276ee6f93fb8deba9e7522ff5e8c9084c493c570 100644 (file)
--- a/SOGo/UI/Anais/ChangeLog
+++ b/SOGo/UI/Anais/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-10  Helge Hess  <helge.hess@skyrix.com>
+
+       * AnaisAttendeeSelector.wox: fixed missing label namespace (v0.9.11)
+
 2004-09-06  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * {English|French}.lproj/default.strings: added localizations (v0.9.10)

diff --git a/SOGo/UI/Anais/GNUmakefile.preamble b/SOGo/UI/Anais/GNUmakefile.preamble
index ad674916b63af4d1435b92b785f05dfce346e4bf..662984f1fde956dac7985f672aa9c7031d42cb97 100644 (file)
--- a/SOGo/UI/Anais/GNUmakefile.preamble
+++ b/SOGo/UI/Anais/GNUmakefile.preamble
@@ -9,6 +9,8 @@ endif
 
 AnaisUI_LIB_DIRS += -L$(RELBUILD_DIR_libSOGoUI)
 
+ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+
 AnaisUI_BUNDLE_LIBS += \
        -lSOGoUI        \
        -lNGObjWeb      \

diff --git a/SOGo/UI/Anais/Version b/SOGo/UI/Anais/Version
index 4f666ec60f4d48758e29cd2f597c86dd80ee51ae..bbf2b7dc2cb2bd02bdc0b8bdbafe50366d16f1b8 100644 (file)
--- a/SOGo/UI/Anais/Version
+++ b/SOGo/UI/Anais/Version
@@ -1,3 +1,3 @@
 # $Id: Version 165 2004-08-05 17:55:50Z znek $
 
-SUBMINOR_VERSION:=10
+SUBMINOR_VERSION:=11

diff --git a/SOGo/UI/Common/GNUmakefile.preamble b/SOGo/UI/Common/GNUmakefile.preamble
index d823b5e5b2202ad4589332c15a33973a3e73fee6..a4d2bb3a90a65475ef3e4a3d6b2d43bd38d81ce3 100644 (file)
--- a/SOGo/UI/Common/GNUmakefile.preamble
+++ b/SOGo/UI/Common/GNUmakefile.preamble
@@ -11,6 +11,8 @@ endif
 
 CommonUI_LIB_DIRS += -L$(RELBUILD_DIR_libSOGoUI)
 
+ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+
 CommonUI_BUNDLE_LIBS += \
        -lSOGoUI        \
        -lNGObjWeb      \

diff --git a/SOGo/UI/Contacts/GNUmakefile.preamble b/SOGo/UI/Contacts/GNUmakefile.preamble
index b869cc788add3c24f3dd171adaf94c0eddb53fdd..065ed2adc8aec76119ffad54284063c0a5860b63 100644 (file)
--- a/SOGo/UI/Contacts/GNUmakefile.preamble
+++ b/SOGo/UI/Contacts/GNUmakefile.preamble
@@ -21,6 +21,8 @@ ContactsUI_LIB_DIRS +=                        \
        -L$(RELBUILD_DIR_libSOGoUI)     \
        -L$(RELBUILD_DIR_libSOGoLogic)
 
+ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+
 ContactsUI_BUNDLE_LIBS += \
        -lNGObjWeb                                      \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \

diff --git a/SOGo/UI/Mailer/GNUmakefile.preamble b/SOGo/UI/Mailer/GNUmakefile.preamble
index e282c47fc4490ba0e8d092e50e10e7ea284aee5e..5bc2f5c63260293897406dd3450e477863ec3169 100644 (file)
--- a/SOGo/UI/Mailer/GNUmakefile.preamble
+++ b/SOGo/UI/Mailer/GNUmakefile.preamble
@@ -21,6 +21,8 @@ MailerUI_LIB_DIRS +=                  \
        -L$(RELBUILD_DIR_libSOGoUI)     \
        -L$(RELBUILD_DIR_libSOGoLogic)
 
+ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+
 MailerUI_BUNDLE_LIBS += \
        -lNGObjWeb                                      \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index f305ffe26ee41c11505fbc955fe810c9a29a539f..2107cb96dd8a3f5352d6e6d3db843e99c9abdb6c 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-10  Helge Hess  <helge.hess@skyrix.com>
+
+       * UIxAppointmentPrintview.wox, UIxAppointmentView.wox: added missing
+         label prefix (v0.9.80)
+
 2004-09-09  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.79

diff --git a/SOGo/UI/Scheduler/GNUmakefile.preamble b/SOGo/UI/Scheduler/GNUmakefile.preamble
index 4400b925ff9eba2c73d213a90e395cd24a17921f..2338f66606327bc433e119809e95ad20c1be8bf9 100644 (file)
--- a/SOGo/UI/Scheduler/GNUmakefile.preamble
+++ b/SOGo/UI/Scheduler/GNUmakefile.preamble
@@ -21,6 +21,8 @@ SchedulerUI_LIB_DIRS +=                       \
        -L$(RELBUILD_DIR_libSOGoUI)     \
        -L$(RELBUILD_DIR_libSOGoLogic)
 
+ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+
 SchedulerUI_BUNDLE_LIBS += \
        -lNGObjWeb                                      \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \

diff --git a/SOGo/UI/Scheduler/UIxAppointmentPrintview.wox b/SOGo/UI/Scheduler/UIxAppointmentPrintview.wox
index 22e961acebef38f5b8bf6fb14ac3ec20837f69c5..92f9b70ebb9a8bf104503167068a82c06e46db68 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentPrintview.wox
+++ b/SOGo/UI/Scheduler/UIxAppointmentPrintview.wox
@@ -1,10 +1,12 @@
 <?xml version='1.0' standalone='yes'?>
-<var:component xmlns="http://www.w3.org/1999/xhtml"
-               xmlns:var="http://www.skyrix.com/od/binding"
-               xmlns:const="http://www.skyrix.com/od/constant"
-               xmlns:uix="OGo:uix"
-               className="UIxPrintPageFrame"
-               title="title"
+<var:component
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:uix="OGo:uix"
+  xmlns:label="OGo:label"
+  className="UIxPrintPageFrame"
+  title="title"
 >
   <table border="1" cellspacing="0" cellpadding="5" width="100%">
     <tr>

diff --git a/SOGo/UI/Scheduler/UIxAppointmentView.wox b/SOGo/UI/Scheduler/UIxAppointmentView.wox
index 73419b8157bb3c05a59b6bc5b470302065a86d88..f07ba56ea050992aa6f1af6d56b9b67fc60b4f5b 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentView.wox
+++ b/SOGo/UI/Scheduler/UIxAppointmentView.wox
@@ -1,10 +1,12 @@
 <?xml version='1.0' standalone='yes'?>
-<var:component xmlns="http://www.w3.org/1999/xhtml"
-               xmlns:var="http://www.skyrix.com/od/binding"
-               xmlns:const="http://www.skyrix.com/od/constant"
-               xmlns:uix="OGo:uix"
-               className="UIxPageFrame"
-               title="name"
+<var:component
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:uix="OGo:uix"
+  xmlns:label="OGo:label"
+  className="UIxPageFrame"
+  title="name"
 >
   <table cellspacing="0" cellpadding="5" width="100%">
     <tr>

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 1c73081602bc52a216ffd9b38b21ab1c6c57886a..b9748ee01e5f9b83e8186030ead59e3cdfdf2f65 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=79
+SUBMINOR_VERSION:=80
 
 # v0.9.70 requires libNGExtensions v4.3.107
 # v0.9.67 requires SOPE 4.3

diff --git a/SOGoLogic/GNUmakefile.preamble b/SOGoLogic/GNUmakefile.preamble
index 0bd280ab331607d200284fb1e67cb23d6f33a757..24c4f33e998d842cdab6f7d7174eb76a74d8e406 100644 (file)
--- a/SOGoLogic/GNUmakefile.preamble
+++ b/SOGoLogic/GNUmakefile.preamble
@@ -5,3 +5,5 @@ libSOGoLogic_LIBRARIES_DEPEND_UPON +=   \
        -lNGLdap                        \
        -lSaxObjC
 
+ADDITIONAL_LIB_DIRS += \
+        -L/usr/local/lib -L/usr/lib