--- orbit2-2.14.10.orig/include/Makefile.in +++ orbit2-2.14.10/include/Makefile.in @@ -126,6 +126,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/include/orbit/orbit-config.h +++ orbit2-2.14.10/include/orbit/orbit-config.h @@ -5,7 +5,7 @@ #ifndef ORBIT_MAJOR_VERSION #define ORBIT_MAJOR_VERSION (2) #define ORBIT_MINOR_VERSION (14) -#define ORBIT_MICRO_VERSION (10) +#define ORBIT_MICRO_VERSION (9) #endif #define ORBIT_IMPLEMENTS_IS_A 1 --- orbit2-2.14.10.orig/include/orbit/GIOP/Makefile.in +++ orbit2-2.14.10/include/orbit/GIOP/Makefile.in @@ -114,6 +114,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/include/orbit/dynamic/Makefile.in +++ orbit2-2.14.10/include/orbit/dynamic/Makefile.in @@ -127,6 +127,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/include/orbit/orb-core/Makefile.in +++ orbit2-2.14.10/include/orbit/orb-core/Makefile.in @@ -127,6 +127,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/include/orbit/Makefile.in +++ orbit2-2.14.10/include/orbit/Makefile.in @@ -137,6 +137,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/include/orbit/util/Makefile.in +++ orbit2-2.14.10/include/orbit/util/Makefile.in @@ -127,6 +127,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/include/orbit/poa/Makefile.in +++ orbit2-2.14.10/include/orbit/poa/Makefile.in @@ -127,6 +127,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/ChangeLog +++ orbit2-2.14.10/ChangeLog @@ -1,101 +1,5 @@ -============================ 2.14.10 ======================= - -2007-10-15 Kjartan Maraas - - * docs/devel/Makefile.am: Dist more docs. - -2007-10-15 Kjartan Maraas - - * NEWS: Update for 2.14.10. - * src/orb/GIOP/giop-connection.c: (giop_connection_initiate): - * src/orb/poa/poa.c: Compiler warning fixes - -2007-09-27 Tor Lillqvist - - * src/orb/GIOP/giop-recv-buffer.c (giop_recv_buffer_get): Fix - typo: Pass correct pointer to giop_connection_unref(). (#480770) - -2007-09-25 Jules Colding - - * test/timeout-server.c (main): Do not write more into the - IOR file than really needed - - * test/timeout-client.c (main): Fix memory leaks - (object_ref_from_file): Do not allocate more memory than - really needed - -2007-09-24 Jules Colding - - * ORBit2: Add G_OBJECT() casts to all cases of g_unref_object() - - * ORBit2: Removed ORBIT_DEBUG_CFLAGS from all Makefile.am's. - Instead appended the debug flags directly to CFLAGS in - configure.in. The debug flags would otherwise be masked by - CFLAGS and have next to no effect in terms of debug symbols. - - * ORBit2: It is now possible to use the ORBNetID command - line option to specify a specific NIC to be used by ORBit2 - when creating externally visible objects. This is supported - by adding LINK_NET_ID_IS_CUSTOM to the LinkNetIdType enum - type. Previously the first NIC which wasn't "127.0.0.1" was - unconditionally used. - - The ORBNetID argument must be of a format that is compatible - to the address format that is returned by inet_ntoa(3) on a - return value of the SIOCGIFCONF ioctl. A specific IP address, - such as '192.168.2.45', would be an acceptable format. - - The previous behavior of just using the first non "127.0.0.1" - NIC is maintained if the net id isn't LINK_NET_ID_IS_CUSTOM. - - If, on the other hand, the net id is LINK_NET_ID_IS_CUSTOM then - the used NIC will be: - - 1) The net id specified but only if it is found in the interface - list as returned by SIOCGIFCONF. - - 2) If the requested net id isn't found in the list then it will - be the last non "0.0.0.0" addressed NIC in said list. This may - or may not be "127.0.0.1". - - I considered if we should use assert() if the specified net id - isn't found or if it is invalid, but I decided against it on the - grounds that not doing so is more in line with current behavior. - - * src/orb/orb-core/corba-orb.c (ORBit_ORB_start_servers): - Support the new LINK_NET_ID_IS_CUSTOM functionality - -2007-09-24 Jules Colding - - * src/orb/orb-core/orbit-small.c (async_recv_cb): - Set CORBA_TIMEOUT exception if state is LINK_TIMEOUT - -2007-09-22 Jules Colding - - * configure.in: Added -O0 to ORBIT_DEBUG_CFLAGS. - TODO: Still need to fix the debug CFLAGS so that they are - effective in the Makefile.am's. - - * src/orb/GIOP/giop-connection.c (giop_connection_close): - Added a check for the link being in LINK_TIMEOUT state. Not - doing this would result in link_connection_finalize() being - invoked twice for the same link. We can not have that... - - * src/orb/GIOP/giop-recv-buffer.c (giop_recv_buffer_get): - Use giop_connection_unref() instead of linc_connection_unref() - as we really are manipulating a GIOPConnection not a LinkConnection. - (giop_timeout): Use the giop_connection_(un)ref() functions. Same - reasoning as above. - Do not call link_connection_state_changed() or giop_incoming_signal_T() - if the link is in the LINK_DISCONNECTED state. Doing so would make - link_connection_state_changed() very unhappy (invalid read of size 1). - ==================== ORBit2-2.14.9 ===================== -2007-09-17 Kjartan Maraas - - * test/Makefile.am: Clean iorfile to make distcheck happy. - 2007-08-31 Jules Colding * src/orb/GIOP/giop-recv-buffer.c (giop_recv_buffer_get): Make sure --- orbit2-2.14.10.orig/configure.in +++ orbit2-2.14.10/configure.in @@ -1,6 +1,6 @@ m4_define([orbit_major_version],[2]) m4_define([orbit_minor_version],[14]) -m4_define([orbit_micro_version],[10]) +m4_define([orbit_micro_version],[9]) m4_define([orbit_version],[orbit_major_version.orbit_minor_version.orbit_micro_version]) dnl Process this file with autoconf to produce a configure script. @@ -104,7 +104,7 @@ dnl --enable-debug=(yes|minimum|no) AC_ARG_ENABLE(debug, [ --enable-debug=[no/yes] turn on debugging [default=no]],,enable_debug=minimum) if test "x$enable_debug" = "xyes"; then - ORBIT_DEBUG_CFLAGS="-ggdb -O0 -DG_ENABLE_DEBUG" + ORBIT_DEBUG_CFLAGS="-ggdb -DG_ENABLE_DEBUG" else if test "x$enable_debug" = "xno"; then ORBIT_DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" @@ -112,6 +112,7 @@ ORBIT_DEBUG_CFLAGS="" fi fi +AC_SUBST(ORBIT_DEBUG_CFLAGS) AC_ARG_ENABLE(purify, [ --enable-purify be clean for memory debuggers], enable_purify=yes, enable_purify=no) if test z$enable_purify = zyes; then @@ -321,7 +322,6 @@ dnl --------- set additional gcc flags to catch errors --------- dnl AX_CFLAGS_GCC_OPTION(-Werror-implicit-function-declaration) -CFLAGS="$CFLAGS $ORBIT_DEBUG_CFLAGS" AC_SUBST(CFLAGS) --- orbit2-2.14.10.orig/NEWS +++ orbit2-2.14.10/NEWS @@ -1,16 +1,3 @@ -ORBit2-2.14.10 - - - bug fixes - + It is now possible to use the ORBNetID command - line option to specify a specific NIC to be used by ORBit2 - when creating externally visible objects. This is supported - by adding LINK_NET_ID_IS_CUSTOM to the LinkNetIdType enum - type. Previously the first NIC which wasn't "127.0.0.1" was - unconditionally used. (Jules Colding) - + More GIOP fixing (Jules Colding) - + Build and debugging fixes (Jules Colding) - + Fix a crash (Tor Lillqvist) - ORBit2-2.14.9 * bug fixes --- orbit2-2.14.10.orig/linc2/include/linc/Makefile.in +++ orbit2-2.14.10/linc2/include/linc/Makefile.in @@ -118,6 +118,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/linc2/include/linc/linc-protocol.h +++ orbit2-2.14.10/linc2/include/linc/linc-protocol.h @@ -74,8 +74,7 @@ LINK_NET_ID_IS_LOCAL, LINK_NET_ID_IS_SHORT_HOSTNAME, LINK_NET_ID_IS_FQDN, - LINK_NET_ID_IS_IPADDR, - LINK_NET_ID_IS_CUSTOM + LINK_NET_ID_IS_IPADDR } LinkNetIdType; @@ -85,7 +84,6 @@ char *link_get_tmpdir (void); void link_set_tmpdir (const char *dir); void link_use_local_hostname (LinkNetIdType use); -void link_set_local_hostname (const char *host_id); const char* link_get_local_hostname (void); G_END_DECLS --- orbit2-2.14.10.orig/linc2/include/Makefile.in +++ orbit2-2.14.10/linc2/include/Makefile.in @@ -126,6 +126,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/linc2/ChangeLog +++ orbit2-2.14.10/linc2/ChangeLog @@ -1,22 +1,3 @@ -======================== 2.14.10 ========================== - -2007-09-24 Jules Colding - - * include/linc/linc-protocol.h (enum): LinkNetIdType expanded - with one more value. This value will request that ORBit2 is using - a specific NIC when creating network visible objects. - - * src/linc-protocols.c (get_netid): Support more than 2 NICs. - Implement the new LINK_NET_ID_IS_CUSTOM functionality. - (link_set_local_hostname): Will set the requested NIC as the - one that is chosen when an object is bound to an interface. - -2007-09-22 Jules Colding - - * src/linc-connection.c (link_connection_finalize): - Remove g_assert() on the non-presence of cnx in cnx_list. The - cnx might not yet have gone. - ======================== ORBit2-2.14.9 ==================== 2007-08-14 Jules Colding --- orbit2-2.14.10.orig/linc2/Makefile.in +++ orbit2-2.14.10/linc2/Makefile.in @@ -127,6 +127,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/linc2/src/linc-connection.c +++ orbit2-2.14.10/linc2/src/linc-connection.c @@ -66,7 +66,7 @@ link_connection_unref_T_ (gpointer cnx) { g_assert (((GObject *)cnx)->ref_count > 1); - g_object_unref (G_OBJECT (cnx)); + g_object_unref (cnx); } static void @@ -75,7 +75,7 @@ gboolean tail_unref = FALSE; if (((GObject *)cnx)->ref_count > 1) - g_object_unref (G_OBJECT (cnx)); + g_object_unref (cnx); else { cnx_list = g_list_remove (cnx_list, cnx); @@ -100,7 +100,7 @@ d_printf ("Exec defered unref on %p\n", cmd->cnx); if (immediate) /* In I/O thread - with just 1 ref left */ - g_object_unref (G_OBJECT (cmd->cnx)); + g_object_unref (cmd->cnx); else { CNX_AND_LIST_LOCK (cmd->cnx); link_connection_unref_unlock (cmd->cnx); @@ -1272,6 +1272,10 @@ if (cnx->timeout_source_id) link_io_thread_remove_timeout (cnx->timeout_source_id); +#ifdef G_ENABLE_DEBUG + g_assert (g_list_find(cnx_list, cnx) == NULL); +#endif + parent_class->finalize (obj); } --- orbit2-2.14.10.orig/linc2/src/linc-protocols.c +++ orbit2-2.14.10/linc2/src/linc-protocols.c @@ -31,7 +31,6 @@ static char *link_tmpdir = NULL; static LinkNetIdType use_local_host = LINK_NET_ID_IS_FQDN; -static const char *fixed_host_net_id = NULL; /* * make_local_tmpdir: @@ -135,12 +134,6 @@ #if defined(AF_INET) || defined(AF_INET6) || defined (AF_UNIX) -/* hopefully a sufficiently large default NIC count */ -#ifdef DEFAULT_LINC2_IFNUM -#undef DEFAULT_LINC2_IFNUM -#endif -#define DEFAULT_LINC2_IFNUM (32) - static char * get_netid(LinkNetIdType which, char *buf, @@ -149,72 +142,44 @@ if (LINK_NET_ID_IS_LOCAL == which) return strncpy(buf, "localhost", len); - if ((LINK_NET_ID_IS_IPADDR == which) - || (LINK_NET_ID_IS_CUSTOM == which)) { + if (LINK_NET_ID_IS_IPADDR == which) { #ifndef G_OS_WIN32 struct sockaddr_in *adr = NULL; - struct ifreq *my_ifreqs = NULL; - struct ifconf my_ifconf = { 0 }; - int sock = -1; - int num = 0; - int i = 0; + struct ifreq my_ifreqs[2]; + struct ifconf my_ifconf; + int num, i, sock; + my_ifconf.ifc_len = sizeof(my_ifreqs); + my_ifconf.ifc_req = my_ifreqs; sock = socket(AF_INET,SOCK_DGRAM,0); if (-1 == sock) goto out; -#ifdef SIOCGIFNUM - i = ioctl(sock, SIOCGIFNUM, &num); - if ((0 > i) || !num) { - close(sock); - goto out; - } -#else - num = DEFAULT_LINC2_IFNUM; -#endif - my_ifconf.ifc_len = sizeof(struct ifreq) * num; - my_ifconf.ifc_req = (struct ifreq*)malloc(my_ifconf.ifc_len); - if (!my_ifconf.ifc_req) { - close(sock); - goto out; - } + if (ioctl(sock,SIOCGIFCONF,&my_ifconf) < 0) { close(sock); - free(my_ifconf.ifc_req); goto out; } close(sock); - my_ifreqs = my_ifconf.ifc_req; + num = my_ifconf.ifc_len / sizeof(struct ifreq); + if (!num) + goto out; + for (i = 0; i < num; i++) { adr = (struct sockaddr_in *)&my_ifreqs[i].ifr_ifru.ifru_addr; - if (fixed_host_net_id) { - if (!strcmp(fixed_host_net_id, inet_ntoa(adr->sin_addr))) - break; - } else { - if (strcmp("127.0.0.1", inet_ntoa(adr->sin_addr))) - break; - } - if (!strcmp("0.0.0.0", inet_ntoa(adr->sin_addr))) { - if (i) - adr = (struct sockaddr_in *)&my_ifreqs[--i].ifr_ifru.ifru_addr; + if (strcmp("127.0.0.1", inet_ntoa(adr->sin_addr))) break; - } } - strncpy(buf, (const char*)inet_ntoa(adr->sin_addr), len); - free(my_ifconf.ifc_req); - /* will be 127.0.0.1 anyway, if no other address is defined... */ - return buf; + return strncpy(buf, (const char*)inet_ntoa(adr->sin_addr), len); #else SOCKET sock; DWORD nbytes; /* Let's hope 20 interfaces is enough. There doesn't * seem to be any way to get information about how * many interfaces there are. - * - * [Jules] Using the ifnum define instead... */ - INTERFACE_INFO interfaces[DEFAULT_LINC2_IFNUM]; + INTERFACE_INFO interfaces[20]; int i; sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP); @@ -317,16 +282,6 @@ use_local_host = use; } -void -link_set_local_hostname (const char *host_id) -{ - if (!host_id || !strlen(host_id)) - return; - - fixed_host_net_id = host_id; - use_local_host = LINK_NET_ID_IS_CUSTOM; -} - /* * True if succeeded in mapping, else false. */ --- orbit2-2.14.10.orig/linc2/src/Makefile.in +++ orbit2-2.14.10/linc2/src/Makefile.in @@ -148,6 +148,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ @@ -233,6 +234,7 @@ -I$(top_srcdir)/linc2/include \ $(LINC_CFLAGS) \ $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ -DG_DISABLE_DEPRECATED \ -D_GNU_SOURCE --- orbit2-2.14.10.orig/linc2/src/Makefile.am +++ orbit2-2.14.10/linc2/src/Makefile.am @@ -13,6 +13,7 @@ -I$(top_srcdir)/linc2/include \ $(LINC_CFLAGS) \ $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ -DG_DISABLE_DEPRECATED \ -D_GNU_SOURCE --- orbit2-2.14.10.orig/linc2/test/Makefile.in +++ orbit2-2.14.10/linc2/test/Makefile.in @@ -136,6 +136,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/linc2/test/test-linc.c +++ orbit2-2.14.10/linc2/test/test-linc.c @@ -355,7 +355,7 @@ link_main_iteration (FALSE); - g_object_unref (G_OBJECT (server)); + g_object_unref (server); g_assert (server == NULL); test_server_cnx_type = 0; @@ -543,7 +543,7 @@ /* FIXME: this is horribly difficult to regression test properly: we fail */ g_assert (link_connection_wait_connected (client) == LINK_CONNECTED); - g_object_unref (G_OBJECT (server)); + g_object_unref (server); link_connection_unref (client); } --- orbit2-2.14.10.orig/Makefile.in +++ orbit2-2.14.10/Makefile.in @@ -166,6 +166,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/ORBit.spec +++ orbit2-2.14.10/ORBit.spec @@ -2,7 +2,7 @@ %define __spec_install_post /usr/lib/rpm/brp-compress Summary: A high-performance CORBA Object Request Broker. Name: ORBit2 -Version: 2.14.10 +Version: 2.14.9 Release: 1 Source: %{name}-%{version}.tar.gz Group: System Environment/Daemons --- orbit2-2.14.10.orig/src/idl-compiler/Makefile.in +++ orbit2-2.14.10/src/idl-compiler/Makefile.in @@ -158,6 +158,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/src/idl/CORBA/Makefile.in +++ orbit2-2.14.10/src/idl/CORBA/Makefile.in @@ -114,6 +114,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/src/idl/CORBA_PIDL/Makefile.in +++ orbit2-2.14.10/src/idl/CORBA_PIDL/Makefile.in @@ -114,6 +114,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/src/idl/interop/Makefile.in +++ orbit2-2.14.10/src/idl/interop/Makefile.in @@ -114,6 +114,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/src/idl/misc/Makefile.in +++ orbit2-2.14.10/src/idl/misc/Makefile.in @@ -114,6 +114,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/src/idl/Makefile.in +++ orbit2-2.14.10/src/idl/Makefile.in @@ -126,6 +126,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/src/services/imodule/Makefile.in +++ orbit2-2.14.10/src/services/imodule/Makefile.in @@ -155,6 +155,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/src/services/name/Makefile.in +++ orbit2-2.14.10/src/services/name/Makefile.in @@ -186,6 +186,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/src/services/Makefile.in +++ orbit2-2.14.10/src/services/Makefile.in @@ -126,6 +126,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/src/Makefile.in +++ orbit2-2.14.10/src/Makefile.in @@ -126,6 +126,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/src/orb/include/Makefile.in +++ orbit2-2.14.10/src/orb/include/Makefile.in @@ -114,6 +114,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/src/orb/GIOP/giop-connection.c +++ orbit2-2.14.10/src/orb/GIOP/giop-connection.c @@ -38,8 +38,7 @@ void giop_connection_close (GIOPConnection *cnx) { - if ((cnx->parent.status == LINK_DISCONNECTED) - || (cnx->parent.status == LINK_TIMEOUT)) + if (cnx->parent.status == LINK_DISCONNECTED) return; if (cnx->parent.status == LINK_CONNECTED && @@ -182,7 +181,7 @@ link_connection_initiate (giop_connection_get_type (), proto_name, remote_host_info, - remote_serv_info, (LinkConnectionOptions)options, + remote_serv_info, options, "orb", orb_data, "version", (guint) giop_version, NULL); --- orbit2-2.14.10.orig/src/orb/GIOP/giop-recv-buffer.c +++ orbit2-2.14.10/src/orb/GIOP/giop-recv-buffer.c @@ -739,7 +739,7 @@ link_io_thread_remove_timeout (ent->cnx->parent.timeout_source_id); ent->cnx->parent.timeout_source_id = 0; ent->cnx->parent.timeout_status = LINK_TIMEOUT_NO; - giop_connection_unref (ent->cnx); // we remove the source so we must unref the connection + link_connection_unref (&ent->cnx->parent); // we remove the source so we must unref the connection } else if (ent->cnx->parent.timeout_status == LINK_TIMEOUT_YES) *timeout = TRUE; g_mutex_unlock (ent->cnx->parent.timeout_mutex); @@ -1363,17 +1363,11 @@ giop_timeout (gpointer data) { gboolean retv = FALSE; - GIOPConnection *cnx = (GIOPConnection*)data; - LinkConnection *lcnx = LINK_CONNECTION (cnx); + LinkConnection *lcnx = (LinkConnection*)data; GIOPThread *tdata = (GIOPThread *)lcnx->tdata; g_assert (lcnx->timeout_mutex); - if (lcnx->status == LINK_DISCONNECTED) { - giop_connection_unref (cnx); // we remove the source so we must unref cnx - goto out; - } - g_mutex_lock (lcnx->timeout_mutex); if (lcnx->timeout_status == LINK_TIMEOUT_UNKNOWN) { lcnx->timeout_source_id = 0; @@ -1391,7 +1385,7 @@ giop_incoming_signal_T (tdata, GIOP_CLOSECONNECTION); g_mutex_unlock (tdata->lock); /* ent_lock */ - giop_connection_unref (cnx); // we remove the source so we must unref cnx + link_connection_unref (lcnx); // we remove the source so we must unref lcnx out: return retv; @@ -1412,7 +1406,7 @@ if (lcnx->timeout_source_id) goto out; - giop_connection_ref (cnx); // to be unref'ed by the one who removes the timeout source + link_connection_ref (lcnx); // to be unref'ed by the one who removes the timeout source if (!lcnx->timeout_mutex) lcnx->timeout_mutex = g_mutex_new (); @@ -1423,7 +1417,7 @@ lcnx->tdata = giop_thread_self (); - lcnx->timeout_source_id = link_io_thread_add_timeout (lcnx->timeout_msec, giop_timeout, (gpointer)cnx); + lcnx->timeout_source_id = link_io_thread_add_timeout (lcnx->timeout_msec, giop_timeout, (gpointer)lcnx); out: g_static_mutex_unlock (&static_mutex); --- orbit2-2.14.10.orig/src/orb/GIOP/Makefile.in +++ orbit2-2.14.10/src/orb/GIOP/Makefile.in @@ -134,6 +134,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ @@ -215,6 +216,7 @@ -I$(top_builddir)/include \ -DORBIT2_INTERNAL_API \ $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ $(LOCAL_LINC_CFLAGS) \ $(ORBIT_CFLAGS) --- orbit2-2.14.10.orig/src/orb/GIOP/Makefile.am +++ orbit2-2.14.10/src/orb/GIOP/Makefile.am @@ -3,6 +3,7 @@ -I$(top_builddir)/include \ -DORBIT2_INTERNAL_API \ $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ $(LOCAL_LINC_CFLAGS) \ $(ORBIT_CFLAGS) --- orbit2-2.14.10.orig/src/orb/dynamic/Makefile.in +++ orbit2-2.14.10/src/orb/dynamic/Makefile.in @@ -135,6 +135,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ @@ -224,6 +225,7 @@ -I$(top_builddir)/include/orbit/dynamic \ -DORBIT2_INTERNAL_API \ $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ $(LOCAL_LINC_CFLAGS) \ $(ORBIT_CFLAGS) --- orbit2-2.14.10.orig/src/orb/dynamic/Makefile.am +++ orbit2-2.14.10/src/orb/dynamic/Makefile.am @@ -12,6 +12,7 @@ -I$(top_builddir)/include/orbit/dynamic \ -DORBIT2_INTERNAL_API \ $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ $(LOCAL_LINC_CFLAGS) \ $(ORBIT_CFLAGS) --- orbit2-2.14.10.orig/src/orb/orb-core/orbit-small.c +++ orbit2-2.14.10/src/orb/orb-core/orbit-small.c @@ -1149,11 +1149,6 @@ CORBA_exception_set_system (ev, ex_CORBA_COMM_FAILURE, aqe->completion_status); - if (aqe->mqe.cnx && - aqe->mqe.cnx->parent.status == LINK_TIMEOUT) - CORBA_exception_set_system (ev, ex_CORBA_TIMEOUT, - aqe->completion_status); - if (aqe->fn) aqe->fn (aqe->obj, aqe->m_data, aqe, aqe->user_data, ev); --- orbit2-2.14.10.orig/src/orb/orb-core/Makefile.in +++ orbit2-2.14.10/src/orb/orb-core/Makefile.in @@ -160,6 +160,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ @@ -248,6 +249,7 @@ -DORBIT_TYPELIB_DIR=\""$(TYPELIB_DIR)"\" \ -DORBIT2_INTERNAL_API \ $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ $(LOCAL_LINC_CFLAGS) \ $(ORBIT_CFLAGS) --- orbit2-2.14.10.orig/src/orb/orb-core/corba-orb.c +++ orbit2-2.14.10/src/orb/orb-core/corba-orb.c @@ -101,7 +101,6 @@ link_use_local_hostname (LINK_NET_ID_IS_IPADDR); break; } - link_set_local_hostname(orbit_net_id); } while (0); } --- orbit2-2.14.10.orig/src/orb/orb-core/Makefile.am +++ orbit2-2.14.10/src/orb/orb-core/Makefile.am @@ -12,6 +12,7 @@ -DORBIT_TYPELIB_DIR=\""$(TYPELIB_DIR)"\" \ -DORBIT2_INTERNAL_API \ $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ $(LOCAL_LINC_CFLAGS) \ $(ORBIT_CFLAGS) --- orbit2-2.14.10.orig/src/orb/Makefile.in +++ orbit2-2.14.10/src/orb/Makefile.in @@ -156,6 +156,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ @@ -242,6 +243,7 @@ -DORBIT_VERSION=\"@ORBIT_VERSION@\" \ -DORBIT2_INTERNAL_API \ $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ $(LOCAL_LINC_CFLAGS) \ $(ORBIT_CFLAGS) --- orbit2-2.14.10.orig/src/orb/Makefile.am +++ orbit2-2.14.10/src/orb/Makefile.am @@ -10,6 +10,7 @@ -DORBIT_VERSION=\"@ORBIT_VERSION@\" \ -DORBIT2_INTERNAL_API \ $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ $(LOCAL_LINC_CFLAGS) \ $(ORBIT_CFLAGS) --- orbit2-2.14.10.orig/src/orb/util/Makefile.in +++ orbit2-2.14.10/src/orb/util/Makefile.in @@ -133,6 +133,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ @@ -216,6 +217,7 @@ -DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbitrc\" \ -DORBIT2_INTERNAL_API \ $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ $(LOCAL_LINC_CFLAGS) \ $(ORBIT_CFLAGS) --- orbit2-2.14.10.orig/src/orb/util/Makefile.am +++ orbit2-2.14.10/src/orb/util/Makefile.am @@ -6,6 +6,7 @@ -DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbitrc\" \ -DORBIT2_INTERNAL_API \ $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ $(LOCAL_LINC_CFLAGS) \ $(ORBIT_CFLAGS) --- orbit2-2.14.10.orig/src/orb/poa/poa.c +++ orbit2-2.14.10/src/orb/poa/poa.c @@ -574,7 +574,7 @@ /* bounce all pending requested (OBJECT_NOT_EXIST * exceptions raised); none should get requeued. */ ORBit_POA_handle_held_requests (poa); - g_assert (poa->held_requests == NULL); + g_assert (poa->held_requests == 0); if (IS_RETAIN (poa)) { TraverseInfo info; --- orbit2-2.14.10.orig/src/orb/poa/Makefile.in +++ orbit2-2.14.10/src/orb/poa/Makefile.in @@ -137,6 +137,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ @@ -226,6 +227,7 @@ -I$(top_srcdir)/src/orb/poa \ -DORBIT2_INTERNAL_API \ $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ $(LOCAL_LINC_CFLAGS) \ $(ORBIT_CFLAGS) --- orbit2-2.14.10.orig/src/orb/poa/Makefile.am +++ orbit2-2.14.10/src/orb/poa/Makefile.am @@ -13,6 +13,7 @@ -I$(top_srcdir)/src/orb/poa \ -DORBIT2_INTERNAL_API \ $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ $(LOCAL_LINC_CFLAGS) \ $(ORBIT_CFLAGS) --- orbit2-2.14.10.orig/configure +++ orbit2-2.14.10/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for ORBit2 2.14.10. +# Generated by GNU Autoconf 2.61 for ORBit2 2.14.9. # # Report bugs to . # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='ORBit2' PACKAGE_TARNAME='ORBit2' -PACKAGE_VERSION='2.14.10' -PACKAGE_STRING='ORBit2 2.14.10' +PACKAGE_VERSION='2.14.9' +PACKAGE_STRING='ORBit2 2.14.9' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=ORBit2' # Factoring default headers for most tests. @@ -888,6 +888,7 @@ MAINT ENABLE_HTTP_TRUE ENABLE_HTTP_FALSE +ORBIT_DEBUG_CFLAGS GLIB_REQUIRED LIBIDL_REQUIRED PKG_CONFIG @@ -1450,7 +1451,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ORBit2 2.14.10 to adapt to many kinds of systems. +\`configure' configures ORBit2 2.14.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1520,7 +1521,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ORBit2 2.14.10:";; + short | recursive ) echo "Configuration of ORBit2 2.14.9:";; esac cat <<\_ACEOF @@ -1644,7 +1645,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ORBit2 configure 2.14.10 +ORBit2 configure 2.14.9 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1658,7 +1659,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ORBit2 $as_me 2.14.10, which was +It was created by ORBit2 $as_me 2.14.9, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2029,8 +2030,8 @@ ORBIT_MAJOR_VERSION=2 ORBIT_MINOR_VERSION=14 -ORBIT_MICRO_VERSION=10 -ORBIT_VERSION=2.14.10 +ORBIT_MICRO_VERSION=9 +ORBIT_VERSION=2.14.9 @@ -2383,7 +2384,7 @@ # Define the identity of the package. PACKAGE='ORBit2' - VERSION='2.14.10' + VERSION='2.14.9' # Some tools Automake needs. @@ -4548,7 +4549,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4551 "configure"' > conftest.$ac_ext + echo '#line 4552 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7581,11 +7582,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7584: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7585: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7588: \$? = $ac_status" >&5 + echo "$as_me:7589: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7871,11 +7872,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7874: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7875: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7878: \$? = $ac_status" >&5 + echo "$as_me:7879: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7975,11 +7976,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7978: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7979: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7982: \$? = $ac_status" >&5 + echo "$as_me:7983: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10326,7 +10327,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12850: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12853: \$? = $ac_status" >&5 + echo "$as_me:12854: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12950,11 +12951,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12953: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12954: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12957: \$? = $ac_status" >&5 + echo "$as_me:12958: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14514,11 +14515,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14517: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14518: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14521: \$? = $ac_status" >&5 + echo "$as_me:14522: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14618,11 +14619,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14621: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14622: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14625: \$? = $ac_status" >&5 + echo "$as_me:14626: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16807,11 +16808,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16810: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16811: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16814: \$? = $ac_status" >&5 + echo "$as_me:16815: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17097,11 +17098,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17100: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17101: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17104: \$? = $ac_status" >&5 + echo "$as_me:17105: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17201,11 +17202,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17204: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17205: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17208: \$? = $ac_status" >&5 + echo "$as_me:17209: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19929,7 +19930,7 @@ fi if test "x$enable_debug" = "xyes"; then - ORBIT_DEBUG_CFLAGS="-ggdb -O0 -DG_ENABLE_DEBUG" + ORBIT_DEBUG_CFLAGS="-ggdb -DG_ENABLE_DEBUG" else if test "x$enable_debug" = "xno"; then ORBIT_DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" @@ -19938,6 +19939,7 @@ fi fi + # Check whether --enable-purify was given. if test "${enable_purify+set}" = set; then enableval=$enable_purify; enable_purify=yes @@ -26531,7 +26533,6 @@ ;; esac -CFLAGS="$CFLAGS $ORBIT_DEBUG_CFLAGS" @@ -27097,7 +27098,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ORBit2 $as_me 2.14.10, which was +This file was extended by ORBit2 $as_me 2.14.9, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -27150,7 +27151,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -ORBit2 config.status 2.14.10 +ORBit2 config.status 2.14.9 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -27539,6 +27540,7 @@ MAINT!$MAINT$ac_delim ENABLE_HTTP_TRUE!$ENABLE_HTTP_TRUE$ac_delim ENABLE_HTTP_FALSE!$ENABLE_HTTP_FALSE$ac_delim +ORBIT_DEBUG_CFLAGS!$ORBIT_DEBUG_CFLAGS$ac_delim GLIB_REQUIRED!$GLIB_REQUIRED$ac_delim LIBIDL_REQUIRED!$LIBIDL_REQUIRED$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim @@ -27576,7 +27578,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --- orbit2-2.14.10.orig/test/everything/Makefile.in +++ orbit2-2.14.10/test/everything/Makefile.in @@ -167,6 +167,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/test/timeout-server.c +++ orbit2-2.14.10/test/timeout-server.c @@ -137,7 +137,7 @@ ior = CORBA_ORB_object_to_string (orb, servant, &ev); iorfile = fopen ("timeout-server.iorfile", "w"); - fprintf (iorfile, "%s", ior); + fprintf (iorfile, "%s\n", ior); fclose (iorfile); CORBA_free (ior); --- orbit2-2.14.10.orig/test/test-giop.c +++ orbit2-2.14.10/test/test-giop.c @@ -216,7 +216,7 @@ cnx = tmp; } - g_object_unref (G_OBJECT (server)); + g_object_unref (server); server_cnx = NULL; server = NULL; link_connection_unref (cnx); --- orbit2-2.14.10.orig/test/Makefile.in +++ orbit2-2.14.10/test/Makefile.in @@ -273,6 +273,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ @@ -356,6 +357,7 @@ -I$(top_builddir)/include \ -DORBIT2_INTERNAL_API \ $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ $(LOCAL_LINC_CFLAGS) \ $(ORBIT_CFLAGS) --- orbit2-2.14.10.orig/test/Makefile.am +++ orbit2-2.14.10/test/Makefile.am @@ -6,6 +6,7 @@ -I$(top_builddir)/include \ -DORBIT2_INTERNAL_API \ $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ $(LOCAL_LINC_CFLAGS) \ $(ORBIT_CFLAGS) --- orbit2-2.14.10.orig/test/timeout-client.c +++ orbit2-2.14.10/test/timeout-client.c @@ -95,7 +95,7 @@ if (g_stat(filename, &st)) goto out; - objref = g_malloc0(st.st_size); + objref = g_malloc0((st.st_size) * sizeof(gchar)); if (!objref) goto out; @@ -191,8 +191,6 @@ goto out; } } - CORBA_exception_free (&ev); - CORBA_exception_init (&ev); g_print ("OK\n"); g_print ("Testing reacquired connection with no server delay... "); @@ -224,8 +222,6 @@ goto out; } } - CORBA_exception_free (&ev); - CORBA_exception_init (&ev); g_print ("OK\n"); g_print ("Testing reacquired connection with no server delay... "); @@ -264,12 +260,11 @@ retv = EXIT_FAILURE; goto fast_out; } + CORBA_exception_free (&ev); g_print ("OK\n"); fast_out: - CORBA_exception_free (&ev); - if (retv == EXIT_FAILURE) g_print ("Some GIOP timeout tests failed\n"); else --- orbit2-2.14.10.orig/test/inhibit/Makefile.in +++ orbit2-2.14.10/test/inhibit/Makefile.in @@ -144,6 +144,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/test/poa/Makefile.in +++ orbit2-2.14.10/test/poa/Makefile.in @@ -228,6 +228,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/docs/api/Makefile.in +++ orbit2-2.14.10/docs/api/Makefile.in @@ -121,6 +121,7 @@ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_DEBUG_CFLAGS = @ORBIT_DEBUG_CFLAGS@ ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@ ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@ ORBIT_LIBS = @ORBIT_LIBS@ --- orbit2-2.14.10.orig/docs/api/html/ORBit2-orbit2-small.html +++ orbit2-2.14.10/docs/api/html/ORBit2-orbit2-small.html @@ -20,16 +20,16 @@ ORBit2 Reference Manual   -Top +Top  |  - Description + Description
@@ -178,17 +178,17 @@
-

Description

+

Description

-

Details

+

Details

-

+

ORBit_IModule

-
typedef struct {
+
typedef struct {
 	CORBA_unsigned_long           version;
 	ORBit_IInterface            **interfaces;
 	CORBA_sequence_CORBA_TypeCode types;
@@ -200,9 +200,9 @@
-

+

ORBit_get_safe_tmp ()

-
const char*         ORBit_get_safe_tmp                  (void);
+
const char*         ORBit_get_safe_tmp                  (void);

@@ -219,9 +219,9 @@
-

+

ORBit_small_alloc ()

-
gpointer            ORBit_small_alloc                   (CORBA_TypeCode tc);

 

@@ -247,9 +247,9 @@
-

+

ORBit_small_allocbuf ()

-
gpointer            ORBit_small_allocbuf                (CORBA_TypeCode tc,
                                                          CORBA_unsigned_long length);

@@ -281,9 +281,9 @@
-

+

ORBit_small_freekids ()

-
void                ORBit_small_freekids                (CORBA_TypeCode tc,
+
void                ORBit_small_freekids                (CORBA_TypeCode tc,
                                                          gpointer p,
@@ -318,9 +318,9 @@
-

+

ORBit_sequence_alloc ()

-
gpointer            ORBit_sequence_alloc                (CORBA_TypeCode sequence_tc,
                                                          CORBA_unsigned_long length);

@@ -352,9 +352,9 @@
-

+

ORBit_sequence_append ()

-
void                ORBit_sequence_append               (
void                ORBit_sequence_append               (gpointer sequence,
                                                          
 

 

-

+

 ORBit_sequence_set_size ()

-
void                ORBit_sequence_set_size             (
void                ORBit_sequence_set_size             (gpointer sequence,
                                                          CORBA_unsigned_long length);

@@ -412,9 +412,9 @@
 

 

 

-

+

 ORBit_sequence_index()

-
#define        ORBit_sequence_index(sequence,idx) (sequence)->_buffer[(idx)]
+
#define        ORBit_sequence_index(sequence,idx) (sequence)->_buffer[(idx)]
 

 

 
@@ -439,9 +439,9 @@
 

 

 

-

+

 ORBit_sequence_concat ()

-
void                ORBit_sequence_concat               (
void                ORBit_sequence_concat               (gpointer sequence,
                                                          
 

 

-

+

 enum ORBitConnectionStatus

-
typedef enum {
+
typedef enum {
 	ORBIT_CONNECTION_CONNECTED,
 	ORBIT_CONNECTION_CONNECTING,
 	ORBIT_CONNECTION_DISCONNECTED,
@@ -485,9 +485,9 @@
 

 

 

-

+

 ORBit_small_get_servant ()

-
gpointer            ORBit_small_get_servant             (CORBA_Object obj);

 

@@ -513,9 +513,9 @@
 

 

 

-

+

 ORBit_small_get_connection_status ()

-
ORBitConnectionStatus ORBit_small_get_connection_status (CORBA_Object obj);

+
ORBitConnectionStatus ORBit_small_get_connection_status (CORBA_Object obj);

 

 
 

@@ -539,9 +539,9 @@
 

 

 

-

+

 ORBit_small_listen_for_broken ()

-
ORBitConnectionStatus ORBit_small_listen_for_broken     (CORBA_Object obj,
+
ORBitConnectionStatus ORBit_small_listen_for_broken     (CORBA_Object obj,
                                                          GCallback fn,
@@ -581,9 +581,9 @@
 

 

 

-

+

 ORBit_small_unlisten_for_broken_full ()

-
ORBitConnectionStatus ORBit_small_unlisten_for_broken_full
+
ORBitConnectionStatus ORBit_small_unlisten_for_broken_full
                                                         (CORBA_Object obj,
                                                          
 

 

-

+

 ORBit_small_unlisten_for_broken ()

-
ORBitConnectionStatus ORBit_small_unlisten_for_broken   (CORBA_Object obj,
+
ORBitConnectionStatus ORBit_small_unlisten_for_broken   (CORBA_Object obj,
                                                          GCallback fn);

@@ -658,18 +658,18 @@
 

 

 

-

+

 ORBitConnection

-
typedef struct _ORBitConnection ORBitConnection;

+
typedef struct _ORBitConnection ORBitConnection;

 

 
 

 

 

 

-

+

 ORBit_small_get_connection ()

-
ORBitConnection*    ORBit_small_get_connection          (CORBA_Object obj);

+
ORBitConnection*    ORBit_small_get_connection          (CORBA_Object obj);

 

 
 

@@ -693,9 +693,9 @@
 

 

 

-

+

 ORBit_small_get_connection_ref ()

-
ORBitConnection*    ORBit_small_get_connection_ref      (CORBA_Object obj);

+
ORBitConnection*    ORBit_small_get_connection_ref      (CORBA_Object obj);

 

 
 

@@ -719,9 +719,9 @@
 

 

 

-

+

 ORBit_small_connection_unref ()

-
void                ORBit_small_connection_unref        (ORBitConnection *cnx);

+
void                ORBit_small_connection_unref        (ORBitConnection *cnx);

 

 
 

@@ -738,9 +738,9 @@
 

 

 

-

+

 ORBit_connection_set_max_buffer ()

-
void                ORBit_connection_set_max_buffer     (ORBitConnection *cnx,
+
void                ORBit_connection_set_max_buffer     (ORBitConnection *cnx,
                                                          gulong max_buffer_bytes);

@@ -767,9 +767,9 @@
 

 

 

-

+

 ORBit_small_get_iinterface ()

-
ORBit_IInterface*   ORBit_small_get_iinterface          (CORBA_Object opt_object,
+
ORBit_IInterface*   ORBit_small_get_iinterface          (CORBA_Object opt_object,
                                                          const CORBA_char *repo_id,
                                                          CORBA_Environment *ev);

 

@@ -805,9 +805,9 @@
 

 

 

-

+

 ORBit_small_flags

-
extern int     ORBit_small_flags;
+
extern int     ORBit_small_flags;
 

 

 
@@ -815,9 +815,9 @@
 

 

 

-

+

 ORBit_small_get_iinterfaces ()

-
CORBA_sequence_ORBit_IInterface* ORBit_small_get_iinterfaces
+
CORBA_sequence_ORBit_IInterface* ORBit_small_get_iinterfaces
                                                         (const char *name);

 

 
@@ -842,18 +842,18 @@
 

 

 

-

+

 ORBitAsyncQueueEntry

-
typedef struct _ORBitAsyncQueueEntry ORBitAsyncQueueEntry;

+
typedef struct _ORBitAsyncQueueEntry ORBitAsyncQueueEntry;

 

 
 

 

 

 

-

+

 ORBit_small_invoke_stub_n ()

-
void                ORBit_small_invoke_stub_n           (CORBA_Object object,
+
void                ORBit_small_invoke_stub_n           (CORBA_Object object,
                                                          ORBit_IMethods *methods,
                                                          
 

 

-

+

 ORBit_small_get_type_id ()

-
CORBA_char*         ORBit_small_get_type_id             (CORBA_Object object,
+
CORBA_char*         ORBit_small_get_type_id             (CORBA_Object object,
                                                          CORBA_Environment *ev);

 

 
@@ -946,9 +946,9 @@
 

 

 

-

+

 ORBitAsyncInvokeFunc ()

-
void                (*ORBitAsyncInvokeFunc)             (CORBA_Object object,
+
void                (*ORBitAsyncInvokeFunc)             (CORBA_Object object,
                                                          ORBit_IMethod *m_data,
                                                          ORBitAsyncQueueEntry *aqe,
                                                          
 

 

-

+

 ORBit_small_demarshal_async ()

-
void                ORBit_small_demarshal_async         (ORBitAsyncQueueEntry *aqe,
+
void                ORBit_small_demarshal_async         (ORBitAsyncQueueEntry *aqe,
                                                          gpointer ret,
@@ -1036,9 +1036,9 @@
 

 

 

-

+

 ORBit_small_invoke_stub ()

-
void                ORBit_small_invoke_stub             (CORBA_Object object,
+
void                ORBit_small_invoke_stub             (CORBA_Object object,
                                                          ORBit_IMethod *m_data,
                                                          
 

 

-

+

 ORBit_small_invoke_async ()

-
void                ORBit_small_invoke_async            (CORBA_Object obj,
+
void                ORBit_small_invoke_async            (CORBA_Object obj,
                                                          ORBit_IMethod *m_data,
                                                          ORBitAsyncInvokeFunc fn,
                                                          
 

 

-

+

 ORBIT_SMALL_FAST_LOCALS

-
#define ORBIT_SMALL_FAST_LOCALS           1
+
#define ORBIT_SMALL_FAST_LOCALS           1
 

 

 
@@ -1164,9 +1164,9 @@
 

 

 

-

+

 ORBIT_SMALL_FORCE_GENERIC_MARSHAL

-
#define ORBIT_SMALL_FORCE_GENERIC_MARSHAL 2
+
#define ORBIT_SMALL_FORCE_GENERIC_MARSHAL 2
 

 

 
@@ -1174,9 +1174,9 @@
 

 

 

-

+

 ORBit_small_get_types ()

-
CORBA_sequence_CORBA_TypeCode* ORBit_small_get_types    (const char *name);

+
CORBA_sequence_CORBA_TypeCode* ORBit_small_get_types    (const char *name);

 

 
 

@@ -1200,9 +1200,9 @@
 

 

 

-

+

 ORBit_small_load_typelib ()

-
gboolean            ORBit_small_load_typelib            (const char *libname);

 

--- orbit2-2.14.10.orig/docs/api/html/ORBit2-orbit2-allocators.html
+++ orbit2-2.14.10/docs/api/html/ORBit2-orbit2-allocators.html
@@ -21,16 +21,16 @@
- + Description

-orbit2-small +orbit2-small

orbit2-small

 ORBit2 Reference Manual Next
Top +
Top  |  - Description
@@ -69,17 +69,17 @@
-

Description

+

Description

-

Details

+

Details

-

+

CORBA_sequence_set_release()

-
#define CORBA_sequence_set_release(s,r) (s)->_release = r
+
#define CORBA_sequence_set_release(s,r) (s)->_release = r
 

 

     CORBA_sequence_set_release() can be used to set the state of the
@@ -129,9 +129,9 @@
-

+

CORBA_sequence_get_release()

-
#define CORBA_sequence_get_release(s) (s)->_release
+
#define CORBA_sequence_get_release(s) (s)->_release
 

 

     Before calling CORBA_free() on the
@@ -157,9 +157,9 @@
-

+

CORBA_free ()

-
void                CORBA_free                          (
void                CORBA_free                          (gpointer mem);

 

@@ -182,9 +182,9 @@
-

+

ORBit_alloc_tcval ()

-
gpointer            ORBit_alloc_tcval                   (CORBA_TypeCode tc,
                                                          
 

 

-

+

 ORBit_realloc_tcval ()

-
gpointer            ORBit_realloc_tcval                 ( and Elliot Lee
+
+
+This manual was originally written for ior\-decode\-2 by Chris Waters
+ for Debian GNU/Linux.
--- orbit2-2.14.10.orig/debian/liborbit2-dev.install
+++ orbit2-2.14.10/debian/liborbit2-dev.install
@@ -0,0 +1,12 @@
+debian/tmp/usr/include/orbit-2.0
+debian/tmp/usr/share/aclocal/ORBit2.m4
+debian/tmp/usr/share/idl/orbit-2.0
+debian/tmp/usr/share/doc/liborbit2-dev/ORBit2
+debian/tmp/usr/lib/*.so
+debian/tmp/usr/lib/*.la
+debian/tmp/usr/lib/*.a
+debian/tmp/usr/lib/orbit-2.0/Everything_module.la
+debian/tmp/usr/lib/orbit-2.0/Everything_module.a
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/bin/orbit2-config
+debian/tmp/usr/bin/orbit-idl-2
--- orbit2-2.14.10.orig/debian/orbit-idl-2.1
+++ orbit2-2.14.10/debian/orbit-idl-2.1
@@ -0,0 +1,153 @@
+.\" created for orbit-idl-2 by Chris Waters, for Debian GNU/Linux
+.\"
+.TH ORBIT-IDL-2 1 "18 March 2002" "Version 0.5.15"
+
+.SH NAME
+orbit\-idl\-2 \- IDL compiler for ORBit2
+
+.SH SYNOPSIS
+.HP
+.B orbit\-idl\-2
+.RI "[ " options " ] " file...
+
+.SH DESCRIPTION
+.B orbit\-idl\-2
+converts object interface descriptions written in CORBA IDL (Interface
+Definition Language) into C code that you can compile and link into
+your programs.
+
+.SH OPTIONS
+.B orbit\-idl\-2
+accepts the following options:
+.P
+.BI "\-d " ARG
+.RS 0
+.BI \-\-debug= ARG
+.RS
+Set the debug level.  Supported levels are 0 to 4, default is 2.
+.RE
+.TP
+.BI \-\-idlwarnlevel= INT
+Set the warning level for compiler warnings.  Supported levels are 0
+to 4, default is 2.
+.TP
+.B \-\-showcpperrors
+Show errors from cpp(1).
+.TP
+.B \-\-small
+Optimize for size instead of speed.
+.TP
+.B \-\-oldstyle
+Use the old style IDL compiler (not generally recommended).
+.TP
+.B \-\-skeleton\-impl
+Generate a \fIskeleton-impl\fP file.
+.TP
+.B \-\-nostubs
+Do not create the \fIstubs\fP file.
+.TP
+.B \-\-noskels
+Do not create the \fIskels\fP file.
+.TP
+.B \-\-nocommon
+Do not create the \fIcommon\fP file.
+.TP
+.B \-\-noheaders
+Do not create the \fIheaders\fP file.
+.TP
+.B \-\-noidata
+Don't generate Interface type data.
+.P
+.B \-i
+.RS 0
+.B \-\-imodule
+.RS
+Generate only an imodule file (no skels, stubs, etc.).
+.RE
+.TP
+.B \-\-add\-imodule
+Generate an imodule file (as well as other files generated by default
+or by other options).
+.TP
+.B \-\-onlytop
+Inhibit file includes.
+.TP
+.B \-\-pidl
+Treat source as pseudo-IDL.
+.P
+.BI "\-D " ARG
+.RS 0
+.BI \-\-define= ARG
+.RS
+Define name for preprocessor.
+.RE
+.P
+.BI "\-I " PATH
+.RS 0
+.BI \-\-include= PATH
+.RS
+Add search path for include files.
+.RE
+.TP
+.BI \-\-deps= FILENAME
+Generate dependency information, suitable for inclusion in a Makefile.
+.P
+.BI "\-l " ARG
+.RS 0
+.BI \-\-lang= ARG
+.RS
+Specify the output language.  The default is C.  Support for languages
+other than C requires the installation of a backend for that language.
+.RE
+.TP
+.BI "\-\-backenddir=" DIR
+Specify the directory where a language backend is stored (not
+necessary if backend is stored in the default directory).
+.TP
+.B "\-\-usage"
+Print a very brief usage summary.
+.P
+.B \-?
+.RS 0
+.B \-\-help
+.RS
+Print a slightly more detailed usage summary.
+.RE
+.P
+.B \-v
+.RS 0
+.B \-\-version
+.RS
+Print version number and serial.
+.RE
+
+.SH COMPILING
+The IDL file(s) compiled by \fBorbit\-idl\-2\fP define the interfaces
+to network-transparent objects.  These files are first passed to
+cpp(1), the C Preprocessor, then the result is parsed, and the C code
+is generated.
+.P
+ By default, \fBorbit\-idl\-2\fP generates four files, the \fIstubs\fP,
+\fIskels\fP, \fIcommon\fP, and \fIheader\fP files.  If your input file
+is named \fBsample.idl\fP, then the output files will be named,
+respectively, \fBsample-stubs.c\fP, \fBsample-skels.c\fP,
+\fBsample-common.c\fP, and \fBsample.h\fP.  You can optionally also
+generate a \fIskeleton-impl\fP file (which would be named
+\fBsample-skelimpl.c\fP in our example), or an \fIimodule\fP file
+(e.g. \fBsample-imodule.c\fP).  These files require manual
+editing to be useful, and is therefore not generated by default.
+.P
+The generated C files are formatting ("pretty-printed") using
+indent(1).  You can use another program for this if you prefer, with
+the \-\-c-output-formatter argument.
+
+.SH SEE ALSO
+orbit2-config(1), cpp(1), indent(1), /usr/share/doc/liborbit2-dev,
+http://orbit-resource.sourceforge.net, http://www.omg.org.
+
+.SH AUTHOR
+Copyright \(co 2001, 2002 Dick Porter  and Elliot Lee
+
+
+This manual was originally written for orbit-idl by Chris Waters
+ for Debian GNU/Linux.
--- orbit2-2.14.10.orig/debian/liborbit2-dev.links
+++ orbit2-2.14.10/debian/liborbit2-dev.links
@@ -0,0 +1 @@
+usr/share/doc/liborbit2-dev/ORBit2 usr/share/gtk-doc/html/ORBit2
--- orbit2-2.14.10.orig/debian/copyright
+++ orbit2-2.14.10/debian/copyright
@@ -0,0 +1,50 @@
+This package was originally debianized by Chris Waters .
+Current maintainer is Sebastian Rittau .
+
+It was downloaded from .
+
+Copyright (C) 1998, 1999, 2000, 2001 Richard H. Porter, Elliot Lee,
+ Michael Meeks, Mark McLoughlin, Red Hat, Inc., Ximian Inc. and others.
+Copyright 2001  Ximian, Inc., Red Hat, Inc., Sun Microsystems, Inc.,
+  Elliot Lee, Michael Meeks, Mark McLoughlin, and others
+
+The IDL compiler and utility programs are released under the terms of the
+GNU General Public License:
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+The full license text can be found in the file /usr/share/common-licenses/GPL
+on a Debian system.
+
+The Linc and ORBit libraries are released under the terms of the GNU Library
+General Public License:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free 
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+    MA 02110-1301, USA.
+
+The full license text can be found in the file /usr/share/common-licenses/LGPL
+on a Debian system.
--- orbit2-2.14.10.orig/debian/rules
+++ orbit2-2.14.10/debian/rules
@@ -0,0 +1,30 @@
+#!/usr/bin/make -f
+
+shlibver = (>= 1:2.14.8)
+
+ifeq ($(DEB_HOST_ARCH),m68k)
+DEB_PATCHDIRS = debian/patches debian/patches/$(DEB_HOST_ARCH)
+endif
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+DEB_DH_MAKESHLIBS_ARGS_liborbit2 := -V 'liborbit2 $(shlibver)'
+
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-purify --enable-gtk-doc --with-html-dir=/usr/share/doc/liborbit2-dev
+
+#
+# Man page generation (from Docbook source)
+#
+
+DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
+
+common-build-arch::
+	xsltproc --nonet --novalid -o debian/name-client-2.1       $(DB2MAN) debian/name-client-2.dbk
+	xsltproc --nonet --novalid -o debian/orbit-name-server-2.1 $(DB2MAN) debian/orbit-name-server-2.dbk
+
+clean::
+	echo $(DEB_PATCHDIRS)
+	rm -f debian/name-client-2.1 debian/orbit-name-server-2.1
--- orbit2-2.14.10.orig/debian/watch
+++ orbit2-2.14.10/debian/watch
@@ -0,0 +1,2 @@
+version=2
+http://ftp.gnome.org/pub/gnome/sources/ORBit2/([\d\.]+)[02468]/ORBit2-([\d\.]+)\.tar\.gz
--- orbit2-2.14.10.orig/debian/typelib-dump.1
+++ orbit2-2.14.10/debian/typelib-dump.1
@@ -0,0 +1,33 @@
+.\" created for typelib-dump by Sebastian Rittau, for Debian GNU/Linux
+.\" based on orbit2-config by Chris Waters
+.\"
+.TH TYPELIB-DUMP 1 "22 February 2003" "Version 2.6.0"
+
+.SH NAME
+typelib\-dump \- show ORBit2 type library modules
+
+.SH SYNOPSIS
+.HP
+.B typelib\-dump
+.RI "[ " module " ]"
+
+.SH DESCRIPTION
+If
+.B typelib-dump
+is called without any arguments, it lists all \fIORBit2\fP typelib paths
+and the typelib modules in them. Otherwise the argument \fBmodule\fP
+is taken as the name of a typelib module. This module gets inspected
+and all types and interfaces of the module as well as all interface methods
+are dumped to the screen.
+
+.SH SEE ALSO
+orbit-idl-2(1), /usr/share/doc/orbit2,
+http://orbit-resource.sourceforge.net/, http://www.omg.org/.
+
+.SH AUTHOR
+Copyright \(co  2001, 2002 Dick Porter  and Elliot Lee
+
+
+This manual page was originally written for typelib-dump by Sebastian Rittau
+ for Debian GNU/Linux and is based on the manual page
+for orbit2-config by Chris Waters .
--- orbit2-2.14.10.orig/debian/liborbit2-dev.manpages
+++ orbit2-2.14.10/debian/liborbit2-dev.manpages
@@ -0,0 +1,2 @@
+debian/orbit2-config.1
+debian/orbit-idl-2.1
--- orbit2-2.14.10.orig/debian/changelog
+++ orbit2-2.14.10/debian/changelog
@@ -0,0 +1,548 @@
+orbit2 (1:2.14.10-0ubuntu2) hardy; urgency=low
+
+  * Fix build failure with gcc-4.3.
+
+ -- Matthias Klose   Fri, 25 Jan 2008 11:28:33 +0000
+
+orbit2 (1:2.14.10-0ubuntu1) hardy; urgency=low
+
+  * New upstream version
+
+ -- Sebastien Bacher   Mon, 26 Nov 2007 13:46:33 +0100
+
+orbit2 (1:2.14.9-0ubuntu1) gutsy; urgency=low
+
+  * New upstream version:
+    bug fixes
+    - Portability fix
+    - Various fixes in GIOP and linc
+  * debian/patches/700-autoreconf.patch:
+    - updated
+
+ -- Sebastien Bacher   Mon, 17 Sep 2007 16:48:35 +0200
+
+orbit2 (1:2.14.8-0.0ubuntu1) gutsy; urgency=low
+
+  * New upstream release.
+    - Updated FSF Address
+    - Updated patch debian/patches/700-autoreconf.patch
+    - Updated shlibver on rules file
+    - Updated ${binary:Version} instead ${Source-Version}
+
+  [NEWS]
+    * bug fixes
+            + Fix GIOP timeouts and add unit tests (Jules Colding)
+            + Code cleanups (Kjartan)
+            + Fix pointer arithmetics (Roland Illig)
+            + Fix crash with uninitialized exception (Vincent Untz)
+            + ORBLocalOnly mode in Solaris fixes (Brian Cameron)
+
+
+ -- Fernando Ribeiro   Fri, 27 Jul 2007 15:27:51 +0000
+
+orbit2 (1:2.14.7-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream releases; no API or ABI change.
+
+ -- Loic Minier   Thu, 05 Apr 2007 17:12:25 +0200
+
+orbit2 (1:2.14.5-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream stable release; no ABI change, one small backward-compatible
+    API change: it's not necessary to define ORBIT2_EXTENSIONS before using
+    ORBit_get_giop_recv_limit() or ORBit_proto_use(); closes: #417907.
+
+ -- Loic Minier   Thu, 05 Apr 2007 16:08:04 +0200
+
+orbit2 (1:2.14.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Acknowledge NMU. (Thanks, Loic!)
+    + Closes: #395050 "Diff for 2.14.3-0.1 NMU"
+  * debian/patches/700-autoreconf.patch: Updated.
+  * debian/SSL.Debian: Removed, since SSL support was removed upstream.
+  * debian/TODO: Removed; all todo items are outdated.
+  * debian/liborbit2.docs: Removed SSL.Debian and TODO.
+
+ -- Sebastian Rittau   Mon, 18 Dec 2006 20:11:59 +0100
+
+orbit2 (1:2.14.3-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream releases, with API addition; closes: #386410.
+    - Bump up shlibs to >= 1:2.14.1.
+    - Bump up libglib2.0-dev build-dep to >= 2.8.0.
+    - Drop build-dep and dep on libpopt-dev.
+    - Split patch 100-compile-name-server with a new 700_autoreconf patch
+      which holds the generated files; I'm afraid it's ~ 2 MB, but I don't
+      have automake1.6 around to properly minimize the diff.
+  * Include debian/patches/m68k when building for m68k.
+  * New m68k patch, 10-aligment-misc-fixes, to properly align memory on m68k;
+    thanks Roman Zippel; closes: #390516.
+  * Add watch file.
+
+ -- Loic Minier   Tue, 24 Oct 2006 16:08:59 +0200
+
+orbit2 (1:2.14.0-2) unstable; urgency=low
+
+  * Acknowledge NMU. (Thanks, Steinar!)
+    + Closes: #371847 "diff for 1:2.14.0-1.1 NMU"
+  * debian/control: Bump build dependency on gtk-doc-tools to >= 1.6-2.
+    Removed build dependency on xsltproc (since gtk-doc-tools depends on it).
+    + Closes: #362791 "orbit2 should declare a versioned dependency on
+      gtk-doc-tools"
+  * debian/copyright: Updated copyright text with (L)GPL boilerplate.
+  * debian/control: Bump standards version to 3.7.2 (no changes required).
+
+ -- Sebastian Rittau   Fri, 23 Jun 2006 11:54:14 +0200
+ 
+orbit2 (1:2.14.0-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Make liborbit2-dev depend on at least version 0.8.6-1 of libidl-dev.
+    (Closes: #369685)
+
+ -- Steinar H. Gunderson   Wed,  7 Jun 2006 22:45:41 +0200
+
+orbit2 (1:2.14.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sebastian Rittau   Thu, 16 Mar 2006 21:14:34 +0100
+
+orbit2 (1:2.12.2-3) unstable; urgency=low
+
+  * debian/control: Added gtk-doc-tools to build dependencies.
+    (Closes: #318783, #318584)
+
+ -- Sebastian Rittau   Thu, 21 Jul 2005 22:41:25 +0200
+
+orbit2 (1:2.12.2-2) unstable; urgency=low
+
+  * debian/control: Updated standards-version to 3.6.2 (no changes).
+  * Reenable shipping of API documentation. (Closes: #317352)
+    + debian/rules: Add --enable-gtk-doc option to build API documentation.
+    + debian/liborbit2-dev.install: Added usr/share/doc/liborbit2-dev/ORBit2
+
+ -- Sebastian Rittau   Fri,  8 Jul 2005 17:19:23 +0200
+
+orbit2 (1:2.12.2-1) unstable; urgency=low
+
+  * New upstream version.
+    + debian/patches/100-compile-name-server.patch: Updated.
+  * debian/liborbit2-dev.install: Removed
+    debian/tmp/usr/share/doc/liborbit2-dev/ORBit2.
+
+ -- Sebastian Rittau   Tue, 19 Apr 2005 16:01:06 +0200
+
+orbit2 (1:2.12.1-1) unstable; urgency=low
+
+  * New upstream version.
+  * Acknowledge NMUs. (Thanks, Sebastien!)
+    + Closes: #258454 "nautilus: crashes with usb key entry in fstab"
+  * debian/control: Remove dependencies on indent, they aren't needed anymore.
+    + Closes: #292801 "depends on indent"
+  * debian/patches/000-relibtoolize.patch: Removed.
+  * debian/orbit-idl-2.1: Removed description of deprecated
+    --c-output-formatter option.
+
+ -- Sebastian Rittau   Tue, 15 Mar 2005 11:53:19 +0100
+
+orbit2 (1:2.10.5-0.1) unstable; urgency=low
+
+  * NMU with the maintainer approval.
+  * New upstream release:
+    - fix a nautilus crash on 64 bits platforms (Closes: #258454).
+  * debian/patches/005-pc-file-fix.patch:
+    - removed, the fix is in the new version.
+
+ -- Sebastien Bacher   Tue,  8 Feb 2005 16:23:53 +0100
+
+orbit2 (1:2.10.2-1.1) unstable; urgency=low
+
+  * NMU for Gnome 2.6.
+  * Upload in unstable.
+
+ -- Sebastien Bacher   Mon, 24 May 2004 19:31:42 +0200
+
+orbit2 (1:2.10.2-1) experimental; urgency=low
+
+  * Acknowledges NMUs. (Thanks Ross and Gustavo!)
+    + Closes: #240022, #249291
+    + Bug fixed in NMU: Closes: #242943
+  * debian/rules: Update shlibver to >= 1:2.10.0. (Closes: #218287)
+  * Fix pkg-config file not to include unnecessary libraries.
+    + debian/patches/005-pc-file-fix.patch: New file.
+    + Closes: #236094 "pkg-config --libs lists to many libraries"
+  * debian/control: Correct dependency of liborbit2-dev on libidl-dev instead
+    of libidl2-dev.
+
+ -- Sebastian Rittau   Sun, 16 May 2004 19:14:42 +0200
+
+orbit2 (1:2.10.2-0.1) experimental; urgency=low
+
+  * NMU
+  * New upstream release
+  * debian/control:
+  - liborbit2-dev now depends on libidl-dev (Closes: #242943)
+  * patches/000-relibtoolize.patch:
+  - add patch to relibtoolize
+  * patches/100-compile-name-server.patch:
+  - reworked patch to work with the above one
+
+ -- Gustavo Noronha Silva   Sun, 16 May 2004 01:24:36 -0300
+
+orbit2 (1:2.10.0-0.1) experimental; urgency=low
+
+  * NMU for GNOME 2.6 packaging
+  * New upstream release
+
+ -- Ross Burton   Thu, 25 Mar 2004 09:48:19 +0000
+
+orbit2 (1:2.8.3-2) unstable; urgency=low
+
+  * Enable orbit-name-service. [Thanks to W. Borgert for patch and manual
+    pages.]
+    + debian/control: Build-depend on xsltproc and docbook-xsl (for generating
+      the manual pages from Docbook source).
+    + debian/control: Added a new package: orbit2-nameserver.
+    + debian/patches/100-compile-name-server.patch: Patch to enable
+      compilation of the ORBit name server.
+    + debian/name-client-2.dbk:
+    + debian/orbit-name-server-2.dbk: Man pages.
+    + debian/rules: Auto-generate man pages from Docbook source.
+    + debian/orbit2-nameserver.install:
+    + debian/orbit2-nameserver.manpages: Files to install in package
+      orbit2-nameserver.
+    + Closes: #223789 "desperately missing orbit2 naming server"
+  * debian/control: Start all short description with lowercase letters.
+
+ -- Sebastian Rittau   Sat, 13 Dec 2003 23:06:11 +0100
+
+orbit2 (1:2.8.3-1) unstable; urgency=low
+
+  * New upstream version.
+    + debian/patches/crashfix.patch: Removed as this is now included
+      upstream. (Thanks, Sebastien for the temporary patch and NMU!)
+    + Closes: #219391 "Involved in gnumeric crash when a11y is enabled"
+
+ -- Sebastian Rittau   Sat, 13 Dec 2003 22:05:32 +0100
+
+orbit2 (1:2.8.2-1.1) unstable; urgency=high
+
+  * NMU to fix some crash with a11y before the entry in testing
+    (Closes: #219391).
+  * Urgency = high because it's a small fix and we don't want to delay
+    GNOME 2.4 entry in testing.
+
+ -- Sebastien Bacher   Sun, 16 Nov 2003 21:35:11 +0100
+
+orbit2 (1:2.8.2-1) unstable; urgency=low
+
+  * New upstream version.
+    + Closes: #218026 "new version available which fixes deadlock"
+
+ -- Sebastian Rittau   Wed, 29 Oct 2003 15:15:49 +0100
+
+orbit2 (1:2.8.1-5) unstable; urgency=low
+
+  * debian/control: liborbit2-dev now conflicts with liblinc-dev so that
+    newly compiled packages are not linked against linc anymore. [Suggestion
+    by Christian Marillat]
+    + Closes: #216842 "liborbit2-dev should conflict with liblinc-dev"
+  * Added manpage for linc-cleanup-sockets (from Linc Debian package, updated
+    slightly).
+    + debian/linc-cleanup-sockets.1: Manpage.
+    + debian/orbit2.manpages: Added linc-cleanup-sockets.1.
+
+ -- Sebastian Rittau   Tue, 21 Oct 2003 17:51:52 +0200
+
+orbit2 (1:2.8.1-4) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Sebastian Rittau   Thu, 16 Oct 2003 16:35:42 +0200
+
+orbit2 (1:2.8.1-3) experimental; urgency=low
+
+  * debian/control: Removed dependency on liblinc-dev from liborbit2-dev.
+  * debian/control: Changed conflicts with libbonobo-activation4 to a
+    versioned conflict.
+
+ -- Sebastian Rittau   Thu, 16 Oct 2003 00:37:56 +0200
+
+orbit2 (1:2.8.1-2) experimental; urgency=low
+
+  * debian/control: liborbit2 conflicts with liblinc1 (<< 1.0.3-4). This
+    version of Linc contains a workaround for a problem with newer ORBit
+    versions: Since these versions have internalized Linc, they don't call
+    linc_set_tmpdir() anymore. Thatswhy some packages that relied on ORBit
+    setting the tmpdir would fail.
+
+ -- Sebastian Rittau   Wed,  8 Oct 2003 11:30:45 +0200
+
+orbit2 (1:2.8.1-1) experimental; urgency=low
+
+  * New upstream version.
+    + Closes: #200847 "giop1.2 protocol implementation not compliant"
+    + debian/rules: Updated shlibs version to >= 2.8.0.
+    + debian/liborbit2-dev.install: Made paths more explicit.
+    + debian/liborbit2-dev.install: Added IDL files.
+    + debian/control: liborbit2 does now conflict and replace older versions
+      of liborbit2-dev, since Everything_module.so moved.
+  * ORBit does now include Linc:
+    + debian/control: Remove build-dependency on liblinc-dev.
+    + debian/control: Conflict with libbonobo-activation4.
+    + debian/TODO: Added note that Linc is built with SSL disabled.
+    + debian/SSL.Debian: New file (from Linc source package, slightly
+      modified).
+    + debian/liborbit2.docs: Added debian/SSL.Debian.
+    + debian/orbit2.install: Added linc-cleanup-sockets.
+  * Added HTML documentation:
+    + debian/rules: Added --with-html-dir configure option.
+    + debian/liborbit2-dev.install: Install HTML documentation.
+    + debian/liborbit2-dev.links: Added link to gtk-doc documentation.
+  * debian/copyright: Corrected download location, added copyright notices
+    from Linc.
+  * debian/control: Standards version 3.6.1 (no changes required).
+
+ -- Sebastian Rittau   Wed,  1 Oct 2003 20:18:56 +0200
+
+orbit2 (1:2.6.3-2) unstable; urgency=low
+
+  * Rerun libtool, automake, autoconf.
+    + Closes: #205734 "configure built from broken libtool.m4"
+
+ -- Sebastian Rittau   Sun, 17 Aug 2003 14:32:32 +0200
+
+orbit2 (1:2.6.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed debug package, since it didn't provide anything that the -dev
+    package did not.
+    + debian/control: Removed liborbit2-dbg.
+    + debian/liborbit2-dbg.dirs: Removed.
+  * Use cdbs:
+    + debian/control: Build-depend on cdbs and debhelper >= 4.1.0.
+    + debian/rules: Rewrote.
+    + debian/orbit2.install:
+    + debian/liborbit2.install:
+    + debian/liborbit2-dev.install: Added debian/tmp/ prefix for all files.
+  * debian/control: Standards version 3.6.0 (no changes required).
+
+ -- Sebastian Rittau   Sat, 16 Aug 2003 13:28:26 +0200
+
+orbit2 (1:2.6.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sebastian Rittau   Sun, 25 May 2003 20:44:56 +0200
+
+orbit2 (1:2.6.1-2) unstable; urgency=low
+
+  * Typo in package description fixed.
+  * Changed section of packages liborbit2-dev and liborbit2-dbg to libdevel.
+  * Complies with Debian Policy, version 3.5.10.
+  * Use src/services/imodule/Makefile.am from CVS HEAD to fix inter-library
+    dependency information.
+    + Closes: #193454 "Shared library dependency information"
+
+ -- Sebastian Rittau   Sun, 18 May 2003 20:09:49 +0200
+
+orbit2 (1:2.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Conforms to Debian policy 3.5.9.
+  * Updated the package descriptions.
+  * Compile with --enable-purify. This should only result in a neglectable
+    performance hit, but is the right thing to do, IMO. This also eases
+    debugging with memory debuggers like Valgrind. (Closes: #159794)
+  * User debian/compat instead of DH_COMPAT. Also, use compatibility level 4;
+    build-depend on debhelper >= 4.0.0.
+  * Added ${misc:Depends} to dependencies, added ${shlib:Depends} to
+    dependencies of liborbit2-dbg.
+  * Use dh_install instead of dh_movefiles.
+
+ -- Sebastian Rittau   Tue, 25 Mar 2003 02:52:04 +0100
+
+orbit2 (1:2.6.0-2) unstable; urgency=low
+
+  * New maintainer.
+  * Removed links to undocumented(7).
+  * Wrote typelib-dump(1). (Closes: #119803)
+
+ -- Sebastian Rittau   Sat, 22 Feb 2003 19:32:47 +0100
+
+orbit2 (1:2.6.0-1) unstable; urgency=low
+
+  * New upstream release, finally jumping ahead to the new release
+    series.
+
+ -- Chris Waters   Sat, 18 Jan 2003 17:19:41 -0800
+
+orbit2 (1:2.4.4-1) unstable; urgency=low
+
+  * New upstream release.  Actually, a slightly older upstream release,
+    but it's new to us.  Upstream version downgraded because the 2.5.0
+    release is for Gnome 2.2, which is still beta (closes: #170398).
+
+ -- Chris Waters   Thu, 28 Nov 2002 03:35:31 -0800
+
+orbit2 (2.5.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Chris Waters   Mon, 28 Oct 2002 13:58:13 -0800
+
+orbit2 (2.4.3-2) unstable; urgency=low
+
+  * Re-ran libtoolize, autoheader, aclocal, autoconf and automake to work
+    around a problem with MIPSEL (closes: #160063).
+
+ -- Chris Waters   Thu, 17 Oct 2002 02:02:55 -0700
+
+orbit2 (2.4.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fixed download location in copyright file.
+  * Updated standards-version in debian/control.
+  * Updated debian/TODO a little.
+
+ -- Chris Waters   Fri,  6 Sep 2002 15:34:57 -0700
+
+orbit2 (2.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added missing dependency on libpopt-dev to liborbit2-dev 
+    (closes: #155679).
+  * upstream removed name-client-2 and orbit-name-server-2, so I adjusted
+    the docs and descriptions accordingly.
+
+ -- Chris Waters   Wed,  7 Aug 2002 12:09:41 -0700
+
+orbit2 (2.4.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Chris Waters   Thu,  6 Jun 2002 16:00:38 -0700
+
+orbit2 (2.3.110-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Chris Waters   Tue, 21 May 2002 23:01:37 -0700
+
+orbit2 (2.3.109-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Chris Waters   Thu, 16 May 2002 12:14:05 -0700
+
+orbit2 (2.3.108-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Chris Waters   Wed, 17 Apr 2002 02:46:17 -0700
+
+orbit2 (2.3.107-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added man page for orbit-idl-2 (closes:#119804).
+  * Added a couple of man pages for orbit2 binary package.
+
+ -- Chris Waters   Mon, 25 Mar 2002 17:24:03 -0800
+
+orbit2 (2.3.106-2) unstable; urgency=low
+
+  * Rebuilt against glibc 2.0, updated dependencies.
+
+ -- Chris Waters   Thu, 21 Mar 2002 21:18:57 -0800
+
+orbit2 (2.3.106-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Chris Waters   Wed,  6 Mar 2002 01:02:05 -0800
+
+orbit2 (2.3.105-2) unstable; urgency=low
+
+  * Rebuilt against new glib; updated dependencies.
+
+ -- Chris Waters   Tue, 26 Feb 2002 14:33:51 -0800
+
+orbit2 (2.3.105-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Chris Waters   Wed, 13 Feb 2002 13:12:10 -0800
+
+orbit2 (2.3.104-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Chris Waters   Fri,  8 Feb 2002 01:24:01 -0800
+
+orbit2 (2.3.102-2) unstable; urgency=low
+
+  * Added missing dependency on indent (closes:#131426)
+
+ -- Chris Waters   Tue, 29 Jan 2002 14:38:50 -0800
+
+orbit2 (2.3.102-1) unstable; urgency=low
+
+  * New upstream release.
+  * New (hopefully better) patch for the recurring libtool problems with
+    the Everything module.  (closes:#128476)
+
+ -- Chris Waters   Sat, 12 Jan 2002 21:45:02 -0800
+
+orbit2 (2.3.101-2) unstable; urgency=low
+
+  * Updated versioned build-depends on linc (closes:#127970).
+
+ -- Chris Waters   Mon,  7 Jan 2002 13:40:13 -0800
+
+orbit2 (2.3.101-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Chris Waters   Sat,  5 Jan 2002 02:38:18 -0800
+
+orbit2 (2.3.100-1) unstable; urgency=low
+
+  * New upstream release.  Includes fix for build problems with Everything
+    module (closes:#122546).
+
+ -- Chris Waters   Tue, 18 Dec 2001 16:42:59 -0800
+
+orbit2 (2.3.99-2) unstable; urgency=low
+
+  * Was installing Everything .so module in wrong place (although links
+    and .a were going to the right place).  Yeesh.
+
+ -- Chris Waters   Fri,  7 Dec 2001 13:46:30 -0800
+
+orbit2 (2.3.99-1) unstable; urgency=low
+
+  * New upstream release (closes:#121748).
+  * Added some more versioned depends (closes:#119484,#121751) 
+
+ -- Chris Waters   Sat,  1 Dec 2001 13:42:55 -0800
+
+orbit2 (2.3.97-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added versioned build-depends on libglib1.3.
+
+ -- Chris Waters   Mon,  5 Nov 2001 12:32:05 -0800
+
+orbit2 (2.3.95-1) unstable; urgency=low
+
+  * Initial packaging for Debian.
+  * Created manual page for orbit2-config.
+  * Patched orbit2-config to actually work.
+  
+ -- Chris Waters   Tue, 23 Oct 2001 23:34:14 -0700
+
--- orbit2-2.14.10.orig/debian/name-client-2.dbk
+++ orbit2-2.14.10/debian/name-client-2.dbk
@@ -0,0 +1,184 @@
+
+
+
+
+  
+    
+      2003
+      W. Borgert
+    
+    2003-12-12
+    
+      
+	W.
+	Borgert
+	debacle@debian.org
+      
+    
+    
+      
+	1
+	2003-12-12
+	WB
+	initial version
+      
+    
+  
+
+  
+    name-client-2
+
+    1
+  
+
+  
+    name-client-2
+
+    CORBA Naming Service client
+  
+
+  
+    
+      name-client-2
+
+      root
+      bind rebind
+      bind_context rebind_context
+      name
+      object-id
+    
+
+    
+      name-client-2
+
+      root
+      resolve unbind
+      bind_new_context list
+      destroy
+      name
+    
+
+    
+      name-client-2
+
+      root
+      
+    
+  
+
+  
+    Description
+
+    name-client-2 is used to query or control
+    a CORBA Name Service, such as the
+    orbit-name-server-2.
+  
+
+  
+    Options
+
+    name-client-2 accepts the following
+    arguments:
+
+    
+      
+	
+	  
+	    root
+	     
+	    
+	    
+	    name object-id
+	  
+	
+	
+	  Binds or rebinds an object or naming context to name.
+	
+      
+      
+	
+	  
+	    root
+	     
+	     
+	    
+	    name
+	  
+	
+	
+	  Resolves, unbinds, lists, or destroys name or binds
+	  name to a new context.
+	
+      
+      
+	
+	  
+	    root
+	    
+	  
+	
+	
+	  Creates a new naming context and writes its IOR to
+	  standard output.
+	
+      
+    
+
+    Components of name are delimited by
+    / (slash).
+
+    id and kind of
+    those components are delimited by .
+    (dot).
+
+    root denotes the IOR of the root naming
+    context, it is either:
+
+    
+      
+	the IOR itself
+      
+
+      
+	: the IOR is read from
+	stdin.
+      
+
+      
+	: the GNOME Name Server is
+	used.
+      
+    
+
+    object-id is the IOR of an
+    object.
+  
+
+  
+    Files
+
+    On startup, name-client-2 tries to read
+    the files /etc/orbitrc and
+    $HOME/.orbitrc.  The format of these files is
+    not yet documented in Debian.
+  
+
+  
+    See Also
+
+    ORBit2 web pages: GNOME, SourceForge
+    
+  
+
+  
+    Authors
+
+    This manual was written by W.
+    Borgert
+    debacle@debian.org for Debian
+    GNU/Linux.
+  
+
--- orbit2-2.14.10.orig/debian/orbit2-nameserver.install
+++ orbit2-2.14.10/debian/orbit2-nameserver.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin/name-client-2
+debian/tmp/usr/bin/orbit-name-server-2
--- orbit2-2.14.10.orig/debian/control
+++ orbit2-2.14.10/debian/control
@@ -0,0 +1,71 @@
+Source: orbit2
+Section: net
+Priority: optional
+Maintainer: Ubuntu Desktop Team 
+Original-Maintainer: Sebastian Rittau 
+Standards-Version: 3.7.2
+Build-Depends: libglib2.0-dev (>= 2.8.0), libidl-dev (>= 0.8.0), pkg-config, cdbs, debhelper (>= 4.1.0), docbook-xsl, gtk-doc-tools (>= 1.6-2)
+
+Package: liborbit2
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: liborbit2-dev (<< 2.8.1-1)
+Conflicts: liborbit2-dev (<< 2.8.1-1), liblinc1 (<< 1.0.3-4), libbonobo-activation4 (<< 1:2.4.0)
+Description: libraries for ORBit2 - a CORBA ORB
+ ORBit2 is a high-performance CORBA (Common Object Request Broker
+ Architecture) ORB (Object Request Broker). It allows programs to send
+ requests and receive replies from other programs, regardless of the
+ locations of the two programs. CORBA is an architecture that enables
+ communication between program objects, regardless of the programming
+ language they're written in or the operating system they run on.
+ .
+ This package contains the run-time libraries used by ORBit2-based
+ applications.
+
+Package: orbit2
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: a CORBA ORB
+ ORBit2 is a high-performance CORBA (Common Object Request Broker
+ Architecture) ORB (Object Request Broker). It allows programs to send
+ requests and receive replies from other programs, regardless of the
+ locations of the two programs. CORBA is an architecture that enables
+ communication between program objects, regardless of the programming
+ language they're written in or the operating system they run on.
+ .
+ This package contains the command-line utilities ior-decode-2 and 
+ typelib-dump.
+
+Package: orbit2-nameserver
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: a CORBA name server
+ ORBit2 is a high-performance CORBA (Common Object Request Broker
+ Architecture) ORB (Object Request Broker). It allows programs to send
+ requests and receive replies from other programs, regardless of the
+ locations of the two programs. CORBA is an architecture that enables
+ communication between program objects, regardless of the programming
+ language they're written in or the operating system they run on.
+ .
+ This packages includes the CORBA nameserver and a utility client program.
+
+Package: liborbit2-dev
+Architecture: any
+Section: libdevel
+Depends: liborbit2 (= ${binary:Version}), libidl-dev (>= 0.8.6-1), libglib2.0-dev, pkg-config, ${shlibs:Depends}, ${misc:Depends}
+Recommends: orbit2
+Conflicts: liblinc-dev
+Description: development files for ORBit2 - a CORBA ORB
+ ORBit2 is a high-performance CORBA (Common Object Request Broker
+ Architecture) ORB (Object Request Broker). It allows programs to send
+ requests and receive replies from other programs, regardless of the
+ locations of the two programs. CORBA is an architecture that enables
+ communication between program objects, regardless of the programming
+ language they're written in or the operating system they run on.
+ .
+ This package contains the header files and static libraries used for
+ developing ORBit2-based applications. It also contains the IDL compiler
+ needed to import object definitions into your C programs.
--- orbit2-2.14.10.orig/debian/orbit2-config.1
+++ orbit2-2.14.10/debian/orbit2-config.1
@@ -0,0 +1,80 @@
+.\" created for orbit2-config by Chris Waters, for Debian GNU/Linux
+.\"
+.TH ORBIT2-CONFIG 1 "18 December 2001" "Version 2.3.100"
+
+.SH NAME
+orbit2\-config \- helper script for building with ORBit2
+.SH SYNOPSIS
+.HP
+.B orbit2\-config
+.RB "[ " \-\-libs " ] [ " \-\-cflags " ]"
+[
+.BI \-\-prefix =dir
+] [
+.BI \-\-exec\-prefix =dir
+] [
+.BI \-\-use\-service =service
+]
+.RB "[ " client " | " server " ]"
+.HP
+.B orbit2\-config
+.RB "[ " \-\-version " ] [ " \-\-help " ]"
+
+.SH DESCRIPTION
+.B orbit2-config
+is a tool that is used to determine the compiler and linker flags that
+should be used to compile and link programs that use the \fIorbit2\fP
+library. It is also used internally by the .m4 macros for GNU autoconf
+that are included with \fIorbit2\fP.
+
+The argument \fBclient\fP is used for compiling an orbit2 client, and
+\fBserver\fP for compiling an orbit2 server.  In most cases, you will
+use one (or both) of the options \fB\-\-cflags\fP or \fB\-\-libs\fP
+(depending on whether you are compiling or linking.
+
+.SH OPTIONS
+.B orbit2-config
+accepts the following options:
+.TP
+.B \-\-version
+Print the currently installed version of \fIlibrary\fP on the standard output.
+.TP
+.B \-\-help
+Print a usage summary.
+.TP
+.B \-\-cflags
+Print the compiler flags that are necessary to compile a program using
+the specified \fIlibrary\fP.
+.TP
+.B \-\-libs
+Print the linker flags that are necessary to link with the specified
+\fIlibrary\fP.
+.TP
+.BI \-\-prefix =PREFIX
+If specified, use PREFIX instead of the installation prefix that \fIlibrary\fP
+was built with when computing the output for the \-\-cflags and
+\-\-libs options. This option is also used for the exec prefix
+if \-\-exec\-prefix was not specified. This option must be specified
+before any \-\-libs or \-\-cflags options.
+.TP
+.BI \-\-exec\-prefix =PREFIX
+If specified, use PREFIX instead of the installation exec prefix that
+\fIlibrary\fP was built with when computing the output for the \-\-cflags
+and \-\-libs options.  This option must be specified before any
+\-\-libs or \-\-cflags options.
+.TP
+.BI \-\-use-service= SERVICE
+If specified, provide additional flags (if any) for using the
+specified service.  Known values for SERVICE are: module CosNaming,
+interfaces LNameComponent, LName.
+
+.SH SEE ALSO
+orbit-idl-2(1), /usr/share/doc/liborbit2-dev,
+http://orbit-resource.sourceforge.net, http://www.omg.org.
+
+.SH AUTHOR
+Copyright \(co  2001, 2002 Dick Porter  and Elliot Lee
+
+
+This manual was originally written for orbit2-config by Chris Waters
+ for Debian GNU/Linux.
--- orbit2-2.14.10.orig/debian/compat
+++ orbit2-2.14.10/debian/compat
@@ -0,0 +1 @@
+4
--- orbit2-2.14.10.orig/debian/liborbit2.install
+++ orbit2-2.14.10/debian/liborbit2.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/lib/orbit-2.0/Everything_module.so
--- orbit2-2.14.10.orig/debian/orbit2.manpages
+++ orbit2-2.14.10/debian/orbit2.manpages
@@ -0,0 +1,3 @@
+debian/ior-decode-2.1
+debian/linc-cleanup-sockets.1
+debian/typelib-dump.1
--- orbit2-2.14.10.orig/debian/orbit-name-server-2.dbk
+++ orbit2-2.14.10/debian/orbit-name-server-2.dbk
@@ -0,0 +1,122 @@
+
+
+
+
+  
+    
+      2003
+      W. Borgert
+    
+    2003-12-12
+    
+      
+	W.
+	Borgert
+	debacle@debian.org
+      
+    
+    
+      
+	1
+	2003-12-12
+	WB
+	initial version
+      
+    
+  
+
+  
+    orbit-name-server-2
+
+    1
+  
+
+  
+    orbit-name-server-2
+
+    CORBA Naming Server
+  
+
+  
+    
+      orbit-name-server-2
+
+      
+
+      
+
+      
+
+      
+    
+  
+
+  
+    Description
+
+    orbit-name-server-2 is an ORBit2 based
+    implementation of the OMG's COS Naming Service
+    Specification.
+
+    When orbit-name-server-2 starts up
+    successfully it writes the stringified object reference for its
+    root context on standard output.
+  
+
+  
+    Options
+
+    orbit-name-server-2 accepts the following
+    options:
+
+    
+      
+	
+	
+	  Respond to corbaloc requests with this object key.
+	
+      
+      
+	
+	  
+	
+	  Show a help message.
+	
+      
+      
+	
+	
+	  Display a brief usage message.
+	
+      
+    
+  
+
+  
+    Files
+
+    On startup, orbit-name-server-2 tries to
+    read the files /etc/orbitrc and
+    $HOME/.orbitrc.  The format of these files is
+    not yet documented in Debian.
+  
+
+  
+    See Also
+
+    ORBit2 web pages: GNOME, SourceForge
+    
+  
+
+  
+    Authors
+
+    This manual was written by W.
+    Borgert
+    debacle@debian.org for Debian
+    GNU/Linux.
+  
+
--- orbit2-2.14.10.orig/debian/orbit2-nameserver.manpages
+++ orbit2-2.14.10/debian/orbit2-nameserver.manpages
@@ -0,0 +1,2 @@
+debian/name-client-2.1
+debian/orbit-name-server-2.1
--- orbit2-2.14.10.orig/debian/linc-cleanup-sockets.1
+++ orbit2-2.14.10/debian/linc-cleanup-sockets.1
@@ -0,0 +1,26 @@
+.\" created for linc-cleanup-sockets by Chris Waters, for Debian GNU/Linux
+.\"
+.TH LINC-CLEANUP-SOCKETS 1 "21 October 2003" "Version 2.8.1"
+
+.SH NAME
+linc\-cleanup-sockets \- removes leftover ORBit files from /tmp
+
+.SH SYNOPSIS
+.HP
+.B linc\-cleanup\-sockets
+
+.SH DESCRIPTION
+.B linc\-cleanup\-sockets
+is a tool used internally by GNOME to cleanup any leftover sockets for
+a user that may be left behind in /tmp.  It examines any sockets found
+in the directory /tmp/orbit-\fIusername\fP.  You may run it yourself
+when needed or desired.  It prints a brief status message when done.
+
+.SH OPTIONS
+none
+
+.SH AUTHOR
+Copyright \(co 2002, Michael Meeks  
+
+This manual was originally written for linc\-cleanup\-sockets by Chris
+Waters for Debian GNU/Linux.
--- orbit2-2.14.10.orig/debian/patches/101-g_assert.patch
+++ orbit2-2.14.10/debian/patches/101-g_assert.patch
@@ -0,0 +1,15 @@
+--- ./include/orbit/GIOP/giop-endian.h.orig	2007-09-10 12:11:47.000000000 +0000
++++ ./include/orbit/GIOP/giop-endian.h	2008-01-25 11:27:27.000000000 +0000
+@@ -8,9 +8,12 @@
+ #ifdef ORBIT2_INTERNAL_API
+ 
+ /* This is also defined in IIOP-types.c */
++#if 0
++// error: static declaration of 'giop_byteswap' follows non-static declaration
+ void giop_byteswap(guchar *outdata,
+ 		   const guchar *data,
+ 		   gulong datalen);
++#endif
+ 
+ #if defined(G_CAN_INLINE) && !defined(GIOP_DO_NOT_INLINE_IIOP_BYTESWAP)
+ G_INLINE_FUNC void giop_byteswap(guchar *outdata,
--- orbit2-2.14.10.orig/debian/patches/700-autoreconf.patch
+++ orbit2-2.14.10/debian/patches/700-autoreconf.patch
@@ -0,0 +1,933 @@
+diff -Nur orbit2-2.14.9/aclocal.m4 orbit2-2.14.9.new/aclocal.m4
+--- orbit2-2.14.9/aclocal.m4	2007-09-17 11:47:24.000000000 +0200
++++ orbit2-2.14.9.new/aclocal.m4	2007-09-17 16:52:07.000000000 +0200
+@@ -27,22 +27,22 @@
+   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+   dnl for overriding the documentation installation directory
+-  AC_ARG_WITH(html-dir,
+-    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
++  AC_ARG_WITH([html-dir],
++    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+     [with_html_dir='${datadir}/gtk-doc/html'])
+   HTML_DIR="$with_html_dir"
+-  AC_SUBST(HTML_DIR)
++  AC_SUBST([HTML_DIR])
+ 
+   dnl enable/disable documentation building
+-  AC_ARG_ENABLE(gtk-doc,
+-    AC_HELP_STRING([--enable-gtk-doc],
+-                   [use gtk-doc to build documentation [default=no]]),,
+-    enable_gtk_doc=no)
++  AC_ARG_ENABLE([gtk-doc],
++    AS_HELP_STRING([--enable-gtk-doc],
++                   [use gtk-doc to build documentation [[default=no]]]),,
++    [enable_gtk_doc=no])
+ 
+   have_gtk_doc=no
+   if test x$enable_gtk_doc = xyes; then
+     if test -z "$PKG_CONFIG"; then
+-      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++      AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
+     fi
+     if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
+       have_gtk_doc=yes
+@@ -54,9 +54,9 @@
+     if test "$have_gtk_doc" = yes; then
+       AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
+       if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
+-        AC_MSG_RESULT(yes)
++        AC_MSG_RESULT([yes])
+       else
+-        AC_MSG_RESULT(no)
++        AC_MSG_RESULT([no])
+         have_gtk_doc=no
+       fi
+     fi
+@@ -66,13 +66,13 @@
+     fi
+   fi
+ 
+-  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+-  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
++  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
++  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+ ])
+ 
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ 
+-# serial 51 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -624,7 +624,6 @@
+       esac
+       ;;
+     *64-bit*)
+-      libsuff=64
+       case $host in
+         x86_64-*kfreebsd*-gnu)
+           LD="${LD-ld} -m elf_x86_64_fbsd"
+@@ -1683,13 +1682,11 @@
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -1701,6 +1698,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -2475,7 +2484,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   else
+@@ -3509,7 +3518,7 @@
+ 	;;
+     esac
+     ;;
+-  netbsd*)
++  netbsd* | netbsdelf*-gnu)
+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+       wlarc=
+@@ -5190,7 +5199,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+@@ -5565,6 +5574,9 @@
+   cygwin* | mingw*)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+   ;;
++  linux* | k*bsd*-gnu)
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++  ;;
+   *)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+@@ -5770,12 +5782,13 @@
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+ 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -6207,7 +6220,7 @@
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+diff -Nur orbit2-2.14.9/config.h.in~ orbit2-2.14.9.new/config.h.in~
+--- orbit2-2.14.9/config.h.in~	1970-01-01 01:00:00.000000000 +0100
++++ orbit2-2.14.9.new/config.h.in~	2007-09-17 11:58:50.000000000 +0200
+@@ -0,0 +1,197 @@
++/* config.h.in.  Generated from configure.in by autoheader.  */
++
++/* Define if HTTP connections are available */
++#undef ENABLE_HTTP
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_ARPA_INET_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_ARPA_NAMESER_H
++
++/* Define to 1 if you have the `basename' function. */
++#undef HAVE_BASENAME
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_DLFCN_H
++
++/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
++#undef HAVE_DOPRNT
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_ENDIAN_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_FCNTL_H
++
++/* Define if getaddrinfo() is available */
++#undef HAVE_GETADDRINFO
++
++/* Define if getnameinfo() is available */
++#undef HAVE_GETNAMEINFO
++
++/* Define if inet_pton() is available */
++#undef HAVE_INET_PTON
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_INTTYPES_H
++
++/* Define to 1 if you have the `nsl' library (-lnsl). */
++#undef HAVE_LIBNSL
++
++/* Define to 1 if you have the `resolv' library (-lresolv). */
++#undef HAVE_LIBRESOLV
++
++/* Define to 1 if you have the `socket' library (-lsocket). */
++#undef HAVE_LIBSOCKET
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_LINUX_SOCKET_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_MACHINE_ENDIAN_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_MACHINE_TYPES_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_MEMORY_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_NETDB_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_NETINET_IN_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_NETINET_TCP_H
++
++/* Define to 1 if you have the `poll' function. */
++#undef HAVE_POLL
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_RESOLV_H
++
++/* Define if sockaddr has sa_len member */
++#undef HAVE_SOCKADDR_SA_LEN
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_STDDEF_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_STDINT_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_STDLIB_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_STRINGS_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_STRING_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_SYSLOG_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_SYS_ENDIAN_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_SYS_ISA_DEFS_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_SYS_MACHINE_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_SYS_POLL_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_SYS_SELECT_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_SYS_SOCKET_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_SYS_SOCKIO_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_SYS_STAT_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_SYS_TIME_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_SYS_TYPES_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_SYS_UIO_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_SYS_UN_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_SYS_UTIME_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_SYS_WAIT_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_UNISTD_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_UTIME_H
++
++/* Define to 1 if you have the `vprintf' function. */
++#undef HAVE_VPRINTF
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_WCHAR_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_WCSTR_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_WCTYPE_H
++
++/* Define to 1 if you have the  header file. */
++#undef HAVE_WINSOCK2_H
++
++/* defined if purify is enabled */
++#undef ORBIT_PURIFY
++
++/* Define to the address where bug reports for this package should be sent. */
++#undef PACKAGE_BUGREPORT
++
++/* Define to the full name of this package. */
++#undef PACKAGE_NAME
++
++/* Define to the full name and version of this package. */
++#undef PACKAGE_STRING
++
++/* Define to the one symbol short name of this package. */
++#undef PACKAGE_TARNAME
++
++/* Define to the version of this package. */
++#undef PACKAGE_VERSION
++
++/* Define to 1 if you have the ANSI C header files. */
++#undef STDC_HEADERS
++
++/* Define to 1 if your processor stores words with the most significant byte
++   first (like Motorola and SPARC, unlike Intel and VAX). */
++#undef WORDS_BIGENDIAN
++
++/* Define to empty if `const' does not conform to ANSI C. */
++#undef const
++
++/* Define to `__inline__' or `__inline' if that's what the C compiler
++   calls it, or to nothing if 'inline' is not supported under any name.  */
++#ifndef __cplusplus
++#undef inline
++#endif
++
++/* Define to `unsigned int' if  does not define. */
++#undef size_t
++
++/* Define socklen_t to be of type size_t */
++#undef socklen_t
+diff -Nur orbit2-2.14.9/configure orbit2-2.14.9.new/configure
+--- orbit2-2.14.9/configure	2007-09-17 11:47:28.000000000 +0200
++++ orbit2-2.14.9.new/configure	2007-09-17 16:52:12.000000000 +0200
+@@ -1541,7 +1541,7 @@
+   --enable-compile-warnings=no/yes Turn on compiler warnings.
+   --enable-debug=no/yes turn on debugging default=no
+   --enable-purify        be clean for memory debuggers
+-  --enable-gtk-doc        use gtk-doc to build documentation default=no
++  --enable-gtk-doc        use gtk-doc to build documentation [default=no]
+ 
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+@@ -4428,7 +4428,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   else
+@@ -4614,7 +4614,6 @@
+       esac
+       ;;
+     *64-bit*)
+-      libsuff=64
+       case $host in
+         x86_64-*kfreebsd*-gnu)
+           LD="${LD-ld} -m elf_x86_64_fbsd"
+@@ -7582,11 +7581,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7585: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7584: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:7589: \$? = $ac_status" >&5
++   echo "$as_me:7588: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -7872,11 +7871,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7875: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7874: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:7879: \$? = $ac_status" >&5
++   echo "$as_me:7878: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -7976,11 +7975,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7979: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7978: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:7983: \$? = $ac_status" >&5
++   echo "$as_me:7982: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -8240,12 +8239,13 @@
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+ 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
++	link_all_deplibs=no
+       else
+ 	ld_shlibs=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -8789,7 +8789,7 @@
+       link_all_deplibs=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -9484,13 +9484,11 @@
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -9502,6 +9500,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -10327,7 +10337,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext < conftest.$ac_ext </dev/null; then
+       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+       wlarc=
+@@ -12738,7 +12748,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+@@ -12847,11 +12857,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:12850: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:12860: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:12854: \$? = $ac_status" >&5
++   echo "$as_me:12864: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -12951,11 +12961,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:12954: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:12964: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:12958: \$? = $ac_status" >&5
++   echo "$as_me:12968: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -13023,6 +13033,9 @@
+   cygwin* | mingw*)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+   ;;
++  linux* | k*bsd*-gnu)
++    link_all_deplibs_CXX=no
++  ;;
+   *)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+@@ -13452,13 +13465,11 @@
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -13470,6 +13481,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -14515,11 +14538,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14518: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14541: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:14522: \$? = $ac_status" >&5
++   echo "$as_me:14545: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -14619,11 +14642,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14622: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14645: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:14626: \$? = $ac_status" >&5
++   echo "$as_me:14649: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -14883,12 +14906,13 @@
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+ 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
++	link_all_deplibs_F77=no
+       else
+ 	ld_shlibs_F77=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -15412,7 +15436,7 @@
+       link_all_deplibs_F77=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -16055,13 +16079,11 @@
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -16073,6 +16095,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -16808,11 +16842,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16811: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16845: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:16815: \$? = $ac_status" >&5
++   echo "$as_me:16849: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -17098,11 +17132,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:17101: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17135: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:17105: \$? = $ac_status" >&5
++   echo "$as_me:17139: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -17202,11 +17236,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:17205: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17239: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:17209: \$? = $ac_status" >&5
++   echo "$as_me:17243: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -17466,12 +17500,13 @@
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+ 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
++	link_all_deplibs_GCJ=no
+       else
+ 	ld_shlibs_GCJ=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -18015,7 +18050,7 @@
+       link_all_deplibs_GCJ=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -18658,13 +18693,11 @@
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -18676,6 +18709,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+diff -Nur orbit2-2.14.9/src/services/name/Makefile.in orbit2-2.14.9.new/src/services/name/Makefile.in
+--- orbit2-2.14.9/src/services/name/Makefile.in	2007-09-17 11:58:55.000000000 +0200
++++ orbit2-2.14.9.new/src/services/name/Makefile.in	2007-09-17 16:52:18.000000000 +0200
+@@ -35,7 +35,7 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-noinst_PROGRAMS = name-client-2$(EXEEXT) orbit-name-server-2$(EXEEXT)
++bin_PROGRAMS = name-client-2$(EXEEXT) orbit-name-server-2$(EXEEXT)
+ DIST_COMMON = README $(libORBitservicesinclude_HEADERS) \
+ 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(top_srcdir)/Makefile.shared
+@@ -55,7 +55,7 @@
+   esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" \
+-	"$(DESTDIR)$(idldir)" \
++	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(idldir)" \
+ 	"$(DESTDIR)$(libORBitservicesincludedir)"
+ libLIBRARIES_INSTALL = $(INSTALL_DATA)
+ LIBRARIES = $(lib_LIBRARIES)
+@@ -74,7 +74,8 @@
+ libORBitCosNaming_2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libORBitCosNaming_2_la_LDFLAGS) $(LDFLAGS) -o $@
+-PROGRAMS = $(noinst_PROGRAMS)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
++PROGRAMS = $(bin_PROGRAMS)
+ am_name_client_2_OBJECTS = name-client.$(OBJEXT) \
+ 	name-support.$(OBJEXT)
+ name_client_2_OBJECTS = $(am_name_client_2_OBJECTS)
+@@ -425,9 +426,30 @@
+ 	done
+ libORBitCosNaming-2.la: $(libORBitCosNaming_2_la_OBJECTS) $(libORBitCosNaming_2_la_DEPENDENCIES) 
+ 	$(libORBitCosNaming_2_la_LINK) -rpath $(libdir) $(libORBitCosNaming_2_la_OBJECTS) $(libORBitCosNaming_2_la_LIBADD) $(LIBS)
++install-binPROGRAMS: $(bin_PROGRAMS)
++	@$(NORMAL_INSTALL)
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  if test -f $$p \
++	     || test -f $$p1 \
++	  ; then \
++	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	  else :; fi; \
++	done
++
++uninstall-binPROGRAMS:
++	@$(NORMAL_UNINSTALL)
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
++	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	done
+ 
+-clean-noinstPROGRAMS:
+-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
++clean-binPROGRAMS:
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  echo " rm -f $$p $$f"; \
+ 	  rm -f $$p $$f ; \
+@@ -596,8 +618,10 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-am
+ all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(DATA) \
+ 		$(HEADERS)
++install-binPROGRAMS: install-libLTLIBRARIES
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(idldir)" "$(DESTDIR)$(libORBitservicesincludedir)"; do \
++	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(idldir)" "$(DESTDIR)$(libORBitservicesincludedir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: $(BUILT_SOURCES)
+@@ -629,8 +653,8 @@
+ 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+ clean: clean-am
+ 
+-clean-am: clean-generic clean-libLIBRARIES clean-libLTLIBRARIES \
+-	clean-libtool clean-noinstPROGRAMS mostlyclean-am
++clean-am: clean-binPROGRAMS clean-generic clean-libLIBRARIES \
++	clean-libLTLIBRARIES clean-libtool mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+@@ -653,7 +677,8 @@
+ 
+ install-dvi: install-dvi-am
+ 
+-install-exec-am: install-libLIBRARIES install-libLTLIBRARIES
++install-exec-am: install-binPROGRAMS install-libLIBRARIES \
++	install-libLTLIBRARIES
+ 
+ install-html: install-html-am
+ 
+@@ -685,27 +710,28 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-idlDATA uninstall-libLIBRARIES \
+-	uninstall-libLTLIBRARIES \
++uninstall-am: uninstall-binPROGRAMS uninstall-idlDATA \
++	uninstall-libLIBRARIES uninstall-libLTLIBRARIES \
+ 	uninstall-libORBitservicesincludeHEADERS
+ 
+ .MAKE: install-am install-strip
+ 
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+-	clean-libLIBRARIES clean-libLTLIBRARIES clean-libtool \
+-	clean-noinstPROGRAMS ctags dist-hook distclean \
+-	distclean-compile distclean-generic distclean-libtool \
+-	distclean-local distclean-tags distdir dvi dvi-am html html-am \
+-	info info-am install install-am install-data install-data-am \
+-	install-dvi install-dvi-am install-exec install-exec-am \
+-	install-html install-html-am install-idlDATA install-info \
+-	install-info-am install-libLIBRARIES install-libLTLIBRARIES \
+-	install-libORBitservicesincludeHEADERS install-man install-pdf \
+-	install-pdf-am install-ps install-ps-am install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-idlDATA \
++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
++	clean-generic clean-libLIBRARIES clean-libLTLIBRARIES \
++	clean-libtool ctags dist-hook distclean distclean-compile \
++	distclean-generic distclean-libtool distclean-local \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-binPROGRAMS install-data \
++	install-data-am install-dvi install-dvi-am install-exec \
++	install-exec-am install-html install-html-am install-idlDATA \
++	install-info install-info-am install-libLIBRARIES \
++	install-libLTLIBRARIES install-libORBitservicesincludeHEADERS \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++	uninstall-am uninstall-binPROGRAMS uninstall-idlDATA \
+ 	uninstall-libLIBRARIES uninstall-libLTLIBRARIES \
+ 	uninstall-libORBitservicesincludeHEADERS
+ 
--- orbit2-2.14.10.orig/debian/patches/100-compile-name-server.patch
+++ orbit2-2.14.10/debian/patches/100-compile-name-server.patch
@@ -0,0 +1,12 @@
+diff -Nur orbit2-2.14.3/src/services/name/Makefile.am orbit2-2.14.3.new/src/services/name/Makefile.am
+--- orbit2-2.14.3/src/services/name/Makefile.am	2006-08-30 00:33:12.000000000 +0200
++++ orbit2-2.14.3.new/src/services/name/Makefile.am	2006-10-24 15:58:44.000000000 +0200
+@@ -8,7 +8,7 @@
+ 
+ lib_LTLIBRARIES=libORBitCosNaming-2.la
+ 
+-noinst_PROGRAMS = name-client-2 orbit-name-server-2
++bin_PROGRAMS = name-client-2 orbit-name-server-2
+ 
+ lib_LIBRARIES = libname-server-2.a
+ 
--- orbit2-2.14.10.orig/debian/patches/m68k/10-aligment-misc-fixes.patch
+++ orbit2-2.14.10/debian/patches/m68k/10-aligment-misc-fixes.patch
@@ -0,0 +1,61 @@
+- The code treats GIOPMsgRequest_1_0 and GIOPMsgRequest_1_1 as equal,
+  but they aren't on m68k, a simple fix is to add the padding to
+  GIOPMsgRequest_1_0 as well. The more complex solution, would be to
+  duplicate the code dealing with these two structures.
+- giop-recv-buffer.c expects a buffer to be aligned at 4 bytes, but
+  giop_recv_buffer_use_encaps() doesn't check for this.
+- The assert in CORBA_ORB_init() triggers during startup, because the
+  alignment is 2 and since only the lowest bit is used, this should be
+  sufficient.
+
+
+diff -ur orbit2-2.14.0.org/include/orbit/GIOP/giop-types.h orbit2-2.14.0/include/orbit/GIOP/giop-types.h
+--- orbit2-2.14.0.org/include/orbit/GIOP/giop-types.h	2003-10-27 17:14:12.000000000 +0100
++++ orbit2-2.14.0/include/orbit/GIOP/giop-types.h	2006-10-01 02:17:46.000000000 +0200
+@@ -104,6 +104,7 @@
+   IOP_ServiceContextList service_context;
+   CORBA_unsigned_long request_id;
+   CORBA_boolean response_expected;
++  CORBA_char reserved[3];
+   CORBA_sequence_CORBA_octet object_key;
+   CORBA_char *operation;
+   CORBA_Principal requesting_principal;
+diff -ur orbit2-2.14.0.org/src/orb/GIOP/giop-recv-buffer.c orbit2-2.14.0/src/orb/GIOP/giop-recv-buffer.c
+--- orbit2-2.14.0.org/src/orb/GIOP/giop-recv-buffer.c	2006-03-08 13:03:54.000000000 +0100
++++ orbit2-2.14.0/src/orb/GIOP/giop-recv-buffer.c	2006-09-30 14:35:14.000000000 +0200
+@@ -423,6 +423,14 @@
+ giop_recv_buffer_use_encaps (guchar *mem, gulong len)
+ {
+ 	GIOPRecvBuffer *buf = giop_recv_buffer_use_buf (NULL);
++	gboolean free_body = FALSE;
++
++	if (ALIGN_ADDRESS (mem, 4) != mem) {
++		guchar *mem2 = g_malloc (len);
++		memcpy (mem2, mem, len);
++		mem = mem2;
++		free_body = TRUE;
++	}
+ 
+ 	buf->cur = buf->message_body = mem;
+ 	buf->end = buf->cur + len;
+@@ -431,7 +439,7 @@
+ 	buf->giop_version = GIOP_LATEST;
+ 	buf->left_to_read = 0;
+ 	buf->state = GIOP_MSG_READY;
+-	buf->free_body = FALSE;
++	buf->free_body = free_body;
+ 
+ 	return buf;
+ }
+diff -ur orbit2-2.14.0.org/src/orb/orb-core/corba-orb.c orbit2-2.14.0/src/orb/orb-core/corba-orb.c
+--- orbit2-2.14.0.org/src/orb/orb-core/corba-orb.c	2005-11-17 15:41:55.000000000 +0100
++++ orbit2-2.14.0/src/orb/orb-core/corba-orb.c	2006-09-29 14:16:52.000000000 +0200
+@@ -392,7 +392,7 @@
+ 		return ORBit_RootObject_duplicate (retval);
+ 
+ 	/* the allocation code uses the bottom bit of any pointer */
+-	g_assert (ORBIT_ALIGNOF_CORBA_DOUBLE > 2);
++	g_assert (ORBIT_ALIGNOF_CORBA_DOUBLE >= 2);
+ 
+ 	if (orb_identifier &&
+ 	    strstr (orb_identifier, "orbit-local-non-threaded-orb") != NULL)
--- orbit2-2.14.10.orig/debian/liborbit2.docs
+++ orbit2-2.14.10/debian/liborbit2.docs
@@ -0,0 +1 @@
+README NEWS AUTHORS
--- orbit2-2.14.10.orig/debian/orbit2.install
+++ orbit2-2.14.10/debian/orbit2.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/bin/ior-decode-2
+debian/tmp/usr/bin/linc-cleanup-sockets
+debian/tmp/usr/bin/typelib-dump

-Allocators +Allocators

Allocators — Memory allocation functions for CORBA types.