diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-06-18 06:49:03 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-06-18 06:49:03 +0000 |
| commit | 19957c5ec8c8473c2c03d8c05ed14d82188e431f (patch) | |
| tree | 6579f62e3348ce5bd6633777b2864fb6a3e35f41 /ACE | |
| parent | 88ce4e694e9e9e61b40a8432206a57940fc19375 (diff) | |
| download | ATCD-19957c5ec8c8473c2c03d8c05ed14d82188e431f.tar.gz | |
Mon Jun 18 06:44:11 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* debian/*:
Updated with latest files from debian packaging
Diffstat (limited to 'ACE')
30 files changed, 553 insertions, 772 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index fb0c208f294..1bfb4a31580 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Mon Jun 18 06:44:11 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * debian/*: + Updated with latest files from debian packaging + Thu Jun 14 14:05:13 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * ace/XML_Utils/XML_Error_Handler.cpp: diff --git a/ACE/debian/Basic_Logging_Service.sgml b/ACE/debian/Basic_Logging_Service.sgml deleted file mode 100644 index d3dd5a50714..00000000000 --- a/ACE/debian/Basic_Logging_Service.sgml +++ /dev/null @@ -1,68 +0,0 @@ -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ - <!ENTITY applname "Basic_Logging_Service"> - <!ENTITY revision "$Revision$"> - <!ENTITY man_tao_orb_options "<citerefentry><refentrytitle>TAO_ORB_Options</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_notify_logging_service "<citerefentry><refentrytitle>Notify_Logging_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_event_logging_service "<citerefentry><refentrytitle>Event_Logging_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_rt_event_logging_service "<citerefentry><refentrytitle>RTEvent_Logging_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_naming_service "<citerefentry><refentrytitle>Naming_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY Naming_Service "<application>tao_cosnaming</application>"> - <!ENTITY Basic_Logging_Service "<application>tao_tls_basic</application>"> - <!ENTITY seealso "&man_tao_orb_options;, &man_notify_logging_service;, &man_event_logging_service;, &man_rt_event_logging_service;, &man_naming_service;"> - <!ENTITY year "1999"> - <!ENTITY username "David Hanvey"> - <!ENTITY useremail "<email><d.hanvey@qub.ac.uk></email>"> -]> -<refentry> - <refmeta> - <refentrytitle>BASIC_LOGGING_SERVICE</refentrytitle> - <manvolnum>1</manvolnum> - </refmeta> - <refnamediv> - <refname>&applname;</refname> - <refpurpose>TAO Basic Telecom Log Service</refpurpose> - </refnamediv> - <refsynopsisdiv> - <title>SYNOPSIS</title> - <cmdsynopsis> - <command>&applname;</command> - <group><arg>-ORBoptions</arg></group> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - <para> - &applname; is an event-unaware implementation of the Telecom Log Service. - </para> - <para> - The Telecom Log Service specification may be found on the OMG - website at <ulink - url="http://www.omg.org/cgi-bin/doc?telecom/99-05-01"></ulink>. - </para> - <para> - &applname; requires a running &Naming_Service; and registers with - it as `BasicLogFactory'. - </para> - </refsect1> - <refsect1> - <title>OPTIONS</title> - <para> - The program follows the usual TAO ORB command line syntax. See - &man_tao_orb_options;. - </para> - </refsect1> - <refsect1> - <title>BUGS</title> - <para> - Currently all Logs records are stored in memory. - </para> - </refsect1> - <refsect1> - <title>SEE ALSO</title> - <para>&seealso;</para> - </refsect1> - <refsect1> - <title>AUTHOR</title> - <para>&username; &useremail;</para> - </refsect1> -</refentry> diff --git a/ACE/debian/Event_Logging_Service.sgml b/ACE/debian/Event_Logging_Service.sgml deleted file mode 100644 index 8288e3b6e0e..00000000000 --- a/ACE/debian/Event_Logging_Service.sgml +++ /dev/null @@ -1,70 +0,0 @@ -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ - <!ENTITY applname "Event_Logging_Service"> - <!ENTITY revision "$Revision$"> - <!ENTITY man_tao_orb_options "<citerefentry><refentrytitle>TAO_ORB_Options</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_event_service "<citerefentry><refentrytitle>Event_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_basic_logging_service "<citerefentry><refentrytitle>Basic_Logging_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_notify_logging_service "<citerefentry><refentrytitle>Notify_Logging_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_rt_event_logging_service "<citerefentry><refentrytitle>RTEvent_Logging_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_naming_service "<citerefentry><refentrytitle>Naming_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY Naming_Service "<application>tao_cosnaming</application>"> - <!ENTITY Event_Logging_Service "<application>tao_tls_event</application>"> - <!ENTITY seealso "&man_tao_orb_options;, &man_event_service;, &man_basic_logging_service;, &man_notify_logging_service;, &man_rt_event_logging_service;, &man_naming_service;"> - <!ENTITY year "1999"> - <!ENTITY username "David Hanvey"> - <!ENTITY useremail "<email><d.hanvey@qub.ac.uk></email>"> -]> -<refentry> - <refmeta> - <refentrytitle>EVENT_LOGGING_SERVICE</refentrytitle> - <manvolnum>1</manvolnum> - </refmeta> - <refnamediv> - <refname>&applname;</refname> - <refpurpose>TAO Event Telecom Log Service</refpurpose> - </refnamediv> - <refsynopsisdiv> - <title>SYNOPSIS</title> - <cmdsynopsis> - <command>&applname;</command> - <group><arg>-ORBoptions</arg></group> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - <para> - &applname; is an implementation of the Telecom Log Service that - integrates with the Event Service. - </para> - <para> - The Telecom Log Service specification may be found on the OMG - website at <ulink - url="http://www.omg.org/cgi-bin/doc?telecom/99-05-01"></ulink>. - </para> - <para> - &applname; requires a running &Naming_Service; and registers with - it as `EventLogFactory'. - </para> - </refsect1> - <refsect1> - <title>OPTIONS</title> - <para> - The program follows the usual TAO ORB command line syntax. See - &man_tao_orb_options;. - </para> - </refsect1> - <refsect1> - <title>BUGS</title> - <para> - Currently all Logs records are stored in memory. - </para> - </refsect1> - <refsect1> - <title>SEE ALSO</title> - <para>&seealso;</para> - </refsect1> - <refsect1> - <title>AUTHOR</title> - <para>&username; &useremail;</para> - </refsect1> -</refentry> diff --git a/ACE/debian/Notify_Logging_Service.sgml b/ACE/debian/Notify_Logging_Service.sgml deleted file mode 100644 index d1577fbdff6..00000000000 --- a/ACE/debian/Notify_Logging_Service.sgml +++ /dev/null @@ -1,70 +0,0 @@ -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ - <!ENTITY applname "Notify_Logging_Service"> - <!ENTITY revision "$Revision$"> - <!ENTITY man_tao_orb_options "<citerefentry><refentrytitle>TAO_ORB_Options</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_notify_service "<citerefentry><refentrytitle>Notify_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_basic_logging_service "<citerefentry><refentrytitle>Basic_Logging_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_event_logging_service "<citerefentry><refentrytitle>Event_Logging_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_rt_event_logging_service "<citerefentry><refentrytitle>RTEvent_Logging_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_naming_service "<citerefentry><refentrytitle>Naming_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY Naming_Service "<application>tao_cosnaming</application>"> - <!ENTITY Notify_Logging_Service "<application>tao_tls_notify</application>"> - <!ENTITY seealso "&man_tao_orb_options;, &man_notify_service;, &man_basic_logging_service;, &man_event_logging_service;, &man_rt_event_logging_service;, &man_naming_service;"> - <!ENTITY year "1999"> - <!ENTITY username "David Hanvey"> - <!ENTITY useremail "<email><d.hanvey@qub.ac.uk></email>"> -]> -<refentry> - <refmeta> - <refentrytitle>NOTIFY_LOGGING_SERVICE</refentrytitle> - <manvolnum>1</manvolnum> - </refmeta> - <refnamediv> - <refname>&applname;</refname> - <refpurpose>TAO Notify Telecom Log Service</refpurpose> - </refnamediv> - <refsynopsisdiv> - <title>SYNOPSIS</title> - <cmdsynopsis> - <command>&applname;</command> - <group><arg>-ORBoptions</arg></group> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - <para> - &applname; is an implementation of the Telecom Log Service that - integrates with the Notification Service. - </para> - <para> - The Telecom Log Service specification may be found on the OMG - website at <ulink - url="http://www.omg.org/cgi-bin/doc?telecom/99-05-01"></ulink>. - </para> - <para> - &applname; requires a running &Naming_Service; and registers with - it as `NotifyLogFactory'. - </para> - </refsect1> - <refsect1> - <title>OPTIONS</title> - <para> - The program follows the usual TAO ORB command line syntax. See - &man_tao_orb_options;. - </para> - </refsect1> - <refsect1> - <title>BUGS</title> - <para> - Currently all Logs records are stored in memory. - </para> - </refsect1> - <refsect1> - <title>SEE ALSO</title> - <para>&seealso;</para> - </refsect1> - <refsect1> - <title>AUTHOR</title> - <para>&username; &useremail;</para> - </refsect1> -</refentry> diff --git a/ACE/debian/RTEvent_Logging_Service.sgml b/ACE/debian/RTEvent_Logging_Service.sgml deleted file mode 100644 index 924920a6566..00000000000 --- a/ACE/debian/RTEvent_Logging_Service.sgml +++ /dev/null @@ -1,70 +0,0 @@ -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ - <!ENTITY applname "RTEvent_Logging_Service"> - <!ENTITY revision "$Revision$"> - <!ENTITY man_tao_orb_options "<citerefentry><refentrytitle>TAO_ORB_Options</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_event_service "<citerefentry><refentrytitle>Event_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_basic_logging_service "<citerefentry><refentrytitle>Basic_Logging_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_notify_logging_service "<citerefentry><refentrytitle>Notify_Logging_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_event_logging_service "<citerefentry><refentrytitle>Event_Logging_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY man_naming_service "<citerefentry><refentrytitle>Naming_Service</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> - <!ENTITY Naming_Service "<application>tao_cosnaming</application>"> - <!ENTITY RTEvent_Logging_Service "<application>tao_tls_rtevent</application>"> - <!ENTITY seealso "&man_tao_orb_options;, &man_event_service;, &man_basic_logging_service;, &man_notify_logging_service;, &man_event_logging_service;, &man_naming_service;"> - <!ENTITY year "1999"> - <!ENTITY username "David Hanvey"> - <!ENTITY useremail "<email><d.hanvey@qub.ac.uk></email>"> -]> -<refentry> - <refmeta> - <refentrytitle>RTEVENT_LOGGING_SERVICE</refentrytitle> - <manvolnum>1</manvolnum> - </refmeta> - <refnamediv> - <refname>&applname;</refname> - <refpurpose>TAO RTEvent Telecom Log Service</refpurpose> - </refnamediv> - <refsynopsisdiv> - <title>SYNOPSIS</title> - <cmdsynopsis> - <command>&applname;</command> - <group><arg>-ORBoptions</arg></group> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - <para> - &applname; is an implementation of the Telecom Log Service that - integrates with the RTEvent Service. - </para> - <para> - The Telecom Log Service specification may be found on the OMG - website at <ulink - url="http://www.omg.org/cgi-bin/doc?telecom/99-05-01"></ulink>. - </para> - <para> - &applname; requires a running &Naming_Service; and registers with - it as `RTEventLogFactory'. - </para> - </refsect1> - <refsect1> - <title>OPTIONS</title> - <para> - The program follows the usual TAO ORB command line syntax. See - &man_tao_orb_options;. - </para> - </refsect1> - <refsect1> - <title>BUGS</title> - <para> - Currently all Logs records are stored in memory. - </para> - </refsect1> - <refsect1> - <title>SEE ALSO</title> - <para>&seealso;</para> - </refsect1> - <refsect1> - <title>AUTHOR</title> - <para>&username; &useremail;</para> - </refsect1> -</refentry> diff --git a/ACE/debian/ace-netsvcs.doc-base b/ACE/debian/ace-netsvcs.doc-base index 132c20e3636..9e20176dac6 100644 --- a/ACE/debian/ace-netsvcs.doc-base +++ b/ACE/debian/ace-netsvcs.doc-base @@ -1,4 +1,4 @@ -Document: ace-netsvcs +Document: ace-netsvcs Title: ACE network services Author: Douglas C. Schmidt and his research group Abstract: This document describes the ACE network services: naming, time, diff --git a/ACE/debian/cmp-autoconf-regular.sh b/ACE/debian/cmp-autoconf-regular.sh new file mode 100755 index 00000000000..a0e5f19b192 --- /dev/null +++ b/ACE/debian/cmp-autoconf-regular.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +usage() { + cat >&2 << EOF +usage: $0 <first> <second> +compares ACE config.h files (using cpp) +e.g.: $0 ACE_wrappers/ace/config-linux.h objdir/ace/config.h +EOF +} + +report_to() { + g++ -E -DACE_HAS_LINUX_NPTL -dM -I"$ACE_ROOT" $1 | \ + grep '^#define ACE' | grep -v '^#define ACE_CONFIG' | \ + sed -e 's/^#define \+\([A-Z0-9_]\+\) *$/#define \1 1/g' | \ + sort >> $2 +} + +if test "a$ACE_ROOT" = "a"; then + echo "$0: please define ACE_ROOT" >&2 + exit 1 +fi + +if test "$#" -ne 2; then + usage + exit 2 +fi + +ONE_TMP=`mktemp -t ace_cmp_one.XXXXXXXXXX` || exit 1 +TWO_TMP=`mktemp -t ace_cmp_two.XXXXXXXXXX` || exit 1 + +trap "rm $ONE_TMP $TWO_TMP" EXIT + +report_to $1 $ONE_TMP +report_to $2 $TWO_TMP + +diff -u $ONE_TMP $TWO_TMP + diff --git a/ACE/debian/cmp-installation.sh b/ACE/debian/cmp-installation.sh index 150c9879a05..99096947f09 100755 --- a/ACE/debian/cmp-installation.sh +++ b/ACE/debian/cmp-installation.sh @@ -21,7 +21,7 @@ ff() { # Remove path with examples, tests and tutorial from STDIN drop() { - grep -E -v '(examples|tests|tutorials)/' + grep -E -v '(examples|tests|tutorials)/' } # Removed unused/unshipped stuff diff --git a/ACE/debian/compat b/ACE/debian/compat index 45a4fb75db8..ec635144f60 100644 --- a/ACE/debian/compat +++ b/ACE/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/ACE/debian/config-hurd.h b/ACE/debian/config-hurd.h new file mode 100644 index 00000000000..5f1bb210323 --- /dev/null +++ b/ACE/debian/config-hurd.h @@ -0,0 +1,247 @@ +// The following configuration file is designed to work for GNU/Hurd +// platforms using GNU C++. + +#ifndef ACE_CONFIG_HURD_H +#define ACE_CONFIG_HURD_H +#include /**/ "ace/pre.h" + +#if !defined (ACE_MT_SAFE) +# define ACE_MT_SAFE 1 +#endif + +#define ACE_PLATFORM_CONFIG config-hurd.h +#define ACE_LACKS_SYS_SYSCTL_H + +/* +? #define ACE_USES_FIFO_SEM + ACE_HAS_IP_MULTICAST + ACE_LACKS_PERFECT_MULTICAST_FILTERING +*/ + +// Needed to differentiate between libc 5 and libc 6 (aka glibc). +#include <features.h> + +#if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) +# define ACE_HAS_PTHREADS_UNIX98_EXT +#endif /* _XOPEN_SOURCE - 0 >= 500 */ + +# include "ace/config-posix.h" + +// AIO support pulls in the rt library, which pulls in the pthread +// library. Disable AIO in single-threaded builds. +#if defined (ACE_HAS_THREADS) +# define ACE_HAS_CLOCK_GETTIME +# define ACE_HAS_CLOCK_SETTIME +#else +# undef ACE_HAS_AIO_CALLS +#endif + +// Then glibc/libc5 specific parts + +#if defined(__GLIBC__) +# define ACE_HAS_SOCKLEN_T +# define ACE_HAS_4_4BSD_SENDMSG_RECVMSG + + // glibc defines both of these, used in OS_String. +# if defined (_GNU_SOURCE) +# define ACE_HAS_STRNLEN +# define ACE_HAS_WCSNLEN +# endif + + // To avoid the strangeness with Linux's ::select (), which modifies + // its timeout argument, use ::poll () instead. +# define ACE_HAS_POLL + +# define ACE_HAS_SIGINFO_T +# define ACE_LACKS_SIGINFO_H +# define ACE_HAS_UCONTEXT_T +# define ACE_HAS_SIGTIMEDWAIT + +#endif /* __GLIBC__ */ + +#define ACE_HAS_LSEEK64 +//#define ACE_LACKS_LSEEK64_PROTOTYPE + +#define ACE_HAS_P_READ_WRITE +// Use ACE's alternate cuserid() implementation since the use of the +// system cuserid() is discouraged. +#define ACE_HAS_ALT_CUSERID + +#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3) +# define ACE_HAS_ISASTREAM_PROTOTYPE +# define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE +# define ACE_HAS_CPU_SET_T +#endif /* __GLIBC__ > 2 || __GLIBC__ === 2 && __GLIBC_MINOR__ >= 3) */ + +// Then the compiler specific parts + +#if defined (__GNUG__) + // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so + // this must appear before its #include. +# define ACE_HAS_STRING_CLASS +# include "ace/config-g++-common.h" +#elif defined (__GNUC__) +/** + * GNU C compiler. + * + * We need to recognize the GNU C compiler since TAO has at least one + * C source header and file + * (TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.{h,c}) that may indirectly + * include this + */ +#else /* ! __GNUG__ */ +# ifdef __cplusplus /* Let it slide for C compilers. */ +# error unsupported compiler in ace/config-hurd.h +# endif /* __cplusplus */ +#endif /* ! __GNUG__*/ + +// Completely common part :-) + +// Platform/compiler has the sigwait(2) prototype +#define ACE_HAS_SIGWAIT + +#define ACE_HAS_SIGSUSPEND + +#define ACE_HAS_UALARM + +#define ACE_HAS_STRSIGNAL + +#define ACE_HAS_XPG4_MULTIBYTE_CHAR +#define ACE_HAS_VFWPRINTF + +#define ACE_LACKS_ITOW +#define ACE_LACKS_WCSICMP +#define ACE_LACKS_WCSNICMP +#define ACE_LACKS_ISWASCII + +#define ACE_HAS_3_PARAM_WCSTOK + +#define ACE_HAS_3_PARAM_READDIR_R + +#if !defined (ACE_DEFAULT_BASE_ADDR) +# define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) +#endif /* ! ACE_DEFAULT_BASE_ADDR */ + +#define ACE_HAS_ALLOCA + +// Compiler/platform has <alloca.h> +#define ACE_HAS_ALLOCA_H +#define ACE_HAS_SYS_SYSINFO_H + +// Compiler/platform has the getrusage() system call. +#define ACE_HAS_GETRUSAGE +#define ACE_HAS_GETRUSAGE_PROTOTYPE + +#define ACE_HAS_BYTESWAP_H +#define ACE_HAS_BSWAP_16 +#define ACE_HAS_BSWAP_32 + +#if defined (__GNUC__) +# define ACE_HAS_BSWAP_64 +#endif + +#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES + +// Optimize ACE_Handle_Set for select(). +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT + +// ONLY define this if you have config'd multicast into a 2.0.34 or +// prior kernel. It is enabled by default in 2.0.35 kernels. +#if !defined (ACE_HAS_IP_MULTICAST) +# define ACE_HAS_IP_MULTICAST +#endif /* ! ACE_HAS_IP_MULTICAST */ + +// At least for IPv4, Linux lacks perfect filtering. +#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING +# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 +#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ + +#define ACE_HAS_BIG_FD_SET + +// Linux defines struct msghdr in /usr/include/socket.h +#define ACE_HAS_MSG + +// Linux "improved" the interface to select() so that it modifies +// the struct timeval to reflect the amount of time not slept +// (see NOTES in Linux's select(2) man page). +#define ACE_HAS_NONCONST_SELECT_TIMEVAL + +#define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 65535 + +#define ACE_CDR_IMPLEMENT_WITH_NATIVE_DOUBLE 1 + +#define ACE_HAS_GETPAGESIZE 1 + +// Platform defines struct timespec but not timespec_t +#define ACE_LACKS_TIMESPEC_T + +// A conflict appears when including both <ucontext.h> and +// <sys/procfs.h> with recent glibc headers. +//#define ACE_HAS_PROC_FS + +// Platform supports System V IPC (most versions of UNIX, but not Win32) +#define ACE_HAS_SYSV_IPC + +// Compiler/platform contains the <sys/syscall.h> file. +#define ACE_HAS_SYS_SYSCALL_H + +// Platform/compiler supports global timezone variable. +#define ACE_HAS_TIMEZONE + +#define ACE_HAS_TIMEZONE_GETTIMEOFDAY + +// Compiler supports the ssize_t typedef. +#define ACE_HAS_SSIZE_T + +// Compiler/platform defines the sig_atomic_t typedef. +#define ACE_HAS_SIG_ATOMIC_T + +// Compiler/platform defines a union semun for SysV shared memory. +#define ACE_HAS_SEMUN + +#define ACE_HAS_POSIX_TIME + +#define ACE_HAS_GPERF + +#define ACE_HAS_DIRENT + +#define ACE_HAS_STRBUF_T + +#define ACE_SIZEOF_WCHAR 4 + +#define ACE_LACKS_GETIPNODEBYADDR +#define ACE_LACKS_GETIPNODEBYNAME + +// Platform has POSIX terminal interface. +#define ACE_HAS_TERMIOS + +// Linux implements sendfile(). +#define ACE_HAS_SENDFILE 1 + +#define ACE_HAS_VOIDPTR_MMAP + +#define ACE_HAS_ICMP_SUPPORT 1 + +#define ACE_HAS_VASPRINTF + +// According to man pages Linux uses different (compared to UNIX systems) types +// for setting IP_MULTICAST_TTL and IPV6_MULTICAST_LOOP / IP_MULTICAST_LOOP +// in setsockopt/getsockopt. +#define ACE_HAS_IP_MULTICAST_TTL_AS_INT 1 +#define ACE_HAS_IPV6_MULTICAST_LOOP_AS_BOOL 1 +#define ACE_HAS_IP_MULTICAST_LOOP_AS_INT 1 + +#define ACE_HAS_GETIFADDRS + +#define ACE_HAS_SVR4_DYNAMIC_LINKING +#define ACE_HAS_AUTOMATIC_INIT_FINI +#define ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE +#define ACE_HAS_RECURSIVE_MUTEXES +#define ACE_HAS_THREAD_SPECIFIC_STORAGE +#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS +#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R +#define ACE_HAS_REENTRANT_FUNCTIONS + +#include /**/ "ace/post.h" + +#endif /* ACE_CONFIG_HURD_H */ diff --git a/ACE/debian/debian.changelog b/ACE/debian/debian.changelog index 3fdbcd24f82..bddb3b02cd7 100644 --- a/ACE/debian/debian.changelog +++ b/ACE/debian/debian.changelog @@ -1,3 +1,64 @@ +ace (6.1.2-1) experimental; urgency=low + + * New upstream release. + * debian/patches/16-ace-inet-pkgconfig-files.diff: drop, integrated. + * debian/patches/prevent_doxygen_ace_manpages.diff: ditto. + * debian/patches/reduce-doxygen-doc.diff: reworked since HTMLHelp is + no longer generated. + * debian/patches/20-versioned_libs.diff: refreshed. + * debian/patches/34-bts386713.diff: refreshed. + * debian/patches/92-default-ACE_ROOT.diff: refreshed. + + -- Thomas Girard <thomas.g.girard@free.fr> Sat, 16 Jun 2012 20:51:01 +0200 + +ace (6.0.3-5) unstable; urgency=low + + * debian/control: + o define Build-Depends-Indep: for documentation generation. + o Build-Depends on dpkg-dev >= 1.16.2 to have dpkg-buildpackage -B + correctly invoke build-arch then binary-arch. Closes: #657844. + * debian/libace-dev.README.Debian: mention how to make ACE Service + Configuration work in Debian. Closes: #656040. + + -- Thomas Girard <thomas.g.girard@free.fr> Fri, 30 Mar 2012 20:03:40 +0200 + +ace (6.0.3-4) unstable; urgency=low + + * Remove work-around for arm now that g++-4.6 ICE is fixed. + Closes: #653642, #654743. + * Really ensure doxygen is not being run when invoking build-arch. + Closes: #657844. + + -- Thomas Girard <thomas.g.girard@free.fr> Sat, 04 Feb 2012 17:24:25 +0100 + +ace (6.0.3-3) unstable; urgency=low + + * Build with g++-4.4 on armel to work-around #644722. Closes: #644826. + Thanks to Peter Green for the report and work-around investigation. + * debian/lib{ace,tao}-dev.install, debian/tao-utils.install: perform brace + expansion instead of letting debhelper do it "due to an accident". Helped + removing no longer needed expansions. + * debian/control: move transitional packages to section oldlibs, priority + extra, as per lintian warning recommendation. + + -- Thomas Girard <thomas.g.girard@free.fr> Wed, 28 Dec 2011 10:46:18 +0100 + +ace (6.0.3-2) unstable; urgency=low + + * Upload to unstable. + * Remove the build part in build %: make rule. GNU make 3.82 doesn't + like it. Should fix the FTBFS seen on experimental/amd64 where make 3.82 + is installed. + * debian/rules: prevent long generation of doxygen documentation in arch-dep + build by defining binary-arch: and binary-indep: targets. This requires + switching to debhelper level 9. + * debian/rules: overriding dh_fixperm for needed packages only. + Closes: #636028. + * debian/*.examples: move examples here. + * debian/ace-netsvcs.doc-base: remove extra space at end of document field. + + -- Thomas Girard <thomas.g.girard@free.fr> Sat, 30 Jul 2011 21:38:07 +0200 + ace (6.0.3-1) experimental; urgency=low [ Thomas Girard ] diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control index b5894c293da..1047d89f59a 100644 --- a/ACE/debian/debian.control +++ b/ACE/debian/debian.control @@ -4,7 +4,8 @@ Priority: optional Maintainer: Debian ACE+TAO maintainers <pkg-ace-devel@lists.alioth.debian.org> Uploaders: Thomas Girard <thomas.g.girard@free.fr>, Pau Garcia i Quiles <pgquiles@elpauer.org>, Marek Brudka <mbrudka@aster.pl> DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 8), libssl-dev (>= 0.9.7d), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.5), libfox-1.6-dev, zlib1g-dev, libzzip-dev, liblzo2-dev, docbook-to-man, bzip2, libbz2-dev, doxygen, graphviz +Build-Depends: debhelper (>= 8.9.7), dpkg-dev (>= 1.16.2), libssl-dev (>= 0.9.7d), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.5), libfox-1.6-dev, zlib1g-dev, libzzip-dev, liblzo2-dev, docbook-to-man, bzip2, libbz2-dev +Build-Depends-Indep: doxygen, graphviz Standards-Version: 3.9.2 Vcs-Git: git://anonscm.debian.org/pkg-ace/pkg-ace.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ace/pkg-ace.git;a=summary @@ -73,7 +74,7 @@ Description: ACE secure socket layer library Package: libace-ssl-dev Architecture: any Section: libdevel -Depends: libace-ssl-6.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.1.2d), ${misc:Depends} +Depends: libace-ssl-6.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 0.9.7d), ${misc:Depends} Description: ACE secure socket layer library - development files This package contains the header files and static library for the ACE SSL library. @@ -154,7 +155,7 @@ Description: ACE Inet protocol library - development files Package: libace-inet-ssl-6.1.2 Architecture: any Section: libs -Depends: libace-inet-6.0.8, libace-ssl-6.1.2, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-6.1.2, libace-ssl-6.1.2, ${shlibs:Depends}, ${misc:Depends} Description: ACE SSL-enabled Inet protocol library This package provides an ACE addon library for clients (and possibly servers at some point) using Inet protocols which support SSL, such as @@ -182,6 +183,8 @@ Description: ACE perfect hash function generator Package: gperf-ace Architecture: all +Section: oldlibs +Priority: extra Depends: ace-gperf, ${misc:Depends} Description: ACE perfect hash function generator (transitional package) This package is a transitional package to ace-gperf. @@ -213,7 +216,7 @@ Package: libkokyu-6.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: libtao-2.0.3, libtao-orbsvcs-2.1.2 +Suggests: libtao-2.1.2, libtao-orbsvcs-2.1.2 Description: ACE scheduling and dispatching library Kokyu is a library designed to provide flexible scheduling and dispatching services. @@ -271,7 +274,7 @@ Description: ACE-GUI reactor integration for Xt Package: libace-xtreactor-dev Architecture: any Section: libdevel -Depends: libace-xtreactor-6.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.1.2), ${misc:Depends} +Depends: libace-xtreactor-6.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} Description: ACE-GUI reactor integration for Xt - development files This package contains header files and static library for the ACE-Xt reactor integration. @@ -318,7 +321,7 @@ Description: ACE-GUI reactor integration for Fl Package: libace-flreactor-dev Architecture: any Section: libdevel -Depends: libace-flreactor-6.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.1.2), ${misc:Depends} +Depends: libace-flreactor-6.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends} Description: ACE-GUI reactor integration for Fl - development files This package contains header files and static library for the ACE-Fl reactor integration. @@ -552,6 +555,8 @@ Description: TAO naming service Package: tao-naming Architecture: all +Section: oldlibs +Priority: extra Depends: tao-cosnaming, ${misc:Depends} Description: TAO naming service (transitional package) This package is a transitional package to tao-cosnaming. @@ -575,6 +580,8 @@ Description: TAO trading service Package: tao-trading Architecture: all +Section: oldlibs +Priority: extra Depends: tao-costrading, ${misc:Depends} Description: TAO trading service (transitional package) This package is a transitional package to tao-costrading. @@ -599,6 +606,8 @@ Description: TAO event service Package: tao-event Architecture: all +Section: oldlibs +Priority: extra Depends: tao-cosevent, ${misc:Depends} Description: TAO event service (transitional package) This package is a transitional package to tao-cosevent. @@ -648,6 +657,8 @@ Description: TAO notification service Package: tao-notify Architecture: all +Section: oldlibs +Priority: extra Depends: tao-cosnotification, ${misc:Depends} Description: TAO notification service (transitional package) This package is a transitional package to tao-cosnotification. @@ -682,6 +693,8 @@ Description: TAO telecom log services Package: tao-log Architecture: all +Section: oldlibs +Priority: extra Depends: tao-tls, ${misc:Depends} Description: TAO telecom log services (transitional package) This package is a transitional package to tao-tls. @@ -711,6 +724,8 @@ Description: TAO concurrency service Package: tao-concurrency Architecture: all +Section: oldlibs +Priority: extra Depends: tao-cosconcurrency, ${misc:Depends} Description: TAO concurrency service (transitional package) This package is a transitional package to tao-cosconcurrency. @@ -730,6 +745,8 @@ Description: TAO lifecycle service Package: tao-lifecycle Architecture: all +Section: oldlibs +Priority: extra Depends: tao-coslifecycle, ${misc:Depends} Description: TAO lifecycle service (transitional package) This package is a transitional package to tao-coslifecycle. @@ -750,6 +767,8 @@ Description: TAO time service Package: tao-time Architecture: all +Section: oldlibs +Priority: extra Depends: tao-costime, ${misc:Depends} Description: TAO time service (transitional package) This package is a transitional package to tao-costime. @@ -768,7 +787,7 @@ Description: ACE network service implementations files to link the various ACE network services together, either statically or dynamically, and form complete server programs. -Package: libnetsvcs-6.0.8 +Package: libnetsvcs-6.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -782,7 +801,7 @@ Description: ACE network service implementations - libraries Package: libnetsvcs-dev Architecture: any Section: libdevel -Depends: libnetsvcs-6.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libnetsvcs-6.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE network service implementations - development files ACE network services provide reusable components for common distributed system tasks such as logging, naming, locking, and time diff --git a/ACE/debian/debian.rules b/ACE/debian/debian.rules index 9448bfb2f5b..9487350e616 100644 --- a/ACE/debian/debian.rules +++ b/ACE/debian/debian.rules @@ -4,7 +4,7 @@ # written February 2002 by Ossama Othman <ossama@debian.org> # Modified August 2003 by Brian Nelson <pyro@debian.org> # Copyright (C) 2004 Raphael Bossek <bossekr@debian.org> -# Copyright © 2005-2011 Thomas Girard <thomas.g.girard@free.fr> +# Copyright © 2005-2012 Thomas Girard <thomas.g.girard@free.fr> MWCFLAGS := -type gnuace -noreldefs DSO_MAKE_FLAG := versioned_so=2 @@ -39,13 +39,14 @@ export TAO_ROOT := $(ACE_ROOT)/TAO export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib export QTDIR := /usr/share/qt4 -.PHONY: build -build %: +%: dh $@ # Implement our own configure machinery; it will copy Debian specific # configuration before launching MPC to generate ACE+TAO GNUmakefile -override_dh_auto_configure: +.PHONY: configure +configure: configure-stamp +configure-stamp: cp debian/platform_macros.GNU $(ACE_ROOT)/include/makeinclude cp debian/config*.h $(ACE_ROOT)/ace/ cp debian/default.features $(ACE_ROOT)/bin/MakeProjectCreator/config @@ -53,17 +54,15 @@ override_dh_auto_configure: cd $(ACE_ROOT) && $(ACE_ROOT)/bin/mwc.pl $(MWCFLAGS) ACE-DPKG.mwc cp debian/TAO-DPKG.mwc $(TAO_ROOT) cd $(TAO_ROOT) && $(ACE_ROOT)/bin/mwc.pl $(MWCFLAGS) TAO-DPKG.mwc - -override_dh_auto_build: build-stamp manpages-stamp doxygen-stamp - -build-stamp: - $(MAKE) -C $(ACE_ROOT) $(DSO_MAKE_FLAG) - $(MAKE) -C $(TAO_ROOT) $(DSO_MAKE_FLAG) touch $@ -override_dh_auto_install: - $(MAKE) -C $(ACE_ROOT) install $(INSTALL_FLAGS) - $(MAKE) -C $(TAO_ROOT) install $(INSTALL_FLAGS) +override_dh_auto_build-arch: configure-stamp + $(MAKE) -C $(ACE_ROOT) $(DSO_MAKE_FLAG) $(FIXUP) + $(MAKE) -C $(TAO_ROOT) $(DSO_MAKE_FLAG) $(FIXUP) + +override_dh_auto_install-arch: manpages-stamp + $(MAKE) -C $(ACE_ROOT) install $(INSTALL_FLAGS) $(FIXUP) + $(MAKE) -C $(TAO_ROOT) install $(INSTALL_FLAGS) $(FIXUP) mkdir -p $(DT)/usr/share/man/man1 cp $(ACE_ROOT)/apps/gperf/ace_gperf.1 $(DT)/usr/share/man/man1 # Relocate .idl and .pidl files @@ -78,23 +77,27 @@ override_dh_auto_install: mv $(DT)/usr/bin/tao_idl $(DT)/usr/bin/tao_ifr $(DT)/usr/lib/ace/TAO cp debian/tao_idl debian/tao_ifr $(DT)/usr/bin -override_dh_auto_clean: - [ -f $(ACE_ROOT)/GNUmakefile ] && $(MAKE) -C $(ACE_ROOT) realclean $(DSO_MAKE_FLAG) || true - [ -f $(TAO_ROOT)/GNUmakefile ] && $(MAKE) -C $(TAO_ROOT) realclean $(DSO_MAKE_FLAG) || true +override_dh_auto_install-indep: + +override_dh_auto_clean-arch: + [ -f $(ACE_ROOT)/GNUmakefile ] && $(MAKE) -C $(ACE_ROOT) realclean $(DSO_MAKE_FLAG) $(FIXUP) || true + [ -f $(TAO_ROOT)/GNUmakefile ] && $(MAKE) -C $(TAO_ROOT) realclean $(DSO_MAKE_FLAG) $(FIXUP) || true find $(ACE_ROOT) -name 'GNUmakefile*' -o -name '.depend.*' | xargs -r rm rm -f $(ACE_ROOT)/include/makeinclude/platform_macros.GNU rm -f $(ACE_ROOT)/bin/MakeProjectCreator/config/default.features rm -f $(ACE_ROOT)/ace/config.h $(ACE_ROOT)/ace/config-hurd.h rm -f $(ACE_ROOT)/ACE-DPKG.mwc $(TAO_ROOT)/TAO-DPKG.mwc rm -f debian/*.1 debian/mpc-ace.sgml - rm -Rf $(ACE_ROOT)/html/libace-doc $(ACE_ROOT)/html/libtao-doc $(ACE_ROOT)/html/libacexml-doc rm -f *-stamp # Remove stubs that get generated during TAO compilation but for some reason # are not removed on make realclean rm -f `cat debian/TOREMOVE` +override_dh_auto_clean-indep: + rm -Rf $(ACE_ROOT)/html/libace-doc $(ACE_ROOT)/html/libtao-doc $(ACE_ROOT)/html/libacexml-doc + override_dh_compress: - dh_compress -Xexamples -Xtutorials + dh_compress -Xexamples # Add --list-missing to make sure we don't miss new binaries override_dh_install: @@ -109,10 +112,14 @@ override_dh_installchangelogs: dh_installchangelogs --remaining-packages ChangeLog override_dh_fixperms: +ifneq (,$(filter libtao-doc, $(shell dh_listpackages))) chmod -x debian/libtao-doc/usr/share/doc/libtao-doc/examples/RTCORBA/Activity/svc.conf.client chmod -x debian/libtao-doc/usr/share/doc/libtao-doc/examples/RTCORBA/Activity/svc.conf.server chmod -x debian/libtao-doc/usr/share/doc/libtao-doc/examples/Simulator/DOVEBrowser/make.bat +endif +ifneq (,$(filter libace-doc libtao-doc, $(shell dh_listpackages))) find debian -name '*.pl' | xargs -r sed -i -e '1i#!/usr/bin/perl' +endif dh_fixperms debian/mpc-ace.sgml: MPC/docs/MPC.sgml @@ -121,12 +128,9 @@ debian/mpc-ace.sgml: MPC/docs/MPC.sgml debian/%.1: debian/%.sgml docbook-to-man $< > $@ -.PHONY: doxygen -doxygen: doxygen-stamp -doxygen-stamp: +override_dh_auto_build-indep: cd $(ACE_ROOT) && bin/generate_doxygen.pl -is_release -exclude_ciao -exclude_dance find $(ACE_ROOT)/html $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f - touch $@ .PHONY: manpages manpages: manpages-stamp diff --git a/ACE/debian/fix_doxygen.sh b/ACE/debian/fix_doxygen.sh index 590dc7dd8c8..a511364e122 100755 --- a/ACE/debian/fix_doxygen.sh +++ b/ACE/debian/fix_doxygen.sh @@ -1,7 +1,7 @@ #!/bin/sh -# $Id$ +# # This script regenerates changes on the Doxygen templates. - +# set -e export QUILT_PATCHES=debian/patches @@ -12,8 +12,7 @@ quilt new reduce-doxygen-doc.diff for f in $(find $ACE_ROOT -name '*.doxygen') do QUILT_PATCHES=debian/patches quilt add $f - sed -e 's#GENERATE_HTMLHELP = YES#GENERATE_HTMLHELP = NO#' \ - -e 's#COLLABORATION_GRAPH = YES#COLLABORATION_GRAPH = NO#' \ + sed -e 's#COLLABORATION_GRAPH = YES#COLLABORATION_GRAPH = NO#' \ -e 's#INCLUDE_GRAPH = YES#INCLUDE_GRAPH = NO#' \ -e 's#INCLUDED_BY_GRAPH = YES#INCLUDED_BY_GRAPH = NO#' \ -e 's#SEARCHENGINE = YES#SEARCHENGINE = NO#' \ diff --git a/ACE/debian/gperf-ace.docs b/ACE/debian/gperf-ace.docs deleted file mode 100644 index b14ede1b24f..00000000000 --- a/ACE/debian/gperf-ace.docs +++ /dev/null @@ -1,2 +0,0 @@ -ACE_wrappers/PROBLEM-REPORT-FORM -ACE_wrappers/apps/gperf/README diff --git a/ACE/debian/gperf-ace.install b/ACE/debian/gperf-ace.install deleted file mode 100644 index 04c9b7c515b..00000000000 --- a/ACE/debian/gperf-ace.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/ace_gperf -usr/share/man/man1/ace_gperf.1 diff --git a/ACE/debian/README.Debian b/ACE/debian/libace-dev.README.Debian index ac8744097e1..aa7e50f9171 100644 --- a/ACE/debian/README.Debian +++ b/ACE/debian/libace-dev.README.Debian @@ -10,7 +10,6 @@ the command to do this is export ACE_ROOT=/usr/lib/ace - Likewise, for TAO: export TAO_ROOT=${ACE_ROOT}/TAO @@ -34,4 +33,23 @@ need: 5. now you can compile your example. + +== Service Configuration == + +You'll need to carefully review server.conf files to ensure ACE service +configuration will work. Indeed in a lot of examples, the library name +in dynamic directives is a library root name which might need some +changes. + +For example, in the following server.conf excerpt (taken from #656040 +bug report): + + dynamic Server_Logging_Service Service_Object * netsvcs:_make_ACE_Server_Logging_Acceptor() active "-p 20009" + +netsvcs refers to libnetsvcs.so. And this is what will be looked for. Unless +you have libnetsvcs-dev package installed, the lookup will fail. Another +way to fix this would be to replace netsvcs with the full library name, e.g. +libnetsvcs-6.0.3.so. + + -- Thomas Girard <thomas.g.girard@free.fr>, Sun, 23 May 2010 11:04:27 +0200 diff --git a/ACE/debian/libace-dev.install b/ACE/debian/libace-dev.install index d0a293ea36a..faf0c1c7cc1 100644 --- a/ACE/debian/libace-dev.install +++ b/ACE/debian/libace-dev.install @@ -6,11 +6,14 @@ ../../bin/DependencyGenerator usr/lib/ace/bin ../../include usr/lib/ace ../../include/makeinclude/platform_macros.GNU usr/lib/ace/include/makeinclude -usr/include/ace/*.{h,inl,cpp} +usr/include/ace/*.h +usr/include/ace/*.inl +usr/include/ace/*.cpp usr/include/ace/os_include usr/lib/libACE.so -usr/include/ace/ETCL/*.{h,inl,cpp} -usr/include/ace/Monitor_Control/*.{h,inl,cpp} +usr/include/ace/ETCL/*.h +usr/include/ace/ETCL/*.inl +usr/include/ace/Monitor_Control/*.h usr/lib/libACE_ETCL_Parser.so usr/lib/libACE_Monitor_Control.so usr/lib/libACE_ETCL.so diff --git a/ACE/debian/libace-doc.docs b/ACE/debian/libace-doc.docs index bbaf6af2915..df1bbe42d1d 100644 --- a/ACE/debian/libace-doc.docs +++ b/ACE/debian/libace-doc.docs @@ -1,3 +1,2 @@ docs -examples html/libace-doc/* diff --git a/ACE/debian/libace-doc.examples b/ACE/debian/libace-doc.examples new file mode 100644 index 00000000000..e39721e20f0 --- /dev/null +++ b/ACE/debian/libace-doc.examples @@ -0,0 +1 @@ +examples/* diff --git a/ACE/debian/libnetsvcs-6.1.2.docs b/ACE/debian/libnetsvcs-6.1.2.docs new file mode 100644 index 00000000000..0b03c55b91f --- /dev/null +++ b/ACE/debian/libnetsvcs-6.1.2.docs @@ -0,0 +1,2 @@ +netsvcs/lib/README +PROBLEM-REPORT-FORM diff --git a/ACE/debian/libnetsvcs-6.1.2.install b/ACE/debian/libnetsvcs-6.1.2.install new file mode 100644 index 00000000000..c7a04b16213 --- /dev/null +++ b/ACE/debian/libnetsvcs-6.1.2.install @@ -0,0 +1 @@ +../../netsvcs/lib/libnetsvcs-*.so usr/lib diff --git a/ACE/debian/libtao-dev.install b/ACE/debian/libtao-dev.install index 400a56848e2..2ec4f80d1dc 100644 --- a/ACE/debian/libtao-dev.install +++ b/ACE/debian/libtao-dev.install @@ -1,4 +1,6 @@ -usr/include/tao/*.{h,i,inl,cpp} +usr/include/tao/*.h +usr/include/tao/*.inl +usr/include/tao/*.cpp usr/share/idl/tao usr/lib/libTAO.so usr/include/tao/AnyTypeCode diff --git a/ACE/debian/libtao-doc.docs b/ACE/debian/libtao-doc.docs index 4e964ff1252..8f1da4a785d 100644 --- a/ACE/debian/libtao-doc.docs +++ b/ACE/debian/libtao-doc.docs @@ -1,3 +1,2 @@ TAO/docs -TAO/examples html/libtao-doc/* diff --git a/ACE/debian/libtao-doc.examples b/ACE/debian/libtao-doc.examples new file mode 100644 index 00000000000..2cff9a91e51 --- /dev/null +++ b/ACE/debian/libtao-doc.examples @@ -0,0 +1 @@ +TAO/examples/* diff --git a/ACE/debian/patches/20-versioned_libs.diff b/ACE/debian/patches/20-versioned_libs.diff index 1af2d3f2d72..bbb934a2688 100644 --- a/ACE/debian/patches/20-versioned_libs.diff +++ b/ACE/debian/patches/20-versioned_libs.diff @@ -6,8 +6,8 @@ Forwarded: submitted, more work needed before acceptance Author: Thomas Girard <thomas.g.girard@free.fr> Last-Update: 2010-12-26 ---- a/include/makeinclude/wrapper_macros.GNU -+++ b/include/makeinclude/wrapper_macros.GNU +--- pkg-ace.orig/include/makeinclude/wrapper_macros.GNU ++++ pkg-ace/include/makeinclude/wrapper_macros.GNU @@ -78,7 +78,10 @@ # If versioned_so is 1 (enabled), the SOVERSION make # variable can also be set to specify the version info @@ -20,8 +20,8 @@ Last-Update: 2010-12-26 # wfmo Build with wfmo support (Win32 only) # winregistry Build with windows registry support (Win32 only) # winnt Build WinNT-specific projects (Win32 only) ---- a/MPC/prj_install.pl 2011-04-27 15:26:27.000000000 +0200 -+++ b/MPC/prj_install.pl 2011-07-22 16:01:11.800776071 +0200 +--- pkg-ace.orig/MPC/prj_install.pl ++++ pkg-ace/MPC/prj_install.pl @@ -186,7 +186,7 @@ my $fh = new FileHandle(); if (opendir($fh, $odir)) { @@ -31,9 +31,9 @@ Last-Update: 2010-12-26 $file =~ /^(lib)?$name.*\.(dll|lib)$/i) { push(@libs, "$dir$insdir$binarydir$file"); } ---- a/include/makeinclude/platform_g++_common.GNU 2011-06-06 19:01:01.000000000 +0200 -+++ b/include/makeinclude/platform_g++_common.GNU 2011-07-22 16:01:11.804776084 +0200 -@@ -97,7 +97,7 @@ +--- pkg-ace.orig/include/makeinclude/platform_g++_common.GNU ++++ pkg-ace/include/makeinclude/platform_g++_common.GNU +@@ -102,7 +102,7 @@ # If the platform file didn't already set versioned_so, default to 1. versioned_so ?= 1 with_ld ?= @@ -42,8 +42,8 @@ Last-Update: 2010-12-26 ifeq ($(with_ld),hpux) SOFLAGS += -Wl,+h -Wl,$(SONAME) else ---- a/include/makeinclude/rules.lib.GNU 2010-09-23 18:17:42.000000000 +0200 -+++ b/include/makeinclude/rules.lib.GNU 2011-07-22 16:01:11.804776084 +0200 +--- pkg-ace.orig/include/makeinclude/rules.lib.GNU ++++ pkg-ace/include/makeinclude/rules.lib.GNU @@ -11,7 +11,7 @@ # Library versioning #--------------------------------------------------------------------------- @@ -98,9 +98,9 @@ Last-Update: 2010-12-26 SHLIBA ?= VSHLIBA = $(ARCH_SHLIBA:%.$(LIBEXT)=%$(VAR).$(LIBEXT)) ---- a/include/makeinclude/rules.local.GNU 2011-05-12 20:11:57.000000000 +0200 -+++ b/include/makeinclude/rules.local.GNU 2011-07-22 16:01:11.804776084 +0200 -@@ -311,13 +311,23 @@ +--- pkg-ace.orig/include/makeinclude/rules.local.GNU ++++ pkg-ace/include/makeinclude/rules.local.GNU +@@ -312,13 +312,23 @@ fi else #firstword of LN_S is not cp, so we're using real symlinks ifneq ($(SOVERSION),) @@ -126,7 +126,7 @@ Last-Update: 2010-12-26 endif #SOVERSION @if test $(ARCH_SOURCE_DIR) != $(@D) ; then \ if test ! -s $@ ; then \ -@@ -350,6 +360,8 @@ +@@ -351,6 +361,8 @@ -$(RM) $(SHLIB_UNCHECKED) ifeq ($(versioned_so),1) -$(RM) $(SHLIB_UNCHECKED)$(SOVERSION) diff --git a/ACE/debian/patches/34-bts386713.diff b/ACE/debian/patches/34-bts386713.diff index 5eb8c0dbc7f..5e75c7272ae 100644 --- a/ACE/debian/patches/34-bts386713.diff +++ b/ACE/debian/patches/34-bts386713.diff @@ -10,80 +10,80 @@ Forwarded: not-needed Author: Pau Garcia i Quiles <pgquiles@elpauer.org> Last-Update: 2011-06-26 ---- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp -+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp +--- pkg-ace.orig/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp ++++ pkg-ace/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp @@ -10,7 +10,7 @@ static const char pg_poa_factory_name[] = "TAO_GOA"; static const ACE_TCHAR pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE( - "TAO_GOA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", ""); -+ "TAO_GOA", "libTAO_PortableGroup-2.0.3.so", "_make_TAO_PG_Object_Adapter_Factory", ""); ++ "TAO_GOA", "libTAO_PortableGroup-2.1.2.so", "_make_TAO_PG_Object_Adapter_Factory", ""); TAO_BEGIN_VERSIONED_NAMESPACE_DECL ---- a/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp -+++ b/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp +--- pkg-ace.orig/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp ++++ pkg-ace/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp @@ -18,7 +18,7 @@ ACE_TCHAR const * const scpc_loadNamingService = ACE_DYNAMIC_SERVICE_DIRECTIVE( "testNamingService", - "TAO_CosNaming_Serv", -+ "libTAO_CosNaming_Serv-2.0.3.so", ++ "libTAO_CosNaming_Serv-2.1.2.so", "_make_TAO_Naming_Loader", "" ); ---- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp -+++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp +--- pkg-ace.orig/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp ++++ pkg-ace/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp @@ -20,7 +20,7 @@ ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE( "testNotifyService", - "TAO_CosNotification_Serv", -+ "libTAO_CosNotification_Serv-2.0.3.so", ++ "libTAO_CosNotification_Serv-2.1.2.so", "_make_TAO_CosNotify_Service", "" ); ---- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp -+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp +--- pkg-ace.orig/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp ++++ pkg-ace/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp @@ -23,7 +23,7 @@ ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE( "testNotifyService", - "TAO_CosNotification_Serv", -+ "libTAO_CosNotification_Serv-2.0.3.so", ++ "libTAO_CosNotification_Serv-2.1.2.so", "_make_TAO_CosNotify_Service", "-UseSeparateDispatchingORB 1" ); ---- a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp -+++ b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp +--- pkg-ace.orig/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp ++++ pkg-ace/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp @@ -20,7 +20,7 @@ ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE( "testNotifyService", - "TAO_Notify_Service", -+ "libTAO_Notify_Service-2.0.3.so", ++ "libTAO_Notify_Service-2.1.2.so", "_make_TAO_Notify_Service_Driver", "-NoNameSvc -RunThreads 0" ); ---- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp -+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp +--- pkg-ace.orig/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp ++++ pkg-ace/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp @@ -23,7 +23,7 @@ ACE_TCHAR scpc_loadNotifyService[max_length] = ACE_DYNAMIC_SERVICE_DIRECTIVE( "testNotifyService", - "TAO_Notify_Service", -+ "libTAO_Notify_Service-2.0.3.so", ++ "libTAO_Notify_Service-2.1.2.so", "_make_TAO_Notify_Service_Driver", "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 0 -ORBInitRef NameService=iioploc://%s:%s/NameService -IORoutput %s" ); ---- a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp -+++ b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp +--- pkg-ace.orig/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp ++++ pkg-ace/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp @@ -20,7 +20,7 @@ ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE( "testNotifyService", - "TAO_Notify_Service", -+ "libTAO_Notify_Service-2.0.3.so", ++ "libTAO_Notify_Service-2.1.2.so", "_make_TAO_Notify_Service_Driver", "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 10 -ORBInitRef NameService=file://naming.ior -IORoutput notify.ior" ); @@ -92,29 +92,29 @@ Last-Update: 2011-06-26 ACE_TCHAR const * const scpc_loadNameService = ACE_DYNAMIC_SERVICE_DIRECTIVE( "testNamingService", - "TAO_CosNaming_Serv", -+ "libTAO_CosNaming_Serv-2.0.3.so", ++ "libTAO_CosNaming_Serv-2.1.2.so", "_make_TAO_Naming_Loader", "testNameService testNameService -ORBId testDllOrb -m 0 -o naming.ior" ); ---- a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp -+++ b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp +--- pkg-ace.orig/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp ++++ pkg-ace/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp @@ -20,7 +20,7 @@ ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE( "testNotifyService", - "TAO_Notify_Service", -+ "libTAO_Notify_Service-2.0.3.so", ++ "libTAO_Notify_Service-2.1.2.so", "_make_TAO_Notify_Service_Driver_INCORRECT", "-NoNameSvc -RunThreads 0" ); ---- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp -+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp +--- pkg-ace.orig/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp ++++ pkg-ace/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp @@ -24,7 +24,7 @@ ACE_TCHAR const * const scpc_loadNameService = ACE_DYNAMIC_SERVICE_DIRECTIVE( "testNamingService", - "TAO_CosNaming_Serv", -+ "libTAO_CosNaming_Serv-2.0.3.so", ++ "libTAO_CosNaming_Serv-2.1.2.so", "_make_TAO_Naming_Loader", "testNameService testNameService -ORBId testDllOrb -m 0 -o naming.ior" ); @@ -123,18 +123,18 @@ Last-Update: 2011-06-26 ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE( "testNotifyService", - "TAO_Notify_Service", -+ "libTAO_Notify_Service-2.0.3.so", ++ "libTAO_Notify_Service-2.1.2.so", "_make_TAO_Notify_Service_Driver", "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 1 -ORBInitRef NameService=file://naming.ior -IORoutput notify.ior" ); ---- a/TAO/tao/Codeset/Codeset_Manager_i.cpp -+++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp +--- pkg-ace.orig/TAO/tao/Codeset/Codeset_Manager_i.cpp ++++ pkg-ace/TAO/tao/Codeset/Codeset_Manager_i.cpp @@ -353,7 +353,7 @@ if (fact == 0) ACE_Service_Config::process_directive (ACE_DYNAMIC_SERVICE_DIRECTIVE ("UTF8_Latin1_Factory", - "TAO_Codeset", -+ "libTAO_Codeset-2.0.3.so", ++ "libTAO_Codeset-2.1.2.so", "_make_TAO_UTF8_Latin1_Factory", "")); else @@ -143,201 +143,201 @@ Last-Update: 2011-06-26 ACE_Service_Config::process_directive (ACE_DYNAMIC_SERVICE_DIRECTIVE ("UTF16_BOM_Factory", - "TAO_Codeset", -+ "libTAO_Codeset-2.0.3.so", ++ "libTAO_Codeset-2.1.2.so", "_make_TAO_UTF16_BOM_Factory", "")); else ---- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp -+++ b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp +--- pkg-ace.orig/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp ++++ pkg-ace/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp @@ -10,7 +10,7 @@ static const ACE_TCHAR csd_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE( "TAO_CSD_Object_Adapter_Factory", - "TAO_CSD_Framework", -+ "libTAO_CSD_Framework-2.0.3.so", ++ "libTAO_CSD_Framework-2.1.2.so", "_make_TAO_CSD_Object_Adapter_Factory", ""); ---- a/TAO/tao/ORB_Core.cpp -+++ b/TAO/tao/ORB_Core.cpp -@@ -1651,7 +1651,7 @@ +--- pkg-ace.orig/TAO/tao/ORB_Core.cpp ++++ pkg-ace/TAO/tao/ORB_Core.cpp +@@ -1660,7 +1660,7 @@ { this->configuration ()->process_directive ( ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader", - "TAO_PI", -+ "libTAO_PI-2.0.3.so", ++ "libTAO_PI-2.1.2.so", "_make_TAO_PolicyFactory_Loader", "")); loader = -@@ -1703,7 +1703,7 @@ +@@ -1712,7 +1712,7 @@ { this->configuration ()->process_directive ( ACE_DYNAMIC_SERVICE_DIRECTIVE ("ORBInitializer_Registry", - "TAO_PI", -+ "libTAO_PI-2.0.3.so", ++ "libTAO_PI-2.1.2.so", "_make_ORBInitializer_Registry", "")); this->orbinitializer_registry_ = -@@ -2455,7 +2455,7 @@ +@@ -2467,7 +2467,7 @@ { this->configuration ()->process_directive (ACE_DYNAMIC_SERVICE_DIRECTIVE("TypeCodeFactory", - "TAO_TypeCodeFactory", -+ "libTAO_TypeCodeFactory-2.0.3.so", ++ "libTAO_TypeCodeFactory-2.1.2.so", "_make_TAO_TypeCodeFactory_Loader", "")); loader = -@@ -2488,7 +2488,7 @@ +@@ -2500,7 +2500,7 @@ { this->configuration()->process_directive (ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory", - "TAO_CodecFactory", -+ "libTAO_CodecFactory-2.0.3.so", ++ "libTAO_CodecFactory-2.1.2.so", "_make_TAO_CodecFactory_Loader", "")); loader = -@@ -2515,7 +2515,7 @@ +@@ -2527,7 +2527,7 @@ { this->configuration()->process_directive (ACE_DYNAMIC_SERVICE_DIRECTIVE("Compression", - "TAO_Compression", -+ "libTAO_Compression-2.0.3.so", ++ "libTAO_Compression-2.1.2.so", "_make_TAO_Compression_Loader", "")); loader = -@@ -2541,7 +2541,7 @@ +@@ -2553,7 +2553,7 @@ { this->configuration()->process_directive (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_POA_Current_Factory", - "TAO_PortableServer", -+ "libTAO_PortableServer-2.0.3.so", ++ "libTAO_PortableServer-2.1.2.so", "_make_TAO_POA_Current_Factory", "")); loader = -@@ -2570,7 +2570,7 @@ +@@ -2582,7 +2582,7 @@ { this->configuration ()->process_directive (ACE_DYNAMIC_SERVICE_DIRECTIVE("PICurrent_Loader", - "TAO_PI", -+ "libTAO_PI-2.0.3.so", ++ "libTAO_PI-2.1.2.so", "_make_TAO_PICurrent_Loader", "")); loader = -@@ -2601,7 +2601,7 @@ +@@ -2613,7 +2613,7 @@ { this->configuration ()->process_directive (ACE_DYNAMIC_SERVICE_DIRECTIVE("DynamicAny_Loader", - "TAO_DynamicAny", -+ "libTAO_DynamicAny-2.0.3.so", ++ "libTAO_DynamicAny-2.1.2.so", "_make_TAO_DynamicAny_Loader", "")); loader = -@@ -2628,7 +2628,7 @@ +@@ -2640,7 +2640,7 @@ { this->configuration()->process_directive (ACE_DYNAMIC_SERVICE_DIRECTIVE("IORManip_Loader", - "TAO_IORManip", -+ "libTAO_IORManip-2.0.3.so", ++ "libTAO_IORManip-2.1.2.so", "_make_TAO_IORManip_Loader", "")); loader = -@@ -2654,7 +2654,7 @@ +@@ -2666,7 +2666,7 @@ { this->configuration ()->process_directive (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_IORTable", - "TAO_IORTable", -+ "libTAO_IORTable-2.0.3.so", ++ "libTAO_IORTable-2.1.2.so", "_make_TAO_Table_Adapter_Factory", "")); factory = -@@ -2689,7 +2689,7 @@ +@@ -2701,7 +2701,7 @@ { this->configuration ()->process_directive (ACE_DYNAMIC_SERVICE_DIRECTIVE("Monitor_Init", - "TAO_Monitor", -+ "libTAO_Monitor-2.0.3.so", ++ "libTAO_Monitor-2.1.2.so", "_make_TAO_Monitor_Init", "")); loader = ---- a/TAO/tao/ORBInitializer_Registry.cpp -+++ b/TAO/tao/ORBInitializer_Registry.cpp +--- pkg-ace.orig/TAO/tao/ORBInitializer_Registry.cpp ++++ pkg-ace/TAO/tao/ORBInitializer_Registry.cpp @@ -48,7 +48,7 @@ { ACE_Service_Config::process_directive ( ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry", - "TAO_PI", -+ "libTAO_PI-2.0.3.so", ++ "libTAO_PI-2.1.2.so", "_make_ORBInitializer_Registry", "")); orbinitializer_registry_ = ---- a/TAO/tao/params.cpp -+++ b/TAO/tao/params.cpp +--- pkg-ace.orig/TAO/tao/params.cpp ++++ pkg-ace/TAO/tao/params.cpp @@ -55,7 +55,7 @@ , poa_factory_name_ ("TAO_Object_Adapter_Factory") , poa_factory_directive_ (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory", - "TAO_PortableServer", -+ "libTAO_PortableServer-2.0.3.so", ++ "libTAO_PortableServer-2.1.2.so", "_make_TAO_Object_Adapter_Factory", "")) , forward_invocation_on_object_not_exist_ (false) ---- a/TAO/tao/PI/ORBInitInfo.cpp -+++ b/TAO/tao/PI/ORBInitInfo.cpp +--- pkg-ace.orig/TAO/tao/PI/ORBInitInfo.cpp ++++ pkg-ace/TAO/tao/PI/ORBInitInfo.cpp @@ -117,7 +117,7 @@ { ACE_Service_Config::process_directive ( ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory", - "TAO_CodecFactory", -+ "libTAO_CodecFactory-2.0.3.so", ++ "libTAO_CodecFactory-2.1.2.so", "_make_TAO_CodecFactory_Loader", "")); loader = ---- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp -+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp +--- pkg-ace.orig/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp ++++ pkg-ace/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp @@ -79,7 +79,7 @@ { ACE_Service_Config::process_directive ( ACE_DYNAMIC_SERVICE_DIRECTIVE( - "ImR_Client_Adapter", "TAO_ImR_Client", -+ "ImR_Client_Adapter", "libTAO_ImR_Client-2.0.3.so", ++ "ImR_Client_Adapter", "libTAO_ImR_Client-2.1.2.so", "_make_ImR_Client_Adapter_Impl", "")); adapter = ---- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp -+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp +--- pkg-ace.orig/TAO/tao/RTCORBA/RT_ORBInitializer.cpp ++++ pkg-ace/TAO/tao/RTCORBA/RT_ORBInitializer.cpp @@ -38,7 +38,7 @@ static const ACE_TCHAR rt_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE( "TAO_RT_Object_Adapter_Factory", - "TAO_RTPortableServer", -+ "libTAO_RTPortableServer-2.0.3.so", ++ "libTAO_RTPortableServer-2.1.2.so", "_make_TAO_RT_Object_Adapter_Factory", ""); ---- a/TAO/tao/TAO_Internal.cpp -+++ b/TAO/tao/TAO_Internal.cpp -@@ -611,7 +611,7 @@ +--- pkg-ace.orig/TAO/tao/TAO_Internal.cpp ++++ pkg-ace/TAO/tao/TAO_Internal.cpp +@@ -614,7 +614,7 @@ ACE_Service_Config::process_directive ( ACE_DYNAMIC_SERVICE_DIRECTIVE ( "TAO_Codeset", - "TAO_Codeset", -+ "libTAO_Codeset-2.0.3.so", ++ "libTAO_Codeset-2.1.2.so", "_make_TAO_Codeset_Manager_Factory", "")); ---- a/TAO/tests/DLL_ORB/client.cpp -+++ b/TAO/tests/DLL_ORB/client.cpp +--- pkg-ace.orig/TAO/tests/DLL_ORB/client.cpp ++++ pkg-ace/TAO/tests/DLL_ORB/client.cpp @@ -30,7 +30,7 @@ if (ACE_Service_Config::process_directive ( ACE_DYNAMIC_SERVICE_DIRECTIVE( "Client_Module", - "Test_Client_Module", -+ "libTest_Client_Module-2.0.3.so", ++ "libTest_Client_Module-2.1.2.so", "_make_Test_Client_Module", "-k file://test.ior")) != 0) { ---- a/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp -+++ b/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp +--- pkg-ace.orig/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp ++++ pkg-ace/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp @@ -13,7 +13,7 @@ // each parameter CANNOT be split into multiple quoted strings "line1" "nextline" with the expectation that // they will be join together. Hence the long parameter 4. @@ -347,14 +347,14 @@ Last-Update: 2011-06-26 "_make_DllOrb", "DllOrb -t 1 -ORBGestalt Local -ORBDebugLevel 3 -ORBId testORB -ORBInitRef NameService=file:///tmp/test-ns.ior -ORBDottedDecimalAddresses 1" ); ---- a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp -+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp +--- pkg-ace.orig/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp ++++ pkg-ace/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp @@ -153,7 +153,7 @@ { one->process_directive ( ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry", - "TAO_PI", -+ "libTAO_PI-2.0.3.so", ++ "libTAO_PI-2.1.2.so", "_make_ORBInitializer_Registry", "")); oir = @@ -363,7 +363,7 @@ Last-Update: 2011-06-26 one->process_directive (ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader", - "TAO_PI", -+ "libTAO_PI-2.0.3.so", ++ "libTAO_PI-2.1.2.so", "_make_TAO_PolicyFactory_Loader", "")); @@ -372,18 +372,18 @@ Last-Update: 2011-06-26 int result = one->process_directive (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Codeset", - "TAO_Codeset", -+ "libTAO_Codeset-2.0.3.so", ++ "libTAO_Codeset-2.1.2.so", "_make_TAO_Codeset_Manager_Factory", "")); if (result != 0) ---- a/TAO/tests/TransportCurrent/Framework/simple.cpp -+++ b/TAO/tests/TransportCurrent/Framework/simple.cpp +--- pkg-ace.orig/TAO/tests/TransportCurrent/Framework/simple.cpp ++++ pkg-ace/TAO/tests/TransportCurrent/Framework/simple.cpp @@ -56,7 +56,7 @@ #if !defined (TAO_AS_STATIC_LIBS) int ret = ACE_Service_Config::process_directive (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Transport_Current_Loader", - "TAO_Transport_Current", -+ "libTAO_Transport_Current-2.0.3.so", ++ "libTAO_Transport_Current-2.1.2.so", "_make_TAO_Transport_Current_Loader", "")); ACE_ASSERT (ret == 0); diff --git a/ACE/debian/patches/92-default-ACE_ROOT.diff b/ACE/debian/patches/92-default-ACE_ROOT.diff index e415c838dda..118f2ac4541 100644 --- a/ACE/debian/patches/92-default-ACE_ROOT.diff +++ b/ACE/debian/patches/92-default-ACE_ROOT.diff @@ -4,9 +4,9 @@ Forwarded: no Author: Thomas Girard <thomas.g.girard@free.fr> Last-Update: 2010-05-24 ---- a/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm -+++ b/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm -@@ -94,6 +94,9 @@ +--- pkg-ace.orig/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm ++++ pkg-ace/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm +@@ -95,6 +95,9 @@ "ifeq (\$(findstring k,\$(MAKEFLAGS)),k)$crlf", " KEEP_GOING = -$crlf", "endif$crlf$crlf", diff --git a/ACE/debian/patches/reduce-doxygen-doc.diff b/ACE/debian/patches/reduce-doxygen-doc.diff index 9b434f7e87a..3d6735f46cf 100644 --- a/ACE/debian/patches/reduce-doxygen-doc.diff +++ b/ACE/debian/patches/reduce-doxygen-doc.diff @@ -1,14 +1,5 @@ --- pkg-ace.orig/TAO/etc/tao.doxygen +++ pkg-ace/TAO/etc/tao.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -149,11 +149,13 @@ HAVE_DOT = YES @@ -34,15 +25,6 @@ --- pkg-ace.orig/TAO/etc/tao_anytypecode.doxygen +++ pkg-ace/TAO/etc/tao_anytypecode.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -148,11 +148,13 @@ HAVE_DOT = YES @@ -68,15 +50,6 @@ --- pkg-ace.orig/TAO/etc/tao_av.doxygen +++ pkg-ace/TAO/etc/tao_av.doxygen -@@ -80,7 +80,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -152,11 +152,13 @@ HAVE_DOT = YES @@ -102,15 +75,6 @@ --- pkg-ace.orig/TAO/etc/tao_compression.doxygen +++ pkg-ace/TAO/etc/tao_compression.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -148,11 +148,13 @@ HAVE_DOT = YES @@ -136,15 +100,6 @@ --- pkg-ace.orig/TAO/etc/tao_cosevent.doxygen +++ pkg-ace/TAO/etc/tao_cosevent.doxygen -@@ -80,7 +80,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -153,11 +153,13 @@ HAVE_DOT = YES @@ -170,15 +125,6 @@ --- pkg-ace.orig/TAO/etc/tao_cosnaming.doxygen +++ pkg-ace/TAO/etc/tao_cosnaming.doxygen -@@ -78,7 +78,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -149,11 +149,13 @@ HAVE_DOT = YES @@ -204,15 +150,6 @@ --- pkg-ace.orig/TAO/etc/tao_cosnotification.doxygen +++ pkg-ace/TAO/etc/tao_cosnotification.doxygen -@@ -85,7 +85,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -159,11 +159,13 @@ HAVE_DOT = YES @@ -238,15 +175,6 @@ --- pkg-ace.orig/TAO/etc/tao_costime.doxygen +++ pkg-ace/TAO/etc/tao_costime.doxygen -@@ -78,7 +78,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -150,11 +150,13 @@ HAVE_DOT = YES @@ -272,15 +200,6 @@ --- pkg-ace.orig/TAO/etc/tao_costrader.doxygen +++ pkg-ace/TAO/etc/tao_costrader.doxygen -@@ -80,7 +80,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -152,11 +152,13 @@ HAVE_DOT = YES @@ -306,15 +225,6 @@ --- pkg-ace.orig/TAO/etc/tao_dynamicany.doxygen +++ pkg-ace/TAO/etc/tao_dynamicany.doxygen -@@ -78,7 +78,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -148,11 +148,13 @@ HAVE_DOT = YES @@ -340,15 +250,6 @@ --- pkg-ace.orig/TAO/etc/tao_dynamicinterface.doxygen +++ pkg-ace/TAO/etc/tao_dynamicinterface.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -147,11 +147,13 @@ HAVE_DOT = YES @@ -374,15 +275,6 @@ --- pkg-ace.orig/TAO/etc/tao_esf.doxygen +++ pkg-ace/TAO/etc/tao_esf.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -149,11 +149,13 @@ HAVE_DOT = YES @@ -408,15 +300,6 @@ --- pkg-ace.orig/TAO/etc/tao_ifr.doxygen +++ pkg-ace/TAO/etc/tao_ifr.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -151,11 +151,13 @@ HAVE_DOT = YES @@ -442,15 +325,6 @@ --- pkg-ace.orig/TAO/etc/tao_implrepo.doxygen +++ pkg-ace/TAO/etc/tao_implrepo.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -150,11 +150,13 @@ HAVE_DOT = YES @@ -476,15 +350,6 @@ --- pkg-ace.orig/TAO/etc/tao_iormanip.doxygen +++ pkg-ace/TAO/etc/tao_iormanip.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -148,11 +148,13 @@ HAVE_DOT = YES @@ -510,15 +375,6 @@ --- pkg-ace.orig/TAO/etc/tao_iortable.doxygen +++ pkg-ace/TAO/etc/tao_iortable.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -148,11 +148,13 @@ HAVE_DOT = YES @@ -544,15 +400,6 @@ --- pkg-ace.orig/TAO/etc/tao_pi.doxygen +++ pkg-ace/TAO/etc/tao_pi.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -149,11 +149,13 @@ HAVE_DOT = YES @@ -578,15 +425,6 @@ --- pkg-ace.orig/TAO/etc/tao_pi_server.doxygen +++ pkg-ace/TAO/etc/tao_pi_server.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -149,11 +149,13 @@ HAVE_DOT = YES @@ -612,15 +450,6 @@ --- pkg-ace.orig/TAO/etc/tao_portablegroup.doxygen +++ pkg-ace/TAO/etc/tao_portablegroup.doxygen -@@ -80,7 +80,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -152,11 +152,13 @@ HAVE_DOT = YES @@ -646,15 +475,6 @@ --- pkg-ace.orig/TAO/etc/tao_portableserver.doxygen +++ pkg-ace/TAO/etc/tao_portableserver.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -149,11 +149,13 @@ HAVE_DOT = YES @@ -680,15 +500,6 @@ --- pkg-ace.orig/TAO/etc/tao_rtcorba.doxygen +++ pkg-ace/TAO/etc/tao_rtcorba.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -149,11 +149,13 @@ HAVE_DOT = YES @@ -714,15 +525,6 @@ --- pkg-ace.orig/TAO/etc/tao_rtevent.doxygen +++ pkg-ace/TAO/etc/tao_rtevent.doxygen -@@ -86,7 +86,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -159,11 +159,13 @@ HAVE_DOT = YES @@ -748,15 +550,6 @@ --- pkg-ace.orig/TAO/etc/tao_rtportableserver.doxygen +++ pkg-ace/TAO/etc/tao_rtportableserver.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -149,11 +149,13 @@ HAVE_DOT = YES @@ -782,15 +575,6 @@ --- pkg-ace.orig/TAO/etc/tao_security.doxygen +++ pkg-ace/TAO/etc/tao_security.doxygen -@@ -82,7 +82,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -154,11 +154,13 @@ HAVE_DOT = YES @@ -816,15 +600,6 @@ --- pkg-ace.orig/TAO/etc/tao_smartproxies.doxygen +++ pkg-ace/TAO/etc/tao_smartproxies.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -147,11 +147,13 @@ HAVE_DOT = YES @@ -850,15 +625,6 @@ --- pkg-ace.orig/TAO/etc/tao_ssliop.doxygen +++ pkg-ace/TAO/etc/tao_ssliop.doxygen -@@ -82,7 +82,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -155,11 +155,13 @@ HAVE_DOT = YES @@ -884,15 +650,6 @@ --- pkg-ace.orig/TAO/etc/tao_strategies.doxygen +++ pkg-ace/TAO/etc/tao_strategies.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -152,11 +152,13 @@ HAVE_DOT = YES @@ -918,15 +675,6 @@ --- pkg-ace.orig/TAO/etc/tao_transportcurrent.doxygen +++ pkg-ace/TAO/etc/tao_transportcurrent.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -150,11 +150,13 @@ HAVE_DOT = YES @@ -952,15 +700,6 @@ --- pkg-ace.orig/TAO/etc/tao_ziop.doxygen +++ pkg-ace/TAO/etc/tao_ziop.doxygen -@@ -77,7 +77,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -150,11 +150,13 @@ HAVE_DOT = YES @@ -986,15 +725,6 @@ --- pkg-ace.orig/etc/ace.doxygen +++ pkg-ace/etc/ace.doxygen -@@ -89,7 +89,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -174,11 +174,13 @@ HAVE_DOT = YES @@ -1019,15 +749,6 @@ +SEARCHENGINE = NO --- pkg-ace.orig/etc/ace_inet.doxygen +++ pkg-ace/etc/ace_inet.doxygen -@@ -79,7 +79,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -147,11 +147,13 @@ HAVE_DOT = YES @@ -1051,39 +772,8 @@ -SEARCHENGINE = YES +SEARCHENGINE = NO ---- pkg-ace.orig/etc/ace_man.doxygen -+++ pkg-ace/etc/ace_man.doxygen -@@ -79,7 +79,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output -@@ -151,7 +151,9 @@ - INCLUDE_GRAPH = NO - INCLUDED_BY_GRAPH = NO - GRAPHICAL_HIERARCHY = NO --DOT_MULTI_TARGETS = YES -+DOT_MULTI_TARGETS = YES -+DOT_GRAPH_MAX_NODES = 15 -+DOT_IMAGE_FORMAT = png - MAX_DOT_GRAPH_DEPTH = 3 - - # The tag DOT_PATH can be used to specify the path where the dot tool can be --- pkg-ace.orig/etc/ace_qos.doxygen +++ pkg-ace/etc/ace_qos.doxygen -@@ -79,7 +79,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -147,11 +147,13 @@ HAVE_DOT = YES @@ -1109,15 +799,6 @@ --- pkg-ace.orig/etc/ace_rmcast.doxygen +++ pkg-ace/etc/ace_rmcast.doxygen -@@ -79,7 +79,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -147,11 +147,13 @@ HAVE_DOT = YES @@ -1143,15 +824,6 @@ --- pkg-ace.orig/etc/ace_ssl.doxygen +++ pkg-ace/etc/ace_ssl.doxygen -@@ -79,7 +79,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -147,11 +147,13 @@ HAVE_DOT = YES @@ -1177,15 +849,6 @@ --- pkg-ace.orig/etc/acexml.doxygen +++ pkg-ace/etc/acexml.doxygen -@@ -79,7 +79,7 @@ - HTML_FOOTER = - HTML_STYLESHEET = - HTML_ALIGN_MEMBERS = YES --GENERATE_HTMLHELP = YES -+GENERATE_HTMLHELP = NO - - #--------------------------------------------------------------------------- - # configuration options related to the LaTeX output @@ -147,11 +147,13 @@ HAVE_DOT = YES diff --git a/ACE/debian/tao-utils.install b/ACE/debian/tao-utils.install index bb19843035e..5206ae0a7fc 100644 --- a/ACE/debian/tao-utils.install +++ b/ACE/debian/tao-utils.install @@ -1,2 +1,4 @@ -usr/bin/tao_ns{add,del,list} +usr/bin/tao_nsadd +usr/bin/tao_nsdel +usr/bin/tao_nslist usr/bin/tao_catior |