[Pkg-ace-devel] r417 - in /trunk/debian: control rules tao-catior.docs tao-catior.install tao-nsutils.docs tao-nsutils.install tao-utils.docs tao-utils.install

[tgg-guest at users.alioth.debian.org]

Author: tgg-guest
Date: Tue Sep 19 18:53:09 2006
New Revision: 417

URL: http://svn.debian.org/wsvn/pkg-ace/?sc=1&rev=417
Log:
Merge tao-catior and tao-nsutils into tao-utils.

Added:
    trunk/debian/tao-utils.docs
      - copied, changed from r414, trunk/debian/tao-nsutils.docs
    trunk/debian/tao-utils.install
      - copied, changed from r414, trunk/debian/tao-nsutils.install
Removed:
    trunk/debian/tao-catior.docs
    trunk/debian/tao-catior.install
    trunk/debian/tao-nsutils.docs
    trunk/debian/tao-nsutils.install
Modified:
    trunk/debian/control
    trunk/debian/rules

Modified: trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/control?rev=417&op=diff
==============================================================================
--- trunk/debian/control (original)
+++ trunk/debian/control Tue Sep 19 18:53:09 2006
@@ -479,30 +479,21 @@
   * Fault_Notifier that receives fault reports from detectors
   * FT_ReplicationManager that manages object groups
 
-Package: tao-nsutils
+Package: tao-utils
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
 Conflicts: libtao-dev (<< 5.4.7-11)
-Description: TAO naming service utils
+Suggests: tao-naming
+Description: TAO naming service and IOR utilities
  This package includes programs to query or control a CORBA naming
- service.
+ service, and to dump an IOR.
  .
  The following programs are included:
   * nslist, to list naming context and object bindings
   * nsadd, to create bindings
   * nsdel, to remove bindings
-
-Package: tao-catior
-Architecture: any
-Section: devel
-Depends: ${shlibs:Depends}
-Conflicts: libtao-dev (<< 5.4.7-11)
-Description: TAO IOR dumper utility
- This package includes the tao-catior program.
- .
- Use this program to analyse the content of a CORBA Interoperable Object
- Reference.
+  * tao-catior, to dump the content of an Interoperable Object Reference
 
 Package: tao-naming
 Architecture: any

Modified: trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/rules?rev=417&op=diff
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Tue Sep 19 18:53:09 2006
@@ -222,6 +222,10 @@
 
 #	Rename the catior utility, it already exists in another package
 	cp $(TAO_ROOT)/utils/catior/catior $(TAO_ROOT)/utils/catior/tao-catior
+
+#       Multiple README
+	cp $(TAO_ROOT)/utils/catior/README $(TAO_ROOT)/utils/catior/README.catior
+	cp $(TAO_ROOT)/utils/nslist/README $(TAO_ROOT)/utils/catior/README.nslist
 
 #	Rename tao_idl to have a script automatically define ACE_ROOT and
 #	TAO_ROOT

Copied: trunk/debian/tao-utils.docs (from r414, trunk/debian/tao-nsutils.docs)
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/tao-utils.docs?rev=417&op=diff
==============================================================================
--- trunk/debian/tao-nsutils.docs (original)
+++ trunk/debian/tao-utils.docs Tue Sep 19 18:53:09 2006
@@ -1,1 +1,2 @@
-ACE_wrappers/TAO/utils/nslist/README
+ACE_wrappers/TAO/utils/nslist/README.catior
+ACE_wrappers/TAO/utils/catior/README.nslist

Copied: trunk/debian/tao-utils.install (from r414, trunk/debian/tao-nsutils.install)
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/tao-utils.install?rev=417&op=diff
==============================================================================
--- trunk/debian/tao-nsutils.install (original)
+++ trunk/debian/tao-utils.install Tue Sep 19 18:53:09 2006
@@ -1,1 +1,2 @@
 TAO/utils/nslist/ns{add,del,list} usr/bin
+TAO/utils/catior/tao-catior       usr/bin