From 60e2fe35906c84812bf04d71d504b2ad129ce07a Mon Sep 17 00:00:00 2001
From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Fri, 10 Sep 2004 14:11:49 +0000
Subject: [PATCH] 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
---
 SOGo/Main/GNUmakefile.preamble                   |  3 ++-
 SOGo/SoObjects/Appointments/GNUmakefile.preamble |  3 ++-
 SOGo/SoObjects/SOGo/GNUmakefile.preamble         |  1 +
 SOGo/UI/Anais/AnaisAttendeeSelector.wox          |  1 +
 SOGo/UI/Anais/ChangeLog                          |  4 ++++
 SOGo/UI/Anais/GNUmakefile.preamble               |  2 ++
 SOGo/UI/Anais/Version                            |  2 +-
 SOGo/UI/Common/GNUmakefile.preamble              |  2 ++
 SOGo/UI/Contacts/GNUmakefile.preamble            |  2 ++
 SOGo/UI/Mailer/GNUmakefile.preamble              |  2 ++
 SOGo/UI/Scheduler/ChangeLog                      |  5 +++++
 SOGo/UI/Scheduler/GNUmakefile.preamble           |  2 ++
 SOGo/UI/Scheduler/UIxAppointmentPrintview.wox    | 14 ++++++++------
 SOGo/UI/Scheduler/UIxAppointmentView.wox         | 14 ++++++++------
 SOGo/UI/Scheduler/Version                        |  2 +-
 SOGoLogic/GNUmakefile.preamble                   |  2 ++
 16 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/SOGo/Main/GNUmakefile.preamble b/SOGo/Main/GNUmakefile.preamble
index 2b113fa5..6d5bb9ac 100644
--- 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 f5fdadee..bdd52fe0 100644
--- 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 64fb213a..4de78edc 100644
--- 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 471a88e2..37e73dae 100644
--- 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 b88e7289..276ee6f9 100644
--- 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 ad674916..662984f1 100644
--- 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 4f666ec6..bbf2b7dc 100644
--- 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 d823b5e5..a4d2bb3a 100644
--- 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 b869cc78..065ed2ad 100644
--- 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 e282c47f..5bc2f5c6 100644
--- 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 f305ffe2..2107cb96 100644
--- 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 4400b925..2338f666 100644
--- 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 22e961ac..92f9b70e 100644
--- 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 73419b81..f07ba56e 100644
--- 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 1c730816..b9748ee0 100644
--- 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 0bd280ab..24c4f33e 100644
--- 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
-- 
2.39.5