Re: ORBit2 parallel install fixes



"R.I.P. Deaddog" <maddog linuxhall org> writes:
> 
> Thanks for explanation, I'll wait till then. But may I have a peek
> preview of your patch? Actually I am trying to create Mandrake gnome-2
> packages, and is exactly hindered by ORBit2 and bonobo-activation.

Sure, I'll attach my current orbit2 and bonobo-activation diffs. 

I also have patches against the whole dependency stack above those
though, and against gnome-libs 1.0, and the whole deal. ;-) So it's
kind of a mess until we get it all in CVS.

> Another point: should orbit-config-2 be removed altogether? Since
> gnome-2 should be a (almost) pkgconfig world, leaving unpatched
> orbit-config-2 can be misleading. IIRC glib and gtk+ is following
> this path.

Elliot dislikes pkg-config for some reason he hasn't explained to me,
so ORBit is keeping the -config scripts for now.
 
> PS Perhaps this discussion should be moved to gnome-packaging?

I think the patches here are necessary even from CVS/tarballs, it's
not really a packaging issue. I'm just making packages also, as a way
to test the file lists for conflicts, and so we have packages. Will
probably put out some Red Hat packages once I get them working.
(If nothing else they'll appear in Rawhide I suppose.)

Havoc

? ORBit-2.3.94.tar.gz
? build
? mychanges
? orbit2.patch
? libIDL/libIDL2.info
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/ORBit2/ChangeLog,v
retrieving revision 1.170
diff -u -p -u -r1.170 ChangeLog
--- ChangeLog	2001/09/11 13:28:57	1.170
+++ ChangeLog	2001/09/13 23:22:40
@@ -1,3 +1,43 @@
+2001-09-13  Havoc Pennington  <hp redhat com>
+
+	* ORBit-CosNaming-2.0.pc.in (Libs): remove flags inherited from
+	ORBit-2.0 package anyhow
+
+	* src/orb/GIOP/giop-private.h: IDL.h
+
+	* src/orb/orb-core/orbit-typelib.c: include IDL.h in here
+
+	* include/orbit/orb-core/orbit-small.h: remove libIDL inclusion
+
+	* ORBit-2.0.pc.in (orbit_idl): orbit-idl-2
+
+	* src/idl-compiler/Makefile.am: put orbit-idl2.h in
+	includedir/orbit-idl-2.0/orbit-idl2.h
+	
+	* test/Makefile.am (ior_decode_2_SOURCES): rename ior-decode to
+	ior-decode-2
+
+	* src/services/name/Makefile.am (libORBitservicesincludedir): put 
+	ORBitservices inside /usr/include/orbit to avoid ORBit1 conflicts
+	(lib_LIBRARIES): rename libname-server to libname-server-2
+
+	* src/orb/poa/Makefile.am (IDL): s/orbit-idl/orbit-idl-2/
+
+	* src/orb/orb-core/Makefile.am: s/orbit-idl/orbit-idl-2/
+
+	* Makefile.shared (IDL_COMPILER): s/orbit-idl/orbit-idl-2/
+
+	* src/idl-compiler/Makefile.am: s/orbit-idl/orbit-idl-2/
+
+	* src/services/name/Makefile.am: s/name-client/name-client-2/
+	s/orbit-name-server/orbit-name-server-2/
+
+	* src/orb/poa/Makefile.am (IDL_DIR): add IDL_DIR=./ to disable the 
+	implicit rule in Makefile.shared for IDL files in other
+	directories, because for some reason corba-ops.idl was getting
+	rebuilt, with the wrong IDL_FLAGS from this Makefile, thus
+	corba-ops.h ended up not existing. This is just a bad hack.
+
 2001-09-11  Mark McLoughlin <mark skynet ie>
 
 	* src/orb/orb-core/iop-profiles.c
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/Makefile.am,v
retrieving revision 1.8
diff -u -p -u -r1.8 Makefile.am
--- Makefile.am	2001/06/19 15:01:20	1.8
+++ Makefile.am	2001/09/13 23:22:40
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.3
 
 SUBDIRS=libIDL src include test docs
 
-bin_SCRIPTS=orbit-config
+bin_SCRIPTS=orbit2-config
 
 EXTRA_DIST=ORBit.spec.in ORBit2.m4 ORBit-2.0.pc.in ORBit-CosNaming-2.0.pc.in
 
@@ -17,3 +17,6 @@ m4data_DATA=ORBit2.m4
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = ORBit-2.0.pc ORBit-CosNaming-2.0.pc
+
+orbit2-config: orbit-config
+	cp -f orbit-config orbit2-config
\ No newline at end of file
Index: Makefile.shared
===================================================================
RCS file: /cvs/gnome/ORBit2/Makefile.shared,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile.shared
--- Makefile.shared	2001/09/04 09:00:58	1.3
+++ Makefile.shared	2001/09/13 23:22:40
@@ -1,4 +1,4 @@
-IDL_COMPILER = $(top_builddir)/src/idl-compiler/orbit-idl
+IDL_COMPILER = $(top_builddir)/src/idl-compiler/orbit-idl-2
 
 %.h %-stubs.c %-skels.c %-common.c %-imodule.c %-skelimpl.c: $(IDL_DIR)%.idl $(IDL_COMPILER)
 	-(rm -f $(*).h $(*)-stubs.c $(*)-skels.c $(*)-common.c $(*)-imodule.c $(*)-skelimpl.c || true) > /dev/null
Index: ORBit-2.0.pc.in
===================================================================
RCS file: /cvs/gnome/ORBit2/ORBit-2.0.pc.in,v
retrieving revision 1.6
diff -u -p -u -r1.6 ORBit-2.0.pc.in
--- ORBit-2.0.pc.in	2001/08/27 12:20:11	1.6
+++ ORBit-2.0.pc.in	2001/09/13 23:22:40
@@ -2,7 +2,7 @@ prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
-orbit_idl= bindir@/orbit-idl
+orbit_idl= bindir@/orbit-idl-2
 
 
 Name: ORBit-2.0
@@ -10,4 +10,4 @@ Description: High-performance CORBA Obje
 Version: @VERSION@
 Requires: glib-2.0 gmodule-2.0
 Libs: -L${libdir} -lORBit-2 @LINC_LIBS@ @LIBS@ -lm
-Cflags: -I${includedir} -DORBIT2=1
+Cflags: -I${includedir}/orbit-2.0 -DORBIT2=1
Index: ORBit-CosNaming-2.0.pc.in
===================================================================
RCS file: /cvs/gnome/ORBit2/ORBit-CosNaming-2.0.pc.in,v
retrieving revision 1.2
diff -u -p -u -r1.2 ORBit-CosNaming-2.0.pc.in
--- ORBit-CosNaming-2.0.pc.in	2001/06/19 02:45:21	1.2
+++ ORBit-CosNaming-2.0.pc.in	2001/09/13 23:22:40
@@ -8,5 +8,5 @@ Name: ORBit-CosNaming-2.0
 Description: High-performance CORBA Object Request Broker - Naming Service.
 Version: @VERSION@
 Requires: ORBit-2.0
-Libs: -L${libdir} -lORBitCosNaming-2
-Cflags: -I${includedir}
+Libs: -lORBitCosNaming-2
+Cflags:
Index: include/orbit/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/Makefile.am,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile.am
--- include/orbit/Makefile.am	2000/11/07 01:18:42	1.5
+++ include/orbit/Makefile.am	2001/09/13 23:22:40
@@ -1,6 +1,6 @@
 SUBDIRS=GIOP util orb-core poa dynamic
 
-orbitincludedir=$(includedir)/orbit
+orbitincludedir=$(includedir)/orbit-2.0/orbit
 orbitinclude_HEADERS=orbit.h orbit-config.h orbit-types.h
 
 BUILT_SOURCES=orbit-config.h
Index: include/orbit/GIOP/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/GIOP/Makefile.am,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile.am
--- include/orbit/GIOP/Makefile.am	2000/11/07 01:18:42	1.6
+++ include/orbit/GIOP/Makefile.am	2001/09/13 23:22:40
@@ -1,4 +1,4 @@
-GIOPincludedir=$(includedir)/orbit/GIOP
+GIOPincludedir=$(includedir)/orbit-2.0/orbit/GIOP
 
 GIOPinclude_HEADERS= \
 	giop-endian.h \
Index: include/orbit/dynamic/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/dynamic/Makefile.am,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile.am
--- include/orbit/dynamic/Makefile.am	2001/08/15 07:14:05	1.3
+++ include/orbit/dynamic/Makefile.am	2001/09/13 23:22:40
@@ -1,4 +1,4 @@
-dynamicincludedir=$(includedir)/orbit/dynamic
+dynamicincludedir=$(includedir)/orbit-2.0/orbit/dynamic
 dynamicinclude_HEADERS= \
 	dynamic.h	\
 	dynamic-defs.h
Index: include/orbit/orb-core/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/orb-core/Makefile.am,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile.am
--- include/orbit/orb-core/Makefile.am	2001/08/15 07:14:06	1.9
+++ include/orbit/orb-core/Makefile.am	2001/09/13 23:22:40
@@ -1,4 +1,4 @@
-orbcoreincludedir=$(includedir)/orbit/orb-core
+orbcoreincludedir=$(includedir)/orbit-2.0/orbit/orb-core
 orbcoreinclude_HEADERS= \
 	corba-environment-type.h	\
 	corba-ir.h			\
Index: include/orbit/orb-core/orbit-small.h
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/orb-core/orbit-small.h,v
retrieving revision 1.15
diff -u -p -u -r1.15 orbit-small.h
--- include/orbit/orb-core/orbit-small.h	2001/08/02 17:22:25	1.15
+++ include/orbit/orb-core/orbit-small.h	2001/09/13 23:22:40
@@ -4,7 +4,6 @@
 #ifndef CORBA_SMALL_H
 #define CORBA_SMALL_H 1
 
-#include <libIDL/IDL.h>
 #include <orbit/GIOP/giop.h>
 #include <orbit/orb-core/orbit-interface.h>
 
Index: include/orbit/poa/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/poa/Makefile.am,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile.am
--- include/orbit/poa/Makefile.am	2001/08/24 18:56:45	1.6
+++ include/orbit/poa/Makefile.am	2001/09/13 23:22:40
@@ -1,4 +1,4 @@
-poaincludedir=$(includedir)/orbit/poa
+poaincludedir=$(includedir)/orbit-2.0/orbit/poa
 poainclude_HEADERS= \
 	poa-types.h	\
 	poa.h		\
Index: include/orbit/util/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/util/Makefile.am,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile.am
--- include/orbit/util/Makefile.am	2000/11/07 01:18:44	1.4
+++ include/orbit/util/Makefile.am	2001/09/13 23:22:40
@@ -1,4 +1,4 @@
-utilincludedir=$(includedir)/orbit/util
+utilincludedir=$(includedir)/orbit-2.0/orbit/util
 
 utilinclude_HEADERS= \
 	basic_types.h \
Index: libIDL/ChangeLog
===================================================================
RCS file: /cvs/gnome/libIDL/ChangeLog,v
retrieving revision 1.119
diff -u -p -u -r1.119 ChangeLog
--- libIDL/ChangeLog	2001/09/03 15:40:41	1.119
+++ libIDL/ChangeLog	2001/09/13 23:22:41
@@ -1,3 +1,12 @@
+2001-09-11  Havoc Pennington  <hp redhat com>
+
+	* Makefile.am (libIDLincludedir): move headers to a versioned
+	subdir, and nuke libIDLConf.sh. rename libIDL-config to
+	libIDL-config-2
+
+	* libIDL-2.0.pc.in (Cflags): change -Iincludedir to
+	-Iincludedir/libIDL-2.0
+
 2001-09-03  Mark McLoughlin <mark skynet ie>
 
 	Fixes Bug #59824: the time to parse a union seemed to grow 
Index: libIDL/Makefile.am
===================================================================
RCS file: /cvs/gnome/libIDL/Makefile.am,v
retrieving revision 1.68
diff -u -p -u -r1.68 Makefile.am
--- libIDL/Makefile.am	2001/08/31 02:42:51	1.68
+++ libIDL/Makefile.am	2001/09/13 23:22:41
@@ -30,15 +30,16 @@ DISTCLEANFILES		= IDL.h
 
 EXTRA_DIST		= BUGS parser.y lexer.l \
 			  Makefile.msc README.win32 \
-			  libIDL.def libIDLConf.sh.in \
+			  libIDL.def \
 			  stamp-parser
 
-info_TEXINFOS		= libIDL.texi
-pkginclude_HEADERS	= IDL.h
+info_TEXINFOS		= libIDL2.texi
+libIDLincludedir        = $(includedir)/libIDL-2.0/libIDL
+libIDLinclude_HEADERS   = IDL.h
 lib_LTLIBRARIES		= libIDL-2.la
 noinst_PROGRAMS		= tstidl
 
-bin_SCRIPTS		= libIDL-config
+bin_SCRIPTS		= libIDL-config-2
 
 BUILT_SOURCES		= lexer.c parser.c parser.h IDL.h stamp-parser
 
@@ -50,23 +51,8 @@ libIDL_2_la_LDFLAGS	= -version-info $(LT
 tstidl_SOURCES		= tstidl.c
 tstidl_LDADD		= libIDL-2.la @GLIB_LIBS@
 
-confexecdir		= $(libdir)
-confexec_DATA		= libIDLConf.sh
-
-## We create libIDLConf.sh here and not from configure because we want
-## to get the paths expanded correctly.  Macros like srcdir are given
-## the value NONE in configure if the user doesn't specify them (this
-## is an autoconf feature, not a bug).
-
-libIDLConf.sh: libIDLConf.sh.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's?\ LIBIDL_LIBDIR\@?$(LIBIDL_LIBDIR)?g' \
-		-e 's?\ LIBIDL_INCLUDEDIR\@?$(LIBIDL_INCLUDEDIR)?g' \
-		-e 's?\ LIBIDL_LIBS\@?$(LIBIDL_LIBS)?g' \
-		-e 's?\ VERSION\@?$(VERSION)?g' \
-		< $(srcdir)/libIDLConf.sh.in > libIDLConf.tmp \
-		&& mv libIDLConf.tmp libIDLConf.sh
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA= libIDL-2.0.pc
 
+libIDL-config-2: libIDL-config
+	cp -f libIDL-config libIDL-config-2
Index: libIDL/libIDL-2.0.pc.in
===================================================================
RCS file: /cvs/gnome/libIDL/libIDL-2.0.pc.in,v
retrieving revision 1.1
diff -u -p -u -r1.1 libIDL-2.0.pc.in
--- libIDL/libIDL-2.0.pc.in	2001/06/23 13:29:48	1.1
+++ libIDL/libIDL-2.0.pc.in	2001/09/13 23:22:41
@@ -9,4 +9,4 @@ Description: IDL parsing library
 Version: @VERSION@
 Requires: glib-2.0
 Libs: -L${libdir} -lIDL-2
-Cflags: -I${includedir}
+Cflags: -I${includedir}/libIDL-2.0
Index: libIDL/libIDL.texi
===================================================================
RCS file: libIDL.texi
diff -N libIDL.texi
--- /tmp/cvssXc7DK	Thu Sep 13 19:22:41 2001
+++ /dev/null	Tue May  5 16:32:27 1998
@@ -1,359 +0,0 @@
-\input texinfo @c -*- mode: texinfo -*-
- setfilename libIDL.info
- settitle libIDL
- setchapternewpage odd
-
- ifinfo
- dircategory Libraries
- direntry
-* libIDL: (libIDL).     Interface Definition Language parsing library.
- end direntry
-
-Copyright 1998 Andrew T. Veliath
- end ifinfo
-
- titlepage
- title libIDL
- author Andrew T. Veliath
-
- page
- vskip 0pt plus 1filll
-Copyright @copyright{} 1998, 1999 Andrew T. Veliath
- end titlepage
-
- node Top, , , (dir)
- ifinfo
-This file documents the Interface Definition Language (IDL) parsing
-library, libIDL.
-
-This document applies to version 0.6 of libIDL.  It is still incomplete.
- end ifinfo
-
- menu
-* Overview::                  General overview.
-* Example::                   Simple example.
-* Reference::                 Data structure and function reference.
-
-* Function Index::            Index of available functions.
- end menu
-
- node Overview, Example, top, top
- chapter Overview
-libIDL is a library licensed under the GNU LGPL for creating trees of
-CORBA Interface Definition Language (IDL) files, which is a
-specification for defining portable interfaces.  libIDL was initially
-written for ORBit (the ORB from the GNOME project, and the primary
-means of libIDL distribution).  However, the functionality was
-designed to be as reusable and portable as possible.
-
-It is written in C, and the aim is to retain the ability to compile it
-on a system with a standard C compiler.  Preprocessed parser files are
-included so you are not forced to rebuild the parser, however an
-effort is made to keep the parser and lexer compatible with standard
-Unix yacc and lex (although bison and flex are more efficient, and are
-used for the preprocessed parsers in the distribution).
-
-With libIDL, you can parse an IDL file which will be automatically run
-through the C preprocessor (on systems with one available), and have
-detailed error and warning messages displayed.  On a compilation
-without errors, the tree is returned to the custom application.
-libIDL performs compilation phases from lexical analysis to nearly
-full semantic analysis with some optimizations, and will attempt to
-generate meaningful errors and warnings for invalid or deprecated IDL.
-
-libIDL exports functionality used to generate detailed conforming
-error and warning messages in gcc-like format, and also comes with a
-default backend to generate IDL into a file or string (useful for
-customized messages or comments in the output).  The IDL backend is
-complete enough that most generated IDL can be reparsed by libIDL
-without errors. libIDL returns separate syntax and namespace trees,
-and includes functionality to hide syntactical information from the
-primary tree, while keeping it accessible through the namespace for
-type information and name lookup.
-
-Optional extensions to standard IDL can be enabled using parse flags.
-These include node properties, embedded code fragments, and XPIDL.
-Nodes can also have declarations tags which assign particular
-attributions to certain IDL constructs to further facilitate custom
-applications.
-
- node Example, Reference, Overview, top
- chapter Usage
-The following C program using libIDL will parse an IDL file and print
-the Repository IDs of the interfaces in the IDL module.
-
- example
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <libIDL/IDL.h>
-
-gboolean
-print_repo_id (IDL_tree_func_data *tfd, gpointer user_data)
- {
-	char *repo_id = NULL;
-
-	if (IDL_NODE_TYPE (tfd->tree) == IDLN_INTERFACE)
-		repo_id = IDL_IDENT_REPO_ID (IDL_INTERFACE (tfd->tree).ident);
-
-	if (repo_id)
-		printf ("%s\n", repo_id);
-
-	return TRUE;
- }
-
-int 
-main (int argc, char *argv[])
- {
-	IDL_tree tree;
-	IDL_ns ns;
-	char *fn;
-	int rv;
-
-	if (argc < 2) @{
-		fprintf (stderr, "usage: %s <file>\n", argv[0]);
-		exit (1);
-	@}
-	fn = argv[1];
-
-	rv = IDL_parse_filename (fn, NULL, NULL, &tree, &ns, 0, IDL_WARNING1);
-
-	if (rv == IDL_ERROR || rv < 0) @{
-		if (rv < 0)
-			perror (fn);
-		exit (1);
-	@}
-	IDL_tree_walk_in_order (tree, print_repo_id, NULL);
-	IDL_ns_free (ns);
-	IDL_tree_free (tree);
-
-	return 0;
- }
- end example
-
- node Reference, Function Index, Example, top
- chapter Reference
-
- menu
-* Data Types::                Constructed data types used.
-* Functions::                 Functions provided.
-* Extensions::                Extensions provided to standard IDL.
-* Tree Structure::            The C IDL tree representation.
- end menu
-
- node Data Types, Functions, , Reference
- chapter Data Types
-
- itemize @bullet
- item
-IDL_tree
-
-A semi-opaque tree which encapsulates an IDL tree node.  Must be freed
-with IDL_tree_free (@pxref{Functions}).
-
- item
-IDL_ns
-
-A semi-opaque structure which encapsulates the IDL module namespace.
-Must be freed with IDL_ns_free (@pxref{Functions}).
-
- item
-IDL_msg_callback
-
-Defined as typedef int (*IDL_msg_callback)(int LEVEL, int NUM, int LINE,
-const char *NAME, const char *ERR).  A function of this type can be
-optionally passed to IDL_parse_filename to be called when a parse
-warning or error occurs.
-
- item
-IDL_tree_func
-
-Defined as typedef gboolean (*IDL_tree_func) (IDL_tree_func_data
-*TREE_FUNC_DATA, gpointer DATA).  A function of this type is passed to
-IDL_tree_walk_in_order to traverse the tree.  TREE_FUNC_DATA contains an
-up traversal hierarchy of the current traversal, as well as some state
-information.  The current node being processed is given by
-TREE_FUNC_DATA->tree.
-
- end itemize
-
- node Functions, Extensions, Data Types, Reference
- chapter Functions
-
- itemize @bullet
- item
-Function: int IDL_parse_filename (const char *NAME, const char *CPP_ARGS,
-IDL_msg_callback CALLBACK, IDL_tree *TREE, IDL_ns *NS, unsigned long FLAGS,
-int MAX_MESSAGE_LEVEL)
- findex IDL_parse_filename
-
-Parse an file containing an IDL definition into a parse tree.  Returns
-IDL_SUCCESS if successful, or IDL_ERROR if there was a parse error.  If
--1 is returned, errno will be set accordingly.  Usually, if IDL_ERROR is
-returned, all one needs to do is exit with a non-zero status, since
-libIDL will probably have made the reason for failure explictly known.
-
- itemize @minus
- item
-NAME: required, specifies the filename to be parsed.
-
- item
-CPP_ARGS: optional, if non-NULL, specifies extra arguments to pass to
-the C preprocessor.  The most common type of string would be in the form
-of -I<dir> to include additional directories for file inclusion search,
-or defines in the form of -D<define>=<value>.
-
- item
-CALLBACK: optional, if non-NULL, this function will be called when a
-warning or error is generated (@pxref{Data Types}).  If not given,
-warnings and errors will be sent to stderr.  All errors and warning,
-including callbacks, are subject to MAX_MESSAGE_LEVEL as described
-below.
-
- item
-TREE: optional, if non-NULL, points to an IDL_tree * to return the
-generated tree which must be freed with IDL_tree_free.  If NULL, the
-tree is freed and not returned.
-
- item
-NS: optional, if non-NULL, points to an IDL_ns * to return the namespace
-tree which must be freed with IDL_ns_free.  If NULL, the tree is freed
-and not returned.  If TREE is NULL, then NS must also be NULL, since the
-namespace is created as the AST is generated.
-
- item
-FLAGS: optional, specifies extra flags for parsing or 0.  The various
-flags are described here.
-
- item
-General Parse Flags
-
- itemize @minus
- item
-IDLF_NO_EVAL_CONST: instructs the parser not to evaluate constant expressions.
-
- item
-IDLF_COMBINE_REOPENED_MODULES: instructs the parser to combine modules
-defined later in the IDL code in the first module node in the tree.
-
- item
-IDLF_PREFIX_FILENAME: instructs the parser to prefix the filename to the
-namespace.
-
- item
-IDLF_IGNORE_FORWARDS: instructs the parser to not try to resolve and
-print messages for unresovled forward declarations.
-
- item
-IDLF_PEDANTIC: instructs the parser to display stricter errors and
-warnings.
-
- item
-IDLF_INHIBIT_TAG_ONLY: only tag inhibited nodes, do not remove them.
-Use IDL_tree_remove_inhibits to remove them at a later time.
-
- item
-IDLF_INHIBIT_INCLUDES: causes libIDL to automatically inhibit IDL trees
-in included files.
- end itemize
-
- item
-Syntax Extension Flags
-
- itemize @minus
- item
-IDLF_TYPECODES: understand the `TypeCode' keyword extension.
-
- item
-IDLF_XPIDL: enable XPIDL syntax.
-
- item
-IDLF_PROPERTIES: enable support for node properties.
-
- item
-IDLF_CODEFRAGS: enable support for embedded code fragments.
- end itemize
-
- item
-MAX_MESSAGE_LEVEL:
-
-This specifies the maximum message level to display.  Possible values
-are -1 for no messages, IDL_ERROR for errors only, or IDL_WARNING1,
-IDL_WARNING2 and IDL_WARNING3.  A typical value is IDL_WARNING1, which
-will limit verbosity.  IDL_WARNINGMAX is defined as the value in which
-all messages will be displayed.
-
- end itemize
-
- item
-Function: void IDL_tree_walk_in_order (IDL_tree ROOT, IDL_tree_func
-FUNC, gpointer DATA)
- findex IDL_tree_walk_in_order
-
-Walks an IDL_tree, calling FUNC for every node.  If the FUNC returns
-TRUE for a particular node, that particular node will also be traversed,
-if FALSE is returned, that particular node will be skipped, in the
-assumption that the function has taken care of it.
-
- itemize @minus
- item
-ROOT: required, specifies the IDL_tree to traverse.
-
- item
-FUNC: required, specifies the callback function (@pxref{Data Types}).
-
- item
-DATA: optional, specifies the callback data.
-
- end itemize
-
- item
-Function: void IDL_tree_free (IDL_tree TREE)
- findex IDL_tree_free
-
-Frees the memory associated with TREE.
-
- item
-Function: void IDL_ns_free (IDL_ns NS)
- findex IDL_ns_free
-
-Frees the memory associated with NS.
-
- end itemize
-
- node Extensions, Tree Structure, Functions, Reference
- chapter Extensions
-This page documents extensions to standard IDL which libIDL will
-understand.  To maintain portability, it is recommended that these
-extensions are only used with some sort of C preprocessor define so they
-can be conditionally omitted.
-
- itemize @bullet
- item
-__declspec (<spec>)
-
-This token assigns special attributions to particular IDL constructs.
-
- itemize @minus
- item
-inhibit
-
-If __declspec (inhibit) is placed before a definition or export, that
-module or interface definition will be removed from the tree.  The tree
-is only deleted when the IDL_ns component is freed, so it can be
-traversed from the namespace component for extended information, but
-will be omitted from the primary tree.
-
- end itemize
-
- end itemize
-
- node Tree Structure, , Extensions, Reference
- chapter Tree Structure
-
- node Function Index, , Reference, top
- chapter Function Index
- printindex fn
-
- contents
- bye
Index: libIDL/libIDL2.texi
===================================================================
RCS file: /cvs/gnome/libIDL/libIDL2.texi,v
retrieving revision 1.21
diff -u -p -u -r1.21 libIDL2.texi
--- libIDL/libIDL2.texi	1999/04/13 03:27:02	1.21
+++ libIDL/libIDL2.texi	2001/09/13 23:22:41
@@ -1,19 +1,19 @@
 \input texinfo @c -*- mode: texinfo -*-
- setfilename libIDL.info
- settitle libIDL
+ setfilename libIDL2.info
+ settitle libIDL2
 @setchapternewpage odd
 
 @ifinfo
 @dircategory Libraries
 @direntry
-* libIDL: (libIDL).     Interface Definition Language parsing library.
+* libIDL2: (libIDL2).     Interface Definition Language parsing library.
 @end direntry
 
 Copyright 1998 Andrew T. Veliath
 @end ifinfo
 
 @titlepage
- title libIDL
+ title libIDL2
 @author Andrew T. Veliath
 
 @page
Index: src/idl-compiler/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/src/idl-compiler/Makefile.am,v
retrieving revision 1.14
diff -u -p -u -r1.14 Makefile.am
--- src/idl-compiler/Makefile.am	2001/08/15 07:14:07	1.14
+++ src/idl-compiler/Makefile.am	2001/09/13 23:22:41
@@ -1,6 +1,5 @@
-bin_PROGRAMS=orbit-idl
+bin_PROGRAMS=orbit-idl-2
 
-includedir=$(prefix)/include
 orbitlibdir=$(libdir)/orbit-idl
 
 INCLUDES=-I$(top_builddir) -I$(top_builddir)/include \
@@ -9,13 +8,13 @@ INCLUDES=-I$(top_builddir) -I$(top_build
 	-DORBITLIBDIR="\"$(orbitlibdir)\"" \
 	-DDEBUG -DVERSION=\"$(ORBIT_VERSION)\"
 
-orbit_idl_DEPENDENCIES = $(top_builddir)/libIDL/libIDL-2.la
-orbit_idl_LDADD = \
+orbit_idl_2_DEPENDENCIES = $(top_builddir)/libIDL/libIDL-2.la
+orbit_idl_2_LDADD = \
 	$(top_builddir)/libIDL/libIDL-2.la \
 	@GLIB_LIBS@ \
 	-lpopt -lm
 
-orbit_idl_SOURCES=orbit-idl-main.c \
+orbit_idl_2_SOURCES=orbit-idl-main.c \
 		   orbit-idl-driver.c \
 		   orbit-idl-backends.c \
 		   orbit-idl-passes.c \
@@ -39,7 +38,8 @@ orbit_idl_SOURCES=orbit-idl-main.c \
 	orbit-idl-marshal.c \
 	orbit-idl-marshal.h
 
-include_DATA=orbit-idl2.h
+orbitidlincludedir=$(includedir)/orbit-2.0
+orbitidlinclude_HEADERS=orbit-idl2.h
 
 $(top_builddir)/libIDL/libIDL-2.la:
 	$(MAKE) -C $(top_builddir)/libIDL libIDL-2.la
Index: src/orb/GIOP/giop-private.h
===================================================================
RCS file: /cvs/gnome/ORBit2/src/orb/GIOP/giop-private.h,v
retrieving revision 1.8
diff -u -p -u -r1.8 giop-private.h
--- src/orb/GIOP/giop-private.h	2000/10/26 23:55:16	1.8
+++ src/orb/GIOP/giop-private.h	2001/09/13 23:22:41
@@ -5,6 +5,7 @@
 #include <orbit/orbit-config.h>
 #include <orbit/GIOP/giop.h>
 #include <linc/linc.h>
+#include <libIDL/IDL.h>
 
 void giop_send_buffer_init(void);
 void giop_recv_buffer_init(void);
Index: src/orb/orb-core/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/src/orb/orb-core/Makefile.am,v
retrieving revision 1.31
diff -u -p -u -r1.31 Makefile.am
--- src/orb/orb-core/Makefile.am	2001/09/04 18:05:29	1.31
+++ src/orb/orb-core/Makefile.am	2001/09/13 23:22:41
@@ -48,7 +48,7 @@ OPS_IDLOUT= corba-ops.h corba-ops-stubs.
 IFACE_IDLOUT=orbit-interface-common.c
 
 $(liborb_core_la_OBJECTS) : $(BUILT_SOURCES)
-IDL_COMPILER = $(top_builddir)/src/idl-compiler/orbit-idl
+IDL_COMPILER = $(top_builddir)/src/idl-compiler/orbit-idl-2
 
 IDL_FLAGS = -I$(top_srcdir)/src/idl/CORBA_PIDL			\
 	-I$(top_srcdir)/src/idl/CORBA				\
Index: src/orb/orb-core/orbit-typelib.c
===================================================================
RCS file: /cvs/gnome/ORBit2/src/orb/orb-core/orbit-typelib.c,v
retrieving revision 1.3
diff -u -p -u -r1.3 orbit-typelib.c
--- src/orb/orb-core/orbit-typelib.c	2001/08/17 11:04:21	1.3
+++ src/orb/orb-core/orbit-typelib.c	2001/09/13 23:22:41
@@ -4,6 +4,7 @@
 #include <orbit/orbit.h>
 #include <gmodule.h>
 #include <glib/garray.h>
+#include <libIDL/IDL.h>
 
 #include "orb-core-private.h"
 #include "orbit-debug.h"
Index: src/orb/poa/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/src/orb/poa/Makefile.am,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile.am
--- src/orb/poa/Makefile.am	2001/09/04 18:05:30	1.16
+++ src/orb/poa/Makefile.am	2001/09/13 23:22:41
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES=liborb-poa.la
 
-IDL = $(top_builddir)/src/idl-compiler/orbit-idl
+IDL = $(top_builddir)/src/idl-compiler/orbit-idl-2
 INCLUDES=-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_builddir)/src/orb/orb-core \
@@ -41,4 +41,5 @@ IDL_FLAGS= -I$(top_srcdir)/src/idl/CORBA
 	--define=Object=OObject --define=TypeCode=TTypeCode	\
         --showcpperrors
 IDL_FILES=poa-defs.idl
+IDL_DIR=./
 include $(top_srcdir)/Makefile.shared
Index: src/services/name/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/src/services/name/Makefile.am,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile.am
--- src/services/name/Makefile.am	2001/08/15 07:14:12	1.5
+++ src/services/name/Makefile.am	2001/09/13 23:22:41
@@ -1,10 +1,10 @@
-libORBitservicesincludedir = $(includedir)/ORBitservices
+libORBitservicesincludedir = $(includedir)/orbit-2.0/ORBitservices
 
 lib_LTLIBRARIES=libORBitCosNaming-2.la
 
-bin_PROGRAMS = name-client orbit-name-server
+bin_PROGRAMS = name-client-2 orbit-name-server-2
 
-lib_LIBRARIES = libname-server.a
+lib_LIBRARIES = libname-server-2.a
 
 libORBitCosNaming_2_la_SOURCES = 						\
 	CosNaming-common.c 						\
@@ -48,19 +48,19 @@ LDADDS = \
 $(srcdir)/name-client.c $(srcdir)/orbit-name-server.c \
 $(srcdir)/boot.c: CosNaming.h
 
-name_client_SOURCES = name-client.c name-support.c name-support.h
-name_client_LDFLAGS = $(FLAGS)
-name_client_DEPENDENCIES = $(DEPS) CosNaming.h
-name_client_LDADD = $(LDADDS)
+name_client_2_SOURCES = name-client.c name-support.c name-support.h
+name_client_2_LDFLAGS = $(FLAGS)
+name_client_2_DEPENDENCIES = $(DEPS) CosNaming.h
+name_client_2_LDADD = $(LDADDS)
 
-libname_server_a_SOURCES = orbit-name-server.c CosNaming-skels.c \
+libname_server_2_a_SOURCES = orbit-name-server.c CosNaming-skels.c \
 			   name-support.c name-support.h
-libname_server_a_DEPENDENCIES = $(DEPS) CosNaming.h
+libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h
 
-orbit_name_server_SOURCES = boot.c
-orbit_name_server_LDFLAGS = $(FLAGS)
-orbit_name_server_DEPENDENCIES = $(DEPS) CosNaming.h
-orbit_name_server_LDADD = libname-server.a $(LDADDS)
+orbit_name_server_2_SOURCES = boot.c
+orbit_name_server_2_LDFLAGS = $(FLAGS)
+orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h
+orbit_name_server_2_LDADD = libname-server-2.a $(LDADDS)
 
 EXTRA_DIST = CosNaming.idl
 
Index: test/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/test/Makefile.am,v
retrieving revision 1.13
diff -u -p -u -r1.13 Makefile.am
--- test/Makefile.am	2001/08/24 18:56:46	1.13
+++ test/Makefile.am	2001/09/13 23:22:41
@@ -4,7 +4,7 @@ INCLUDES=-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	$(LINC_CFLAGS) \
 	$(GLIB_CFLAGS)
-bin_PROGRAMS=ior-decode typelib-dump
+bin_PROGRAMS=ior-decode-2 typelib-dump
 noinst_PROGRAMS=test1 \
 	echo-client echo-server \
 	empty-client empty-server \
@@ -34,7 +34,7 @@ IDLOUT=test1-stubs.c test1-skels.c test1
 test1_SOURCES=test1.c $(IDLOUT)
 $(srcdir)/test1.c: test1.h
 
-ior_decode_SOURCES=ior-decode.c
+ior_decode_2_SOURCES=ior-decode.c
 
 typelib_dump_SOURCES=typelib-dump.c
 
? bonobo-activation-0.9.1.tar.gz
? mychanges
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/bonobo-activation/ChangeLog,v
retrieving revision 1.222
diff -u -p -u -r1.222 ChangeLog
--- ChangeLog	2001/09/13 17:50:12	1.222
+++ ChangeLog	2001/09/13 23:22:26
@@ -1,5 +1,11 @@
 2001-09-13  Havoc Pennington  <hp redhat com>
 
+	* utils/bonobo-activation-sysconf.c: fix more libxml headers
+
+	* server/Makefile.am (LDADD): change name of name server lib
+
+2001-09-13  Havoc Pennington  <hp redhat com>
+
 	* server/object-directory-load.c: include libxml/parser.h, not
 	just parser.h
 
Index: po/az.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/az.po,v
retrieving revision 1.6
diff -u -p -u -r1.6 az.po
--- po/az.po	2001/09/04 01:43:38	1.6
+++ po/az.po	2001/09/13 23:22:26
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OAF 0.5.1\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2001-02-08 16:17+0200\n"
 "Last-Translator: Vasif Ismailoglu MD <azerb_linux hotmail com>\n"
 "Language-Team: Azerbaijani Turkish \n"
Index: po/da.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/da.po,v
retrieving revision 1.13
diff -u -p -u -r1.13 da.po
--- po/da.po	2001/09/04 01:43:38	1.13
+++ po/da.po	2001/09/13 23:22:26
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf 0.2\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2001-03-09 21:13+01:00\n"
 "Last-Translator: Ole Laursen <olau hardworking dk>\n"
 "Language-Team: Danish <dansk klid dk>\n"
Index: po/de.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/de.po,v
retrieving revision 1.14
diff -u -p -u -r1.14 de.po
--- po/de.po	2001/09/04 01:43:38	1.14
+++ po/de.po	2001/09/13 23:22:26
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf (HEAD)\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2001-07-29 07:35+0200\n"
 "Last-Translator: Christian Meyer <chrisime gnome org>\n"
 "Language-Team: German <gnome-de gnome org>\n"
Index: po/el.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/el.po,v
retrieving revision 1.5
diff -u -p -u -r1.5 el.po
--- po/el.po	2001/09/04 01:43:38	1.5
+++ po/el.po	2001/09/13 23:22:26
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf 0.6.1\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2001-01-23 17:32:19+0900\n"
 "Last-Translator: Simos Xenitellis <simos hellug gr>\n"
 "Language-Team: Greek <nls tux hellug gr>\n"
Index: po/es.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/es.po,v
retrieving revision 1.9
diff -u -p -u -r1.9 es.po
--- po/es.po	2001/09/04 01:43:38	1.9
+++ po/es.po	2001/09/13 23:22:26
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2000-08-13 19:00+0100\n"
 "Last-Translator: Diego Sevilla <dsevilla um es>\n"
 "Language-Team: Spanish <es li org>\n"
Index: po/fi.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/fi.po,v
retrieving revision 1.4
diff -u -p -u -r1.4 fi.po
--- po/fi.po	2001/09/04 01:43:38	1.4
+++ po/fi.po	2001/09/13 23:22:26
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OAF\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2000-10-14 20:27+03:00\n"
 "Last-Translator: Pauli Virtanen <pauli virtanen saunalahti fi>\n"
 "Language-Team: Finnish <fi li org>\n"
Index: po/fr.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/fr.po,v
retrieving revision 1.13
diff -u -p -u -r1.13 fr.po
--- po/fr.po	2001/09/04 01:43:38	1.13
+++ po/fr.po	2001/09/13 23:22:26
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf 0.7.0\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2001-05-30 12:07+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox eikonex org>\n"
 "Language-Team: GNOME French Team <gnomefr gnomefr traduc org>\n"
Index: po/ga.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/ga.po,v
retrieving revision 1.6
diff -u -p -u -r1.6 ga.po
--- po/ga.po	2001/09/04 01:43:38	1.6
+++ po/ga.po	2001/09/13 23:22:26
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf CVS\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2000-08-24 20:00-0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry computer org>\n"
 "Language-Team: Irish <ga li org>\n"
Index: po/gl.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/gl.po,v
retrieving revision 1.8
diff -u -p -u -r1.8 gl.po
--- po/gl.po	2001/09/04 01:43:38	1.8
+++ po/gl.po	2001/09/13 23:22:26
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2000-10-29 15:03+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba pobox com>\n"
 "Language-Team: Galician <trasno ceu fi udc es>\n"
Index: po/hu.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/hu.po,v
retrieving revision 1.4
diff -u -p -u -r1.4 hu.po
--- po/hu.po	2001/09/04 01:43:38	1.4
+++ po/hu.po	2001/09/13 23:22:26
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf VERSION\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2000-11-08 18:24+0100\n"
 "Last-Translator: Szabolcs BAN <shooby gnome hu>\n"
 "Language-Team: Hungarian <hu li org>\n"
Index: po/it.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/it.po,v
retrieving revision 1.8
diff -u -p -u -r1.8 it.po
--- po/it.po	2001/09/04 01:43:38	1.8
+++ po/it.po	2001/09/13 23:22:26
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OAF 0.6.0\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2000-11-26 02:09+0100\n"
 "Last-Translator: Pier Luigi Fiorini <plfiorini users sourceforge net>\n"
 "Language-Team: Italiano <it li org>\n"
Index: po/ja.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/ja.po,v
retrieving revision 1.6
diff -u -p -u -r1.6 ja.po
--- po/ja.po	2001/09/04 01:43:38	1.6
+++ po/ja.po	2001/09/13 23:22:26
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf 0.5.1\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2000-10-10 15:50+09:00\n"
 "Last-Translator: Yukihiro Nakai <nakai gnome gr jp>\n"
 "Language-Team: Japanese <translation gnome gr jp>\n"
Index: po/ko.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/ko.po,v
retrieving revision 1.5
diff -u -p -u -r1.5 ko.po
--- po/ko.po	2001/09/04 01:43:38	1.5
+++ po/ko.po	2001/09/13 23:22:26
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf-CVS20000906\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2000-09-06 20:49+0900\n"
 "Last-Translator: Chideok Hwang <hwang mizi co kr>\n"
 "Language-Team: Korean <ko li org>\n"
Index: po/nl.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/nl.po,v
retrieving revision 1.4
diff -u -p -u -r1.4 nl.po
--- po/nl.po	2001/09/04 01:43:38	1.4
+++ po/nl.po	2001/09/13 23:22:26
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OAF\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2000-11-09 19:52+0100\n"
 "Last-Translator: Almer S. Tigelaar <almer1 dds nl>\n"
 "Language-Team: Dutch <nl li org>\n"
Index: po/nn.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/nn.po,v
retrieving revision 1.4
diff -u -p -u -r1.4 nn.po
--- po/nn.po	2001/09/04 01:43:38	1.4
+++ po/nn.po	2001/09/13 23:22:26
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf 0.6.5\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2001-06-25 18:55+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian (Nynorsk)\n"
Index: po/no.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/no.po,v
retrieving revision 1.8
diff -u -p -u -r1.8 no.po
--- po/no.po	2001/09/04 01:43:38	1.8
+++ po/no.po	2001/09/13 23:22:26
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf 0.6\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2001-07-07 12:06+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian <no li org>\n"
Index: po/pl.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/pl.po,v
retrieving revision 1.5
diff -u -p -u -r1.5 pl.po
--- po/pl.po	2001/09/04 01:43:38	1.5
+++ po/pl.po	2001/09/13 23:22:26
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2000-10-31 11:45+0100\n"
 "Last-Translator: GNOME PL Team <translators gnome pl>\n"
 "Language-Team: Polish <pl li org>\n"
Index: po/pt_BR.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/pt_BR.po,v
retrieving revision 1.11
diff -u -p -u -r1.11 pt_BR.po
--- po/pt_BR.po	2001/09/04 01:43:38	1.11
+++ po/pt_BR.po	2001/09/13 23:22:26
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf 0.5.1\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2000-10-15 13:18-02:00\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gdvieira zaz com br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br bazar conectiva com br>\n"
Index: po/ro.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/ro.po,v
retrieving revision 1.6
diff -u -p -u -r1.6 ro.po
--- po/ro.po	2001/09/04 01:43:38	1.6
+++ po/ro.po	2001/09/13 23:22:26
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf 0.6.3\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2001-01-23 11:22+0200\n"
 "Last-Translator: Dan Damian <dand dnttm ro>\n"
 "Language-Team: Romanian <gnome-ro pelican level7 ro>\n"
Index: po/ru.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/ru.po,v
retrieving revision 1.7
diff -u -p -u -r1.7 ru.po
--- po/ru.po	2001/09/04 01:43:38	1.7
+++ po/ru.po	2001/09/13 23:22:26
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2000-12-14 15:38+03:00\n"
 "Last-Translator: Valek Filippov <frob df ru>\n"
 "Language-Team: Russian <ru li org>\n"
Index: po/sk.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/sk.po,v
retrieving revision 1.6
diff -u -p -u -r1.6 sk.po
--- po/sk.po	2001/09/04 01:43:38	1.6
+++ po/sk.po	2001/09/13 23:22:26
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bonobo-activation 0.7.0.0\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2001-09-03 15:21CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky nenya ms mff cuni cz>\n"
 "Language-Team: Slovak <sk-i18n lists linux sk>\n"
Index: po/sl.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/sl.po,v
retrieving revision 1.19
diff -u -p -u -r1.19 sl.po
--- po/sl.po	2001/09/04 01:43:38	1.19
+++ po/sl.po	2001/09/13 23:22:26
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: balsa\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2000-09-04 21:51+0200\n"
 "Last-Translator: Andraz Tori <andraz tori1 guest arnes si>\n"
 "Language-Team: Slovenian <sl li org>\n"
Index: po/sv.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/sv.po,v
retrieving revision 1.9
diff -u -p -u -r1.9 sv.po
--- po/sv.po	2001/09/04 01:43:38	1.9
+++ po/sv.po	2001/09/13 23:22:26
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2001-07-17 21:27+0200\n"
 "Last-Translator: Christian Rose <menthos menthos com>\n"
 "Language-Team: Swedish <sv li org>\n"
Index: po/tr.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/tr.po,v
retrieving revision 1.10
diff -u -p -u -r1.10 tr.po
--- po/tr.po	2001/09/04 01:43:38	1.10
+++ po/tr.po	2001/09/13 23:22:26
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf 0.7\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2001-03-18 17:56+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun technologist com>\n"
 "Language-Team: Turkish <gnome-turk gnome org>\n"
Index: po/uk.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/uk.po,v
retrieving revision 1.7
diff -u -p -u -r1.7 uk.po
--- po/uk.po	2001/09/04 01:43:38	1.7
+++ po/uk.po	2001/09/13 23:22:26
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2000-08-16 18:00+0200\n"
 "Last-Translator: Yuri Syrota <rasta renome rovno ua>\n"
 "Language-Team: Ukrainian <linux linux org ua>\n"
Index: po/zh_TW.po
===================================================================
RCS file: /cvs/gnome/bonobo-activation/po/zh_TW.po,v
retrieving revision 1.2
diff -u -p -u -r1.2 zh_TW.po
--- po/zh_TW.po	2001/09/04 01:43:38	1.2
+++ po/zh_TW.po	2001/09/13 23:22:26
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf\n"
-"POT-Creation-Date: 2001-09-03 16:52-0700\n"
+"POT-Creation-Date: 2001-09-13 17:38-0400\n"
 "PO-Revision-Date: 2001-07-18 09:30+0800\n"
 "Last-Translator: Joe Man <trmetal yahoo com hk>\n"
 "Language-Team: chinese <zh li org>\n"
Index: server/Makefile.am
===================================================================
RCS file: /cvs/gnome/bonobo-activation/server/Makefile.am,v
retrieving revision 1.36
diff -u -p -u -r1.36 Makefile.am
--- server/Makefile.am	2001/08/23 00:06:36	1.36
+++ server/Makefile.am	2001/09/13 23:22:26
@@ -31,7 +31,7 @@ bonobo_activation_server_SOURCES=				\
 	server.h
 
 LDADD=../bonobo-activation/libbonobo-activation.la \
-	$(SERVER_LIBS) -lname-server @INTLLIBS@
+	$(SERVER_LIBS) -lname-server-2 @INTLLIBS@
 
 activation_client_SOURCES=client.c
 
Index: utils/bonobo-activation-sysconf.c
===================================================================
RCS file: /cvs/gnome/bonobo-activation/utils/bonobo-activation-sysconf.c,v
retrieving revision 1.5
diff -u -p -u -r1.5 bonobo-activation-sysconf.c
--- utils/bonobo-activation-sysconf.c	2001/07/31 16:16:14	1.5
+++ utils/bonobo-activation-sysconf.c	2001/09/13 23:22:26
@@ -26,9 +26,9 @@
 #include "config.h"
 #include <string.h>
 #include <glib.h>
-#include <tree.h>        /* gnome-xml */
-#include <parser.h>      /* gnome-xml */
-#include <xmlmemory.h>   /* gnome-xml */
+#include <libxml/tree.h>   
+#include <libxml/parser.h>  
+#include <libxml/xmlmemory.h>
 #include <popt.h>        /* popt :) */
 
 #include <bonobo-activation/bonobo-activation.h>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]