Hello, please unblock ace version 6.0.3+dfsg-0.1. This version fixes two release critical bugs: #697848 and #697847 Fixing these bugs meant essentially to repack the source and to drop files with non-free licence or without source (hence the new orig tarball). Allmost all other changes to the package are a consequence of that. I tried to keep changes as conservative as possible. Concerning the sharpening of the build-dependency on debhelper: DH compatibility level 9 was already previously specified in the package, it just wasn't reflected in the build-dependency (which is now rectified). Debdiff is attached. I have deleted (by hand, since I couldn't get the --exclude option of debdiff to work) the changes to the upstream tarball in order to keep the size reasonable. Cheers -Ralf.
Binary files 3XJFcCT80I/ace-6.0.3/bin/LabVIEW_RT/PXI_Reset.exe and dvyYe5ewLS/ace-6.0.3+dfsg/bin/LabVIEW_RT/PXI_Reset.exe differ
Binary files 3XJFcCT80I/ace-6.0.3/bin/LabVIEW_RT/Reboot_Target.exe and dvyYe5ewLS/ace-6.0.3+dfsg/bin/LabVIEW_RT/Reboot_Target.exe differ
diff -Nru ace-6.0.3/debian/changelog ace-6.0.3+dfsg/debian/changelog
--- ace-6.0.3/debian/changelog 2012-03-30 20:04:15.000000000 +0200
+++ ace-6.0.3+dfsg/debian/changelog 2013-01-23 21:28:33.000000000 +0100
@@ -1,3 +1,23 @@
+ace (6.0.3+dfsg-0.1) unstable; urgency=low
+
+ * NMU with maintainers blessing.
+ * Remove upstream files with nonfree licence (closes: #697848) or
+ without source (closes: #697847):
+ - repack the orig tarball by removing:
+ bin/LabVIEW_RT/*.exe
+ examples/{C++NPv2,C++NPv1,APG}/
+ TAO/
+ - debian/control: drop all packages named *tao*
+ - debian/rules: drop everything related to tao
+ - remove all hunks applying to TAO files in patch reduce-doxygen-doc.diff
+ - drop patch 34-bts386713.diff since it applies only to TAO files.
+ - debian/copyright: remove copyright entries of TAO/, and of the
+ directories under examples/ that have been removed.
+ * Bump version in build-dependency on debhelper to >=9 since we are using
+ debhelper compatibility level 9.
+
+ -- Ralf Treinen <treinen@debian.org> Wed, 23 Jan 2013 21:27:40 +0100
+
ace (6.0.3-5) unstable; urgency=low
* debian/control:
diff -Nru ace-6.0.3/debian/control ace-6.0.3+dfsg/debian/control
--- ace-6.0.3/debian/control 2012-03-28 22:59:19.000000000 +0200
+++ ace-6.0.3+dfsg/debian/control 2013-01-23 21:28:34.000000000 +0100
@@ -4,7 +4,7 @@
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.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: debhelper (>= 9), 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
@@ -348,433 +348,6 @@
This package contains header files and static library for the ACE-FOX
reactor integration.
-Package: libtao-2.0.3
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: ACE based CORBA ORB core libraries
- The ACE ORB (TAO) is an open-source Common Object Request Broker
- Architecture (CORBA) 2.x-compliant Object Request Broker (ORB). It
- supports real-time extensions.
- .
- This package contains TAO core libraries.
-
-Package: libtao-dev
-Architecture: any
-Section: libdevel
-Replaces: libtao-orbsvcs-dev (<< 5.7.7-4)
-Depends: libtao-2.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
-Suggests: libtao-doc, libtao-orbsvcs-dev
-Description: ACE based CORBA ORB core libraries - development files
- This package contains the header files for TAO. Due to the size of
- the static libraries (over 400MB) they have been left out.
-
-Package: libtao-doc
-Architecture: all
-Section: doc
-Depends: libace-doc (= ${source:Version}), ${misc:Depends}
-Suggests: libtao-dev
-Recommends: doc-base
-Description: ACE based CORBA ORB core libraries - documentation
- This package contains the TAO overview documentation, tutorials,
- examples, and information regarding upstream development.
-
-Package: libtao-orbsvcs-2.0.3
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: TAO CORBA services libraries
- This package contains libraries that are needed by many TAO programs.
-
-Package: libtao-orbsvcs-dev
-Architecture: any
-Section: libdevel
-Replaces: libtao-dev (<< 5.7.7-4)
-Depends: libtao-orbsvcs-2.0.3 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
-Description: TAO CORBA services - development files
- This package contains the header files for the TAO CORBA services.
- .
- The examples and some documentation have been included as well, but the
- static libraries have been left out due to their size (over 400MB).
-
-Package: libtao-qtresource-2.0.3
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: TAO-GUI reactor integration for Qt
- The Qt resource factory integrates ACE QtReactor into TAO ORB
- reactor.
-
-Package: libtao-qtresource-dev
-Architecture: any
-Section: libdevel
-Depends: libtao-qtresource-2.0.3 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
-Description: TAO-GUI reactor integration for Qt - development files
- This package contains header files and static library for the TAO-Qt
- reactor integration.
-
-Package: libtao-xtresource-2.0.3
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: TAO-GUI reactor integration for Xt
- The Xt resource factory integrates ACE XtReactor into TAO ORB
- reactor.
-
-Package: libtao-xtresource-dev
-Architecture: any
-Section: libdevel
-Depends: libtao-xtresource-2.0.3 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
-Description: TAO-GUI reactor integration for Xt - development files
- This package contains header files and static library for the TAO-Xt
- reactor integration.
-
-Package: libtao-flresource-2.0.3
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: TAO-GUI reactor integration for Fl
- The Fl resource factory integrates ACE FlReactor into TAO ORB
- reactor.
-
-Package: libtao-flresource-dev
-Architecture: any
-Section: libdevel
-Depends: libtao-flresource-2.0.3 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
-Description: TAO-GUI reactor integration for Fl - development files
- This package contains header files and static library for the TAO-Fl
- reactor integration.
-
-Package: libtao-tkresource-2.0.3
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: TAO-GUI reactor integration for Tk
- The Tk resource factory integrates ACE TkReactor into TAO ORB
- reactor.
-
-Package: libtao-tkresource-dev
-Architecture: any
-Section: libdevel
-Depends: libtao-tkresource-2.0.3 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
-Description: TAO-GUI reactor integration for Tk - development files
- This package contains header files and static library for the TAO-Tk
- reactor integration.
-
-Package: libtao-foxresource-2.0.3
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: TAO-GUI reactor integration for FOX
- The Fl resource factory integrates ACE FoxReactor into TAO ORB
- reactor.
-
-Package: libtao-foxresource-dev
-Architecture: any
-Section: libdevel
-Depends: libtao-foxresource-2.0.3 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
-Description: TAO-GUI reactor integration for FOX - development files
- This package contains header files and static library for the TAO-FOX
- reactor integration.
-
-Package: tao-idl
-Architecture: any
-Depends: g++, libtao-2.0.3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: TAO IDL to C++ compiler
- This package provides an Interface Definition Language (IDL) to C++
- compiler.
- .
- tao_idl generates stubs and skeletons used to call or implement CORBA
- distributed objects in C++.
-
-Package: tao-ifr
-Architecture: any
-Depends: g++, libtao-2.0.3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: TAO interface repository
- CORBA-aware programs can contact an interface repository to get
- objects' interfaces at run-time. Then they can use the Dynamic
- Invocation Interface (DII) mechanism to invoke requests on those
- objects.
- .
- This package includes the following programs:
- * tao_ifr_service: interface repository server
- * tao_ifr: feeds in the interface repository
-
-Package: tao-imr
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: TAO implementation repository
- An implementation repository activates CORBA servers on demand.
- .
- This package includes the following programs:
- * tao_imr_locator: the main server; delegates calls to activators
- * tao_imr_activator: activates and shuts servers down on demand
- * tao_imr: registers servers for later activation
-
-Package: tao-ft
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: TAO fault tolerant services
- TAO supports Fault Tolerance for CORBA Objects.
- .
- This package includes three FT CORBA infrastructure components:
- * tao_fault_detector: monitors a process or a host
- * tao_fault_notifier: receives fault reports from detectors
- * tao_ft_replicationmanager: manages object groups
-
-Package: tao-utils
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: tao-cosnaming
-Description: TAO naming service and IOR utilities
- This package includes programs to query or control a CORBA naming
- service, and to dump an Interoperable Object Reference.
- .
- The following programs are included:
- * tao_nslist: lists naming context and object bindings
- * tao_nsadd: creates bindings
- * tao_nsdel: removes bindings
- * tao_catior: dumps the contents of an IOR
-
-Package: tao-cosnaming
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: tao-naming (<< 5.7.7-1)
-Replaces: tao-naming (<< 5.7.7-1)
-Recommends: tao-utils
-Description: TAO naming service
- The TAO naming service implements the CORBA interoperable naming
- service (INS).
- .
- A naming service provides a location service for CORBA objects.
- Given a name, it will return the Interoperable Object Reference (IOR)
- for the CORBA object that was registered with this name.
- .
- The following program is included:
- * tao_cosnaming
-
-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.
- .
- It can be safely removed after installation.
-
-Package: tao-costrading
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: tao-trading (<< 5.7.7-1)
-Replaces: tao-trading (<< 5.7.7-1)
-Description: TAO trading service
- TAO implementation of CORBA trading service.
- .
- A trading service is quite like a naming service except that it
- relies on a set of properties instead of a name to find object
- references.
- .
- The following program is included:
- * tao_costrading
-
-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.
- .
- It can be safely removed after installation.
-
-Package: tao-cosevent
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: tao-event (<< 5.7.7-1)
-Replaces: tao-event (<< 5.7.7-1)
-Description: TAO event service
- An event service creates channels where suppliers and consumers can
- push or pull events. This channel enables asynchronous, message based
- communication between consumers and suppliers.
- .
- This event service supports both the Push and Pull styles for event
- communication.
- .
- The following program is included:
- * tao_cosevent
-
-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.
- .
- It can be safely removed after installation.
-
-Package: tao-rtevent
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: TAO real-time event service
- This package provides another TAO implementation of CORBA event service.
- For more information on CORBA event service have a look at the tao-cosevent
- package.
- .
- This version does not support the Pull style but provides a real-time
- event channel.
- .
- The following program is included:
- * tao_rtevent
-
-Package: tao-ftrtevent
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: TAO fault-tolerant real-time event service
- This package provides TAO's fault-tolerant, real-time CORBA event service.
- For more information on CORBA event service have a look at the tao-cosevent
- package.
- .
- This package contains:
- * ftrt_eventservice: fault-tolerant event channel
- * ftrtec_factory_service: spawns ftrt_eventservice processes
- * ftrtec_gateway_service: relays events to FT CORBA unaware clients
-
-Package: tao-cosnotification
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: tao-notify (<< 5.7.7-1)
-Replaces: tao-notify (<< 5.7.7-1)
-Description: TAO notification service
- A notification service enhances an event service, providing event
- filtering and Quality Of Service control on reliability and speed.
- For more information on CORBA event service have a look at the
- tao-cosevent package.
- .
- This package contains:
- * tao_cosnotification
-
-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.
- .
- It can be safely removed after installation.
-
-Package: tao-load
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: TAO load balancing service
- The TAO load balancer implements the OMG Load Balancing and
- Monitoring specification.
- .
- This package provides:
- * tao_loadmanager: distributes loads across objects
- * tao_loadmonitor: monitors and reports loads to a manager
-
-Package: tao-tls
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: tao-log (<< 5.7.7-1)
-Replaces: tao-log (<< 5.7.7-1)
-Description: TAO telecom log services
- The TAO telecom log services implement the OMG Telecom Log Service
- specification.
- .
- Four separate services are provided:
- * tao_tls_basic
- * tao_tls_event
- * tao_tls_notify
- * tao_tls_rtevent
-
-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.
- .
- It can be safely removed after installation.
-
-Package: tao-scheduling
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: TAO scheduling service
- TAO scheduling implements CORBA scheduling services.
- .
- This package contains:
- * tao_cosscheduling
- * tao_dump_schedule
-
-Package: tao-cosconcurrency
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: tao-concurrency (<< 5.7.7-1)
-Replaces: tao-concurrency (<< 5.7.7-1)
-Description: TAO concurrency service
- A concurrency service provides a mechanism to acquire and release
- locks in a distributed system.
- .
- The TAO version does not support transactions.
-
-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.
- .
- It can be safely removed after installation.
-
-Package: tao-coslifecycle
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: tao-lifecycle (<< 5.7.7-1)
-Replaces: tao-lifecycle (<< 5.7.7-1)
-Description: TAO lifecycle service
- The CORBA lifecycle service allows clients to create, delete, copy,
- and move objects.
- .
- This package contains a TAO implementation.
-
-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.
- .
- It can be safely removed after installation.
-
-Package: tao-costime
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: tao-time (<< 5.7.7-1)
-Replaces: tao-time (<< 5.7.7-1)
-Description: TAO time service
- A time service offers globally synchronized time to clients.
- .
- This package contains two programs:
- * tao_costime_clerk: answers client requests
- * tao_costime_server: synchronizes querying clerks
-
-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.
- .
- It can be safely removed after installation.
-
Package: ace-netsvcs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
diff -Nru ace-6.0.3/debian/copyright ace-6.0.3+dfsg/debian/copyright
--- ace-6.0.3/debian/copyright 2011-09-10 11:50:59.000000000 +0200
+++ ace-6.0.3+dfsg/debian/copyright 2013-01-23 21:28:36.000000000 +0100
@@ -206,163 +206,6 @@
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
-Files: TAO/TAO_IDL/*
- TAO/orbsvcs/IFR_Service/drv_*_ifr.*
- TAO/*/be_produce.cpp
- TAO/*/be_extern.h
-Copyright: © 1992-1995 Sun Micosystems, Inc
-License: other
- COPYRIGHT
-
- Copyright 1992, 1993, 1994 Sun Microsystems, Inc. Printed in the
- United States of America. All Rights Reserved.
-
- This product is protected by copyright and distributed under the
- following license restricting its use.
-
- The Interface Definition Language Compiler Front End (CFE) is made
- available for your use provided that you include this license and
- copyright notice on all media and documentation and the software
- program in which this product is incorporated in whole or part. You
- may copy and extend functionality (but may not remove functionality)
- of the Interface Definition Language CFE without charge, but you are
- not authorized to license or distribute it to anyone else except as
- part of a product or program developed by you or with the express
- written consent of Sun Microsystems, Inc. ("Sun").
-
- The names of Sun Microsystems, Inc. and any of its subsidiaries or
- affiliates may not be used in advertising or publicity pertaining to
- distribution of Interface Definition Language CFE as permitted herein.
-
- This license is effective until terminated by Sun for failure to
- comply with this license. Upon termination, you shall destroy or
- return all code and documentation for the Interface Definition
- Language CFE.
-
- INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-
- INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND
- WITHOUT ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES
- OR AFFILIATES TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR
- ENHANCEMENT.
-
- SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY
- WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY
- PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
- IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE
- LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND
- CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGES.
-
- Use, duplication, or disclosure by the government is subject to
- restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
- Technical Data and Computer Software clause at DFARS 252.227-7013 and
- FAR 52.227-19.
-
- Sun, Sun Microsystems and the Sun logo are trademarks or registered
- trademarks of Sun Microsystems, Inc.
-
- SunSoft, Inc.
- 2550 Garcia Avenue
- Mountain View, California 94043
-
- NOTE:
-
- SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
- trademarks or registered trademarks of Sun Microsystems, Inc.
-
-Files: TAO/tao/DynamicInterface/Unknown_User_Exception.h
- TAO/tao/DynamicInterface/ExceptionList.h
- TAO/tao/DynamicInterface/Request.h
- TAO/tao/DynamicInterface/Server_Request.h
- TAO/tao/default_ports.h
- TAO/tao/Stub.h
- TAO/tao/corba.h
- TAO/tao/GIOP_Message_Base.h
- TAO/tao/Stub.cpp
- TAO/tao/Object.h
- TAO/tao/TAO_Server_Request.h
- TAO/tao/CDR.h
- TAO/tao/orbconf.h
- TAO/tao/AnyTypeCode/Marshal.cpp
- TAO/tao/AnyTypeCode/append.cpp
- TAO/tao/AnyTypeCode/NVList.h
- TAO/tao/Object.cpp
- TAO/tao/Principal.h
- TAO/tao/Principal.cpp
-Copyright: © 1995 Sun Microsystems, Inc
-License: other
- This notice applies to all files in this software distribution that
- were originally derived from SunSoft IIOP code (these files contain
- Sun Microsystems copyright notices).
-
- COPYRIGHT AND LICENSING
- -----------------------
-
- Copyright 1995 Sun Microsystems, Inc.
- Printed in the United States of America.
- All Rights Reserved.
-
- This software product (LICENSED PRODUCT), implementing the Object
- Management Group's "Internet Inter-ORB Protocol", is protected by
- copyright and is distributed under the following license restricting
- its use. Portions of LICENSED PRODUCT may be protected by one or more
- U.S. or foreign patents, or pending applications.
-
- LICENSED PRODUCT is made available for your use provided that you
- include this license and copyright notice on all media and
- documentation and the software program in which this product is
- incorporated in whole or part.
-
- You may copy, modify, distribute, or sublicense the LICENSED PRODUCT
- without charge as part of a product or software program developed by
- you, so long as you preserve the functionality of interoperating with
- the Object Management Group's "Internet Inter-ORB Protocol" version
- one. However, any uses other than the foregoing uses shall require
- the express written consent of Sun Microsystems, Inc.
-
- The names of Sun Microsystems, Inc. and any of its subsidiaries or
- affiliates may not be used in advertising or publicity pertaining to
- distribution of the LICENSED PRODUCT as permitted herein.
-
- This license is effective until terminated by Sun for failure to
- comply with this license. Upon termination, you shall destroy or
- return all code and documentation for the LICENSED PRODUCT.
-
- LICENSED PRODUCT IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND
- INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A
- PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
- DEALING, USAGE OR TRADE PRACTICE.
-
- LICENSED PRODUCT IS PROVIDED WITH NO SUPPORT AND WITHOUT ANY
- OBLIGATION ON THE PART OF SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
- TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
- SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY
- WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY
- PATENTS BY LICENSED PRODUCT OR ANY PART THEREOF.
-
- IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE
- LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND
- CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGES.
-
- Use, duplication, or disclosure by the government is subject to
- restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
- Technical Data and Computer Software clause at DFARS 252.227-7013 and
- FAR 52.227-19.
-
- SunOS, SunSoft, Sun, Solaris, Sun Microsystems and the Sun logo are
- trademarks or registered trademarks of Sun Microsystems, Inc.
-
- SunSoft, Inc.
- 2550 Garcia Avenue
- Mountain View, California 94043
-
Files: ace/OS_NS_unistd.inl (swab function)
Copyright: © 1994-2006 Red Hat, Inc.
License: BSD-3
@@ -637,12 +480,3 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-Files: examples/C++NPv1
- examples/C++NPv2
- examples/APG
-Copyright: © 2001, 2003 Addison Wesley
-License: other
- All of the files in these directories are copyright Addison Wesley,
- and they come with absolutely no warranty whatsoever. Permission is
- hereby granted to use these programs for educational or commercial
- purposes.
diff -Nru ace-6.0.3/debian/patches/34-bts386713.diff ace-6.0.3+dfsg/debian/patches/34-bts386713.diff
--- ace-6.0.3/debian/patches/34-bts386713.diff 2011-09-10 11:50:59.000000000 +0200
+++ ace-6.0.3+dfsg/debian/patches/34-bts386713.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,389 +0,0 @@
-Description: Hardcode TAO library names so that dynamic loading works
- ACE allows to dynamically load a library with ACE_DYNAMIC_SERVICE_DIRECTIVE
- macro, and this mechanism is used to load some TAO libraries when needed. The
- name used in macro invocations is the short library name, i.e. libfoo.so.
- .
- Debian usually ships libfoo.so symlinks in -dev packages. So to make the
- dynamic loading work without the need for the -dev package being installed,
- we use long names (libfoo-x.y.z.so) in the macro invocation.
-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
-@@ -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_BEGIN_VERSIONED_NAMESPACE_DECL
-
---- a/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp
-+++ b/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",
- "_make_TAO_Naming_Loader",
- ""
- );
---- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
-+++ b/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",
- "_make_TAO_CosNotify_Service",
- ""
- );
---- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
-+++ b/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",
- "_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
-@@ -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",
- "_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
-@@ -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",
- "_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
-@@ -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",
- "_make_TAO_Notify_Service_Driver",
- "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 10 -ORBInitRef NameService=file://naming.ior -IORoutput notify.ior"
- );
-@@ -29,7 +29,7 @@
-
- ACE_TCHAR const * const scpc_loadNameService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
- "testNamingService",
-- "TAO_CosNaming_Serv",
-+ "libTAO_CosNaming_Serv-2.0.3.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
-@@ -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",
- "_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
-@@ -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",
- "_make_TAO_Naming_Loader",
- "testNameService testNameService -ORBId testDllOrb -m 0 -o naming.ior"
- );
-@@ -34,7 +34,7 @@
-
- ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
- "testNotifyService",
-- "TAO_Notify_Service",
-+ "libTAO_Notify_Service-2.0.3.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
-@@ -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",
- "_make_TAO_UTF8_Latin1_Factory",
- ""));
- else
-@@ -370,7 +370,7 @@
- if (fact == 0)
- ACE_Service_Config::process_directive
- (ACE_DYNAMIC_SERVICE_DIRECTIVE ("UTF16_BOM_Factory",
-- "TAO_Codeset",
-+ "libTAO_Codeset-2.0.3.so",
- "_make_TAO_UTF16_BOM_Factory",
- ""));
- else
---- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
-+++ b/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",
- "_make_TAO_CSD_Object_Adapter_Factory",
- "");
-
---- a/TAO/tao/ORB_Core.cpp
-+++ b/TAO/tao/ORB_Core.cpp
-@@ -1651,7 +1651,7 @@
- {
- this->configuration ()->process_directive (
- ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader",
-- "TAO_PI",
-+ "libTAO_PI-2.0.3.so",
- "_make_TAO_PolicyFactory_Loader",
- ""));
- loader =
-@@ -1703,7 +1703,7 @@
- {
- this->configuration ()->process_directive (
- ACE_DYNAMIC_SERVICE_DIRECTIVE ("ORBInitializer_Registry",
-- "TAO_PI",
-+ "libTAO_PI-2.0.3.so",
- "_make_ORBInitializer_Registry",
- ""));
- this->orbinitializer_registry_ =
-@@ -2455,7 +2455,7 @@
- {
- this->configuration ()->process_directive
- (ACE_DYNAMIC_SERVICE_DIRECTIVE("TypeCodeFactory",
-- "TAO_TypeCodeFactory",
-+ "libTAO_TypeCodeFactory-2.0.3.so",
- "_make_TAO_TypeCodeFactory_Loader",
- ""));
- loader =
-@@ -2488,7 +2488,7 @@
- {
- this->configuration()->process_directive
- (ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
-- "TAO_CodecFactory",
-+ "libTAO_CodecFactory-2.0.3.so",
- "_make_TAO_CodecFactory_Loader",
- ""));
- loader =
-@@ -2515,7 +2515,7 @@
- {
- this->configuration()->process_directive
- (ACE_DYNAMIC_SERVICE_DIRECTIVE("Compression",
-- "TAO_Compression",
-+ "libTAO_Compression-2.0.3.so",
- "_make_TAO_Compression_Loader",
- ""));
- loader =
-@@ -2541,7 +2541,7 @@
- {
- this->configuration()->process_directive
- (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_POA_Current_Factory",
-- "TAO_PortableServer",
-+ "libTAO_PortableServer-2.0.3.so",
- "_make_TAO_POA_Current_Factory",
- ""));
- loader =
-@@ -2570,7 +2570,7 @@
- {
- this->configuration ()->process_directive
- (ACE_DYNAMIC_SERVICE_DIRECTIVE("PICurrent_Loader",
-- "TAO_PI",
-+ "libTAO_PI-2.0.3.so",
- "_make_TAO_PICurrent_Loader",
- ""));
- loader =
-@@ -2601,7 +2601,7 @@
- {
- this->configuration ()->process_directive
- (ACE_DYNAMIC_SERVICE_DIRECTIVE("DynamicAny_Loader",
-- "TAO_DynamicAny",
-+ "libTAO_DynamicAny-2.0.3.so",
- "_make_TAO_DynamicAny_Loader",
- ""));
- loader =
-@@ -2628,7 +2628,7 @@
- {
- this->configuration()->process_directive
- (ACE_DYNAMIC_SERVICE_DIRECTIVE("IORManip_Loader",
-- "TAO_IORManip",
-+ "libTAO_IORManip-2.0.3.so",
- "_make_TAO_IORManip_Loader",
- ""));
- loader =
-@@ -2654,7 +2654,7 @@
- {
- this->configuration ()->process_directive
- (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_IORTable",
-- "TAO_IORTable",
-+ "libTAO_IORTable-2.0.3.so",
- "_make_TAO_Table_Adapter_Factory",
- ""));
- factory =
-@@ -2689,7 +2689,7 @@
- {
- this->configuration ()->process_directive
- (ACE_DYNAMIC_SERVICE_DIRECTIVE("Monitor_Init",
-- "TAO_Monitor",
-+ "libTAO_Monitor-2.0.3.so",
- "_make_TAO_Monitor_Init",
- ""));
- loader =
---- a/TAO/tao/ORBInitializer_Registry.cpp
-+++ b/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",
- "_make_ORBInitializer_Registry",
- ""));
- orbinitializer_registry_ =
---- a/TAO/tao/params.cpp
-+++ b/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",
- "_make_TAO_Object_Adapter_Factory",
- ""))
- , forward_invocation_on_object_not_exist_ (false)
---- a/TAO/tao/PI/ORBInitInfo.cpp
-+++ b/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",
- "_make_TAO_CodecFactory_Loader",
- ""));
- loader =
---- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
-+++ b/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",
- "_make_ImR_Client_Adapter_Impl", ""));
-
- adapter =
---- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
-+++ b/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",
- "_make_TAO_RT_Object_Adapter_Factory",
- "");
-
---- a/TAO/tao/TAO_Internal.cpp
-+++ b/TAO/tao/TAO_Internal.cpp
-@@ -611,7 +611,7 @@
- ACE_Service_Config::process_directive (
- ACE_DYNAMIC_SERVICE_DIRECTIVE (
- "TAO_Codeset",
-- "TAO_Codeset",
-+ "libTAO_Codeset-2.0.3.so",
- "_make_TAO_Codeset_Manager_Factory",
- ""));
-
---- a/TAO/tests/DLL_ORB/client.cpp
-+++ b/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",
- "_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
-@@ -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.
- ACE_DYNAMIC_SERVICE_DIRECTIVE ("testDllOrb",
-- "DllOrb",
-+ "DllOrb.so",
- "_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
-@@ -153,7 +153,7 @@
- {
- one->process_directive (
- ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry",
-- "TAO_PI",
-+ "libTAO_PI-2.0.3.so",
- "_make_ORBInitializer_Registry",
- ""));
- oir =
-@@ -252,7 +252,7 @@
-
- one->process_directive
- (ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader",
-- "TAO_PI",
-+ "libTAO_PI-2.0.3.so",
- "_make_TAO_PolicyFactory_Loader",
- ""));
-
-@@ -292,7 +292,7 @@
-
- int result = one->process_directive
- (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Codeset",
-- "TAO_Codeset",
-+ "libTAO_Codeset-2.0.3.so",
- "_make_TAO_Codeset_Manager_Factory",
- ""));
- if (result != 0)
---- a/TAO/tests/TransportCurrent/Framework/simple.cpp
-+++ b/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",
- "_make_TAO_Transport_Current_Loader",
- ""));
- ACE_ASSERT (ret == 0);
diff -Nru ace-6.0.3/debian/patches/reduce-doxygen-doc.diff ace-6.0.3+dfsg/debian/patches/reduce-doxygen-doc.diff
--- ace-6.0.3/debian/patches/reduce-doxygen-doc.diff 2011-09-10 11:50:59.000000000 +0200
+++ ace-6.0.3+dfsg/debian/patches/reduce-doxygen-doc.diff 2013-01-23 21:05:20.000000000 +0100
@@ -1,989 +1,3 @@
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -163,5 +165,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -162,5 +164,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -166,5 +168,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -162,5 +164,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -167,5 +169,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -163,5 +165,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -173,5 +175,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -164,5 +166,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -166,5 +168,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -162,5 +164,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -161,5 +163,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -163,5 +165,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -165,5 +167,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -164,5 +166,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -162,5 +164,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -162,5 +164,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -163,5 +165,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -163,5 +165,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -166,5 +168,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -163,5 +165,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -163,5 +165,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -173,5 +175,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -163,5 +165,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -168,5 +170,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -161,5 +163,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -169,5 +171,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -166,5 +168,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -164,5 +166,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
---- 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
- CLASS_GRAPH = YES
--COLLABORATION_GRAPH = YES
-+COLLABORATION_GRAPH = NO
- INCLUDE_GRAPH = NO
- INCLUDED_BY_GRAPH = NO
- GRAPHICAL_HIERARCHY = YES
--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
- # found. If left blank, it is assumed the dot tool can be found on the path.
-@@ -164,5 +166,5 @@
- # Configuration::additions related to the search engine
- #---------------------------------------------------------------------------
-
--SEARCHENGINE = YES
-+SEARCHENGINE = NO
-
--- pkg-ace.orig/etc/ace.doxygen
+++ pkg-ace/etc/ace.doxygen
@@ -89,7 +89,7 @@
diff -Nru ace-6.0.3/debian/patches/series ace-6.0.3+dfsg/debian/patches/series
--- ace-6.0.3/debian/patches/series 2011-09-10 11:50:59.000000000 +0200
+++ ace-6.0.3+dfsg/debian/patches/series 2013-01-23 21:07:20.000000000 +0100
@@ -3,7 +3,6 @@
15-fix-lzo-flags.diff
16-ace-inet-pkgconfig-files.diff
20-versioned_libs.diff
-34-bts386713.diff
35_disable_sslv2.diff
90-patch-mpc-basedir.diff
91-patch-dg-basedir.diff
diff -Nru ace-6.0.3/debian/rules ace-6.0.3+dfsg/debian/rules
--- ace-6.0.3/debian/rules 2012-03-28 22:55:41.000000000 +0200
+++ ace-6.0.3+dfsg/debian/rules 2013-01-23 21:01:00.000000000 +0100
@@ -11,15 +11,6 @@
INSTALL_FLAGS := DESTDIR=$(CURDIR)/debian/tmp INSTALL_PREFIX=/usr install_rpath=0 $(DSO_MAKE_FLAG)
MAN1 := debian/ace_netsvcs.1 \
- debian/tao_catior.1 \
- debian/tao_nslist.1 \
- debian/tao_nsadd.1 \
- debian/tao_nsdel.1 \
- debian/tao_tls_basic.1 \
- debian/tao_tls_event.1 \
- debian/tao_tls_notify.1 \
- debian/tao_tls_rtevent.1 \
- debian/TAO_ORB_Options.1 \
debian/mpc-ace.1
# Where we install every file before calling dh_install
DT := debian/tmp
@@ -30,12 +21,10 @@
# Package names, used when overriding dh_installchangelogs
ALL_PACKAGES := $(shell dh_listpackages)
-ALL_TAO := $(filter tao% libtao%,$(ALL_PACKAGES))
ALL_ACEXML := $(filter libacexml%,$(ALL_PACKAGES))
export ACE_ROOT := $(shell pwd)
export MPC_ROOT := $(ACE_ROOT)/MPC
-export TAO_ROOT := $(ACE_ROOT)/TAO
export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib
export QTDIR := /usr/share/qt4
@@ -52,17 +41,13 @@
cp debian/default.features $(ACE_ROOT)/bin/MakeProjectCreator/config
cp debian/ACE-DPKG.mwc $(ACE_ROOT)
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
touch $@
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
@@ -71,22 +56,16 @@
mkdir -p $$(dirname $$g) ; \
mv $$f $$g ; \
done
-# We provide scripts replacement for tao_idl and tao_ifr; they
-# automatically define ACE_ROOT and TAO_ROOT
- mkdir -p $(DT)/usr/lib/ace/TAO
- 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_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 $(ACE_ROOT)/ACE-DPKG.mwc
rm -f debian/*.1 debian/mpc-ace.sgml
rm -f *-stamp
# Remove stubs that get generated during TAO compilation but for some reason
@@ -94,7 +73,7 @@
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
+ rm -Rf $(ACE_ROOT)/html/libace-doc $(ACE_ROOT)/html/libacexml-doc
override_dh_compress:
dh_compress -Xexamples
@@ -107,17 +86,11 @@
override_dh_installchangelogs:
dh_installchangelogs -pace-gperf -pgperf-ace apps/gperf/ChangeLog
dh_installchangelogs -pmpc-ace MPC/ChangeLog
- dh_installchangelogs $(addprefix -p,$(ALL_TAO)) TAO/ChangeLog
dh_installchangelogs $(addprefix -p,$(ALL_ACEXML)) ACEXML/ChangeLog
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)))
+ifneq (,$(filter libace-doc, $(shell dh_listpackages)))
find debian -name '*.pl' | xargs -r sed -i -e '1i#!/usr/bin/perl'
endif
dh_fixperms
Attachment:
signature.asc
Description: Digital signature