[Pkg-ace-commits] [pkg-ace] r673 - in trunk/debian: . patches

Thomas Girard tgg at alioth.debian.org
Wed May 12 21:53:19 UTC 2010


Author: tgg
Date: 2010-05-12 21:53:19 +0000 (Wed, 12 May 2010)
New Revision: 673

Added:
   trunk/debian/patches/16-rename-tao-programs.dpatch
   trunk/debian/tao-cosconcurrency.docs
   trunk/debian/tao-cosconcurrency.install
   trunk/debian/tao-cosevent.docs
   trunk/debian/tao-cosevent.install
   trunk/debian/tao-coslifecycle.install
   trunk/debian/tao-cosnaming.docs
   trunk/debian/tao-cosnaming.install
   trunk/debian/tao-cosnotification.docs
   trunk/debian/tao-cosnotification.install
   trunk/debian/tao-costime.docs
   trunk/debian/tao-costime.install
   trunk/debian/tao-costrading.docs
   trunk/debian/tao-costrading.install
Removed:
   trunk/debian/tao-concurrency.docs
   trunk/debian/tao-concurrency.install
   trunk/debian/tao-event.docs
   trunk/debian/tao-event.install
   trunk/debian/tao-lifecycle.install
   trunk/debian/tao-naming.docs
   trunk/debian/tao-naming.install
   trunk/debian/tao-notify.docs
   trunk/debian/tao-notify.install
   trunk/debian/tao-time.docs
   trunk/debian/tao-time.install
   trunk/debian/tao-trading.docs
   trunk/debian/tao-trading.install
Modified:
   trunk/debian/control
   trunk/debian/patches/00list
   trunk/debian/rules
   trunk/debian/tao-rtevent.install
Log:
Rename package and binaries + provide transitional packages


Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/control	2010-05-12 21:53:19 UTC (rev 673)
@@ -140,9 +140,10 @@
  This package contains the header files and static library for the ACE
  HTBP library.
 
-Package: gperf-ace
+Package: ace-gperf
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: gperf-ace (<< 5.7.7-1)
 Description: ACE perfect hash function generator
  ace_gperf is the ACE version of gperf.
  .
@@ -150,6 +151,14 @@
  basically the same options and functionality. ace_gperf simply takes
  advantage of the some of the features provided by the ACE library.
 
+Package: gperf-ace
+Architecture: all
+Depends: ace-gperf
+Description: ACE perfect hash function generator (transitional package)
+ This package is a transitional package to ace-gperf.
+ .
+ It can be safely removed after installation.
+
 Package: libacexml-5.7.7
 Architecture: any
 Section: libs
@@ -480,18 +489,18 @@
 Package: tao-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: tao-naming
+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 IOR.
  .
  The following programs are included:
-  * tao-nslist, to list naming context and object bindings
-  * tao-nsadd, to create bindings
-  * tao-nsdel, to remove bindings
-  * tao-catior, to dump the content of an Interoperable Object Reference
+  * tao_nslist, to list naming context and object bindings
+  * tao_nsadd, to create bindings
+  * tao_nsdel, to remove bindings
+  * tao_catior, to dump the content of an Interoperable Object Reference
 
-Package: tao-naming
+Package: tao-cosnaming
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: tao-utils
@@ -501,8 +510,19 @@
  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-trading
+Package: tao-naming
+Architecture: all
+Depends: tao-cosnaming
+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}
 Description: TAO trading service
@@ -511,8 +531,19 @@
  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-event
+Package: tao-trading
+Architecture: all
+Depends: tao-costrading
+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}
 Description: TAO event service
@@ -522,7 +553,18 @@
  .
  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
+Depends: tao-cosevent
+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}
@@ -532,6 +574,9 @@
  .
  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
@@ -545,7 +590,7 @@
   * ftrtec_factory_service, spawning ftrt_eventservice processes
   * ftrtec_gateway_service, relaying events to FT CORBA unaware clients
 
-Package: tao-notify
+Package: tao-cosnotification
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO notification service
@@ -555,7 +600,18 @@
  The notification service adds:
   * quality of service control on reliability and speed
   * event filtering
+ .
+ This package contains:
+  * tao_cosnotification
 
+Package: tao-notify
+Architecture: all
+Depends: tao-cosnotification
+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}
@@ -567,18 +623,28 @@
   * LoadManager, that distributes loads across objects
   * LoadMonitor, that monitors and reports loads to a manager
 
-Package: tao-log
+Package: tao-tls
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: tao-log (<< 5.7.7-1)
+Replaces: tao-log (<< 5.7.7-1)
 Description: TAO telecom log services
  TAO implementations of CORBA telecom log service.
  .
  Four separate services are provided:
-  * Basic_Logging_Service
-  * Event_Logging_Service
-  * Notify_Logging_Service
-  * RTEvent_Logging_Service
+  * tao_tls_basic
+  * tao_tls_event
+  * tao_tls_notify
+  * tao_tls_rtevent
 
+Package: tao-log
+Architecture: all
+Depends: tao-tls
+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}
@@ -589,7 +655,7 @@
   * Scheduling_Service
   * Dump_Schedule
 
-Package: tao-concurrency
+Package: tao-cosconcurrency
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO concurrency service
@@ -598,7 +664,15 @@
  .
  TAO version does not support transactions.
 
-Package: tao-lifecycle
+Package: tao-concurrency
+Architecture: all
+Depends: tao-cosconcurrency
+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}
 Description: TAO lifecycle service
@@ -607,18 +681,34 @@
  .
  This package contains the TAO implementation of such service.
 
-Package: tao-time
+Package: tao-lifecycle
+Architecture: all
+Depends: tao-coslifecycle
+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}
 Description: TAO time service
  A time service offers globally synchronized time to clients.
  .
  This package contains two programs:
-  * Time_Service_Clerk, answering client requests
-  * Time_Service_Server, queried by clerks to keep their time
+  * tao_costime_clerk, answering client requests
+  * tao_costime_server, queried by clerks to keep their time
     synchronized
 
-Package: netsvcs-ace
+Package: tao-time
+Architecture: all
+Depends: tao-costime
+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}
 Description: ACE network service implementations
@@ -652,4 +742,3 @@
  .
  This package contains header files and static library for the ACE
  network services library.
-

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/patches/00list	2010-05-12 21:53:19 UTC (rev 673)
@@ -3,6 +3,7 @@
 11-promote-QtResource-to-qt4.dpatch
 14-fix-tcl-flags.dpatch
 15-fix-lzo-flags.dpatch
+16-rename-tao-programs.dpatch
 19-gcc43
 20-versioned_libs.dpatch
 24-add-missing-headers

Added: trunk/debian/patches/16-rename-tao-programs.dpatch
===================================================================
--- trunk/debian/patches/16-rename-tao-programs.dpatch	                        (rev 0)
+++ trunk/debian/patches/16-rename-tao-programs.dpatch	2010-05-12 21:53:19 UTC (rev 673)
@@ -0,0 +1,121 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 16-rename-tao-programs.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## DP: make tao program names quite similar.
+
+ at DPATCH@
+--- ACE_wrappers/TAO/orbsvcs/Event_Service/Event_Service.mpc-	2009-10-20 14:10:53.000000000 +0200
++++ ACE_wrappers/TAO/orbsvcs/Event_Service/Event_Service.mpc	2010-05-12 23:38:30.548383762 +0200
+@@ -2,5 +2,5 @@
+ // $Id: Event_Service.mpc 87176 2009-10-20 12:10:53Z johnnyw $
+ 
+ project : orbsvcsexe, install, rtevent_serv, rtschedevent, bidir_giop, svc_utils {
+-  exename  = Event_Service
++  exename  = tao_rtevent
+ }
+--- ACE_wrappers/TAO/orbsvcs/Time_Service/Time_Service.mpc-	2008-09-23 23:50:40.000000000 +0200
++++ ACE_wrappers/TAO/orbsvcs/Time_Service/Time_Service.mpc	2010-05-12 23:35:55.165781003 +0200
+@@ -2,7 +2,7 @@
+ // $Id: Time_Service.mpc 82815 2008-09-23 21:50:40Z jtc $
+ 
+ project(Time_Service_Server) : orbsvcsexe, install, time_serv, naming, utils, avoids_corba_e_micro {
+-  exename  = Time_Service_Server
++  exename  = tao_costime_server
+   Source_Files {
+     Server_i.cpp
+     Time_Service_Server.cpp
+@@ -10,7 +10,7 @@
+ }
+ 
+ project(Time_Service_Clerk) : orbsvcsexe, install, time_serv, naming, utils, avoids_corba_e_micro {
+-  exename  = Time_Service_Clerk
++  exename  = tao_costime_clerk
+   Source_Files {
+     Clerk_i.cpp
+     Time_Service_Clerk.cpp
+--- ACE_wrappers/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc-	2007-01-03 17:08:20.000000000 +0100
++++ ACE_wrappers/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc	2010-05-12 23:41:39.960399745 +0200
+@@ -1,5 +1,5 @@
+ // $Id: Event_Logging_Service.mpc 76300 2007-01-03 16:08:20Z elliott_c $
+ 
+ project: namingexe, iortable, install, dseventlogadmin_serv, valuetype {
+-  exename   = Event_Logging_Service
++  exename   = tao_tls_event
+ }
+--- ACE_wrappers/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc-	2007-01-03 17:08:20.000000000 +0100
++++ ACE_wrappers/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc	2010-05-12 23:42:38.236383274 +0200
+@@ -1,5 +1,5 @@
+ // $Id: RTEvent_Logging_Service.mpc 76300 2007-01-03 16:08:20Z elliott_c $
+ 
+ project: namingexe, iortable, install, rteventlogadmin_serv, valuetype {
+-  exename   = RTEvent_Logging_Service
++  exename   = tao_tls_rtevent
+ }
+--- ACE_wrappers/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc-	2007-01-03 17:08:20.000000000 +0100
++++ ACE_wrappers/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc	2010-05-12 23:40:57.948383480 +0200
+@@ -1,5 +1,5 @@
+ // $Id: Basic_Logging_Service.mpc 76300 2007-01-03 16:08:20Z elliott_c $
+ 
+ project: namingexe, iortable, install, dslogadmin_serv, valuetype {
+-  exename   = Basic_Logging_Service
++  exename   = tao_tls_basic
+ }
+--- ACE_wrappers/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc-	2007-01-03 17:08:20.000000000 +0100
++++ ACE_wrappers/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc	2010-05-12 23:42:10.168382105 +0200
+@@ -1,5 +1,5 @@
+ // $Id: Notify_Logging_Service.mpc 76300 2007-01-03 16:08:20Z elliott_c $
+ 
+ project: namingexe, iortable, install, dsnotifylogadmin_serv, valuetype {
+-  exename   = Notify_Logging_Service
++  exename   = tao_tls_notify
+ }
+--- ACE_wrappers/TAO/orbsvcs/Naming_Service/Naming_Service.mpc-	2009-10-19 14:18:00.000000000 +0200
++++ ACE_wrappers/TAO/orbsvcs/Naming_Service/Naming_Service.mpc	2010-05-12 23:37:10.200383656 +0200
+@@ -2,7 +2,7 @@
+ // $Id: Naming_Service.mpc 87156 2009-10-19 12:18:00Z johnnyw $
+ 
+ project : orbsvcsexe, install, naming_serv, imr_client, svc_utils {
+-  exename  = Naming_Service
++  exename  = tao_cosnaming
+   Source_Files {
+     Naming_Server.cpp
+     Naming_Service.cpp
+--- ACE_wrappers/TAO/orbsvcs/Trading_Service/Trading_Service.mpc-	2007-01-03 17:08:20.000000000 +0100
++++ ACE_wrappers/TAO/orbsvcs/Trading_Service/Trading_Service.mpc	2010-05-12 23:36:36.917383940 +0200
+@@ -2,6 +2,6 @@
+ // $Id: Trading_Service.mpc 76300 2007-01-03 16:08:20Z elliott_c $
+ 
+ project : orbsvcsexe, utils, install, naming, trading_serv {
+-  exename  = Trading_Service
++  exename  = tao_costrading
+ }
+ 
+--- ACE_wrappers/TAO/orbsvcs/Notify_Service/Notify_Service.mpc-	2009-10-29 00:29:32.000000000 +0100
++++ ACE_wrappers/TAO/orbsvcs/Notify_Service/Notify_Service.mpc	2010-05-12 23:39:53.260409652 +0200
+@@ -14,7 +14,7 @@
+ }
+ 
+ project(Notify_Service) : orbsvcsexe, install, tao_notify_service, notify_monitor_control {
+-  exename  = Notify_Service
++  exename  = tao_cosnotification
+   Source_Files {
+     Notify_Server.cpp
+   }
+--- ACE_wrappers/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc-	2009-10-20 14:10:53.000000000 +0200
++++ ACE_wrappers/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc	2010-05-12 23:13:25.228530177 +0200
+@@ -2,5 +2,5 @@
+ // $Id: Concurrency_Service.mpc 87176 2009-10-20 12:10:53Z johnnyw $
+ 
+ project : orbsvcsexe, install, concurrency_serv, naming, utils, svc_utils {
+-  exename  = Concurrency_Service
++  exename  = tao_cosconcurrency
+ }
+--- ACE_wrappers/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc-	2007-01-03 17:08:20.000000000 +0100
++++ ACE_wrappers/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc	2010-05-12 23:12:44.184952436 +0200
+@@ -2,5 +2,5 @@
+ // $Id: CosEvent_Service.mpc 76300 2007-01-03 16:08:20Z elliott_c $
+ 
+ project : orbsvcsexe, install, naming, event_serv, svc_utils, iortable, messaging_optional, portableserver {
+-  exename  = CosEvent_Service
++  exename  = tao_cosevent
+ }

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/rules	2010-05-12 21:53:19 UTC (rev 673)
@@ -4,22 +4,21 @@
 # written February 2002 by Ossama Othman <ossama at debian.org>
 # Modified August 2003 by Brian Nelson <pyro at debian.org>
 # Copyright (C) 2004  Raphael Bossek <bossekr at debian.org>
-# Copyright © 2005-20010 Thomas Girard <thomas.g.girard at free.fr>
+# Copyright © 2005-2010 Thomas Girard <thomas.g.girard at free.fr>
 
 INSTALL := install -o root -g root
 INSTALL_755 := $(INSTALL) -m 755
 ACE_SUBDIR := ACE_wrappers
 ACE_ARCHIVE := $(shell ls -1 ACE+TAO+CIAO-src-*.tar.bz2 2>/dev/null || echo ace-archive-missing)
 MWCFLAGS := -type gnuace -features "ssl=1,zlib=1,zzip=1,xt=1,tk=1,fl=1,fox=1,qt4=1,exceptions=1,ace_qt4reactor=1,bzip2=1,lzo1=1,ipv6=1" -noreldefs -genins
-ACE_MAKE_FLAGS := ssl=1 zlib=1 zzip=1 xt=1 tk=1 fl=1 fox=1 qt4=1 debug=0 inline=1 optimize=1 exceptions=1 ace_qt4reactor=1 bzip2=1 lzo1=1 ipv6=1
-PRJ_INSTALL_FLAGS := -k -s man_files,lib_output,header_files,inline_files,exe_output,idl_files,pidl_files,template_files  -b lib_output=usr/lib -b exe_output=usr/bin -b idl_files=usr/include -b pidl_files=usr/include -b template_files=usr/include -b header_files=usr/include -b inline_files=usr/include -b idl_files=usr/include -b man_files=usr/share/man
+ACE_MAKE_FLAGS := ssl=1 zlib=1 zzip=1 xt=1 tk=1 fl=1 fox=1 qt4=1 debug=0 inline=1 optimize=1 exceptions=1 ace_qt4reactor=1 bzip2=1 lzo1=1 ipv6=1 versioned_so=2
+PRJ_INSTALL_FLAGS := -k -s man_files,lib_output,header_files,inline_files,exe_output,idl_files,pidl_files,template_files  -o lib_output=usr/lib -o exe_output=usr/bin -b idl_files=usr/include -b pidl_files=usr/include -b template_files=usr/include -b header_files=usr/include -b inline_files=usr/include -b idl_files=usr/include -b man_files=usr/share/man
 MAN1 := debian/Basic_Logging_Service.1 \
 	debian/Event_Logging_Service.1 \
 	debian/Notify_Logging_Service.1 \
 	debian/RTEvent_Logging_Service.1 \
 	debian/TAO_ORB_Options.1 \
 	debian/mpc-ace.1
-MAN5 :=
 # Where we install every file before calling dh_install
 DT := debian/tmp
 
@@ -41,17 +40,16 @@
 PREPATCH_MARK := 50-prepatch-dummy-mark.dpatch
 UNTIL := $(PREPATCH_MARK)
 
-.NOTPARALLEL: debian/mpc-ace.sgml debian/%.1 debian/%.5 prepatch extract doxygen clean install build binary-indep binary-arch binary
-.PHONY: doxygen patch prepatch extract build clean binary-indep binary-arch binary install unpatch source diff
+.NOTPARALLEL: debian/mpc-ace.sgml debian/%.1 prepatch extract doxygen clean install build binary-indep binary-arch binary
+.PHONY: doxygen patch prepatch extract build clean binary-indep binary-arch binary install source diff configure
 
+extract: extract-stamp
 extract-stamp: $(ACE_ARCHIVE)
 	tar -xjf $<
 	cp debian/platform_macros.GNU $(ACE_ROOT)/include/makeinclude
 	cp debian/config.h $(ACE_ROOT)/ace/config.h
 	touch $@
 
-extract: extract-stamp
-
 debian/mpc-ace.sgml: ACE_wrappers/MPC/docs/MPC.sgml
 	sed -e 's/mpc\.pl/mpc-ace/g' -e 's/mwc\.pl/mwc-ace/g' $< > $@
 
@@ -59,57 +57,52 @@
 	docbook-to-man $< > $@
 
 # Prepare a ACE_wrappers directory where most of the patches are applied.
+prepatch: prepatch-stamp
 prepatch-stamp: extract-stamp
 	dpatch apply-until $(UNTIL)
+	touch $@
 
+configure: configure-stamp
+configure-stamp: prepatch-stamp
 	cp debian/ACE-DPKG.mwc $(ACE_ROOT)
 	cd $(ACE_ROOT) &&  ./bin/mwc.pl $(MWCFLAGS) ACE-DPKG.mwc
 	cp debian/TAO-DPKG.mwc $(TAO_ROOT)
 	cd $(TAO_ROOT) &&  ./../bin/mwc.pl $(MWCFLAGS) TAO-DPKG.mwc
 	touch $@
 
-prepatch: prepatch-stamp
-
 pl-stamp: prepatch-stamp
 	for fn in `find "$(ACE_ROOT)" -name "*.pl"`; do (echo '#!/usr/bin/perl'; cat "$$fn") > "$${fn}T"; mv "$${fn}T" "$$fn"; chmod a+x "$$fn"; done
 	touch $@
 
-patch-stamp: prepatch-stamp build
+patch: patch-stamp
+patch-stamp: configure-stamp
 	dpatch apply-all
 	touch $@
 
-patch: patch-stamp
-
-unpatch: patch-stamp
-	dpatch unpatch
-	rm -f $<
-
-build: build-stamp manpages-stamp
-
-manpages-stamp: $(MAN1) $(MAN5)
-	touch $@
-
-doxygen-stamp: extract build
+doxygen: doxygen-stamp
+doxygen-stamp: build-stamp
 	cd $(ACE_ROOT) && bin/generate_doxygen.pl -is_release
-	find $(ACE_ROOT)/html/ace $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f
-	find $(ACE_ROOT)/html/tao $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f
+	#find $(ACE_ROOT)/html/ace $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f
+	#find $(ACE_ROOT)/html/tao $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f
 	touch $@
 
-doxygen: doxygen-stamp
-
-build-stamp: pl-stamp prepatch-stamp
+build: build-stamp manpages-stamp
+build-stamp: pl-stamp patch-stamp
 	dh_testdir
 	cd $(ACE_ROOT) && $(MAKE) $(ACE_MAKE_FLAGS)
 	cd $(TAO_ROOT) && $(MAKE) $(ACE_MAKE_FLAGS)
 #       2nd-pass MPC generation is a quick bugfix related with write_install_files at MPC/modules/ProjectCreator.pm
-	echo 2nd-pass MPC generation
-	cd $(ACE_ROOT) &&  ./bin/mwc.pl $(MWCFLAGS) ACE-DPKG.mwc
-	cd $(TAO_ROOT) &&  ./../bin/mwc.pl $(MWCFLAGS) TAO-DPKG.mwc
+#	echo 2nd-pass MPC generation
+#	cd $(ACE_ROOT) &&  ./bin/mwc.pl $(MWCFLAGS) ACE-DPKG.mwc
+#	cd $(TAO_ROOT) &&  ./../bin/mwc.pl $(MWCFLAGS) TAO-DPKG.mwc
 	touch $@
 
+manpages-stamp: $(MAN1)
+	touch $@
+
 clean:
 	dh_testdir
-	rm -rf $(ACE_SUBDIR) debian/patched $(MAN1) $(MAN5) *-stamp debian/mpc-ace.sgml
+	rm -rf $(ACE_SUBDIR) debian/patched $(MAN1) *-stamp debian/mpc-ace.sgml
 	dh_clean
 
 install: build
@@ -128,23 +121,17 @@
 #	Install TAO files in $(CURDIR)/$(DT)
 	cd $(TAO_ROOT) && ../MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) tao 
 	cd $(TAO_ROOT) && ../MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) orbsvcs
-	cd $(TAO_ROOT) && ../MPC/prj_install.pl -k -s man_files,exe_output,lib_output  -b exe_output=usr/bin -b man_files=usr/share/man -b lib_output=usr/lib  $(CURDIR)/$(DT) TAO_IDL
+	cd $(TAO_ROOT) && ../MPC/prj_install.pl -k -s man_files,exe_output,lib_output  -o exe_output=usr/bin -b man_files=usr/share/man -o lib_output=usr/lib  $(CURDIR)/$(DT) TAO_IDL
 	cd $(TAO_ROOT) && ../MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) utils
 
 
 #	Install netsvcs files in $(CURDIR)/$(DT)
-	cd $(ACE_ROOT) && ./MPC/prj_install.pl -k -s man_files,exe_output,lib_output -b exe_output=usr/bin -b man_files=usr/share/man -b lib_output=usr/lib $(CURDIR)/$(DT) netsvcs
+	cd $(ACE_ROOT) && ./MPC/prj_install.pl -k -s man_files,exe_output,lib_output -o exe_output=usr/bin -b man_files=usr/share/man -o lib_output=usr/lib $(CURDIR)/$(DT) netsvcs
 	cd $(ACE_ROOT)/netsvcs/lib && ../../MPC/prj_install.pl -k -s header_files,inline_files,template_files  -b template_files=usr/include/netsvcs -b header_files=usr/include/netsvcs -b inline_files=usr/include/netsvcs $(CURDIR)/$(DT) .
 	cd $(ACE_ROOT)/netsvcs/servers && ../../MPC/prj_install.pl -k -s svc_conf_files -b svc_conf_files=usr/share/ace-netsvcs $(CURDIR)/$(DT) .
 
-#	Move libraries and excutable to lib and bin, then remove subdirectories
-	cd $(CURDIR)/$(DT)/usr/bin &&  find . -executable -a -type f -exec mv {} . ';' && find . -type d -delete
-	cd $(CURDIR)/$(DT)/usr/lib &&  find . -type f -exec mv {} . ';' && find . -type d -delete
-
 #	Create .so links instead of copies
-	cd $(CURDIR)/$(DT)/usr/lib && find . -iname '*.so' -exec echo ln -sf {}.* {} ';' | sh
-#	Fixup a missing symlink
-	cd $(CURDIR)/$(DT)/usr/lib && ln -sf libTAO_LzoCompressor.so.* libTAO_LzoCompressor.so
+	cd $(CURDIR)/$(DT)/usr/lib && for f in $$(find -name 'lib*-*.so' -print) ; do ln -sf $${f#./*} $${f%%-*}.so ; done
 
 #	Change man1 files location
 	mkdir -p $(CURDIR)/$(DT)/usr/share/man/man1
@@ -184,9 +171,9 @@
 	dh_testroot -a
 	dh_installdocs -a -A
 	dh_installman -a
-	dh_installinfo -pgperf-ace $(ACE_ROOT)/apps/gperf/ace_gperf.info
+	dh_installinfo -pace-gperf $(ACE_ROOT)/apps/gperf/ace_gperf.info
 	dh_installchangelogs -a $(ACE_ROOT)/ChangeLog
-	dh_installchangelogs -pgperf-ace $(ACE_ROOT)/apps/gperf/ChangeLog
+	dh_installchangelogs -pace-gperf $(ACE_ROOT)/apps/gperf/ChangeLog
 	dh_strip -a
 	dh_link -a
 	dh_compress -a

Deleted: trunk/debian/tao-concurrency.docs
===================================================================
--- trunk/debian/tao-concurrency.docs	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/tao-concurrency.docs	2010-05-12 21:53:19 UTC (rev 673)
@@ -1 +0,0 @@
-ACE_wrappers/TAO/orbsvcs/Concurrency_Service/README

Deleted: trunk/debian/tao-concurrency.install
===================================================================
--- trunk/debian/tao-concurrency.install	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/tao-concurrency.install	2010-05-12 21:53:19 UTC (rev 673)
@@ -1 +0,0 @@
-usr/bin/Concurrency_Service

Copied: trunk/debian/tao-cosconcurrency.docs (from rev 650, trunk/debian/tao-concurrency.docs)
===================================================================
--- trunk/debian/tao-cosconcurrency.docs	                        (rev 0)
+++ trunk/debian/tao-cosconcurrency.docs	2010-05-12 21:53:19 UTC (rev 673)
@@ -0,0 +1 @@
+ACE_wrappers/TAO/orbsvcs/Concurrency_Service/README

Copied: trunk/debian/tao-cosconcurrency.install (from rev 650, trunk/debian/tao-concurrency.install)
===================================================================
--- trunk/debian/tao-cosconcurrency.install	                        (rev 0)
+++ trunk/debian/tao-cosconcurrency.install	2010-05-12 21:53:19 UTC (rev 673)
@@ -0,0 +1 @@
+usr/bin/tao_cosconcurrency

Copied: trunk/debian/tao-cosevent.docs (from rev 650, trunk/debian/tao-event.docs)
===================================================================
--- trunk/debian/tao-cosevent.docs	                        (rev 0)
+++ trunk/debian/tao-cosevent.docs	2010-05-12 21:53:19 UTC (rev 673)
@@ -0,0 +1 @@
+ACE_wrappers/TAO/orbsvcs/CosEvent_Service/README

Copied: trunk/debian/tao-cosevent.install (from rev 650, trunk/debian/tao-event.install)
===================================================================
--- trunk/debian/tao-cosevent.install	                        (rev 0)
+++ trunk/debian/tao-cosevent.install	2010-05-12 21:53:19 UTC (rev 673)
@@ -0,0 +1 @@
+usr/bin/tao_cosevent

Copied: trunk/debian/tao-coslifecycle.install (from rev 650, trunk/debian/tao-lifecycle.install)
===================================================================
--- trunk/debian/tao-coslifecycle.install	                        (rev 0)
+++ trunk/debian/tao-coslifecycle.install	2010-05-12 21:53:19 UTC (rev 673)
@@ -0,0 +1 @@
+usr/bin/tao_coslifecycle

Copied: trunk/debian/tao-cosnaming.docs (from rev 650, trunk/debian/tao-naming.docs)
===================================================================
--- trunk/debian/tao-cosnaming.docs	                        (rev 0)
+++ trunk/debian/tao-cosnaming.docs	2010-05-12 21:53:19 UTC (rev 673)
@@ -0,0 +1 @@
+ACE_wrappers/TAO/orbsvcs/Naming_Service/README

Copied: trunk/debian/tao-cosnaming.install (from rev 650, trunk/debian/tao-naming.install)
===================================================================
--- trunk/debian/tao-cosnaming.install	                        (rev 0)
+++ trunk/debian/tao-cosnaming.install	2010-05-12 21:53:19 UTC (rev 673)
@@ -0,0 +1 @@
+usr/bin/tao_cosnaming

Copied: trunk/debian/tao-cosnotification.docs (from rev 650, trunk/debian/tao-notify.docs)
===================================================================
--- trunk/debian/tao-cosnotification.docs	                        (rev 0)
+++ trunk/debian/tao-cosnotification.docs	2010-05-12 21:53:19 UTC (rev 673)
@@ -0,0 +1 @@
+ACE_wrappers/TAO/orbsvcs/Notify_Service/README

Copied: trunk/debian/tao-cosnotification.install (from rev 650, trunk/debian/tao-notify.install)
===================================================================
--- trunk/debian/tao-cosnotification.install	                        (rev 0)
+++ trunk/debian/tao-cosnotification.install	2010-05-12 21:53:19 UTC (rev 673)
@@ -0,0 +1 @@
+usr/bin/tao_cosnotification

Copied: trunk/debian/tao-costime.docs (from rev 650, trunk/debian/tao-time.docs)
===================================================================
--- trunk/debian/tao-costime.docs	                        (rev 0)
+++ trunk/debian/tao-costime.docs	2010-05-12 21:53:19 UTC (rev 673)
@@ -0,0 +1 @@
+ACE_wrappers/TAO/orbsvcs/Time_Service/README

Copied: trunk/debian/tao-costime.install (from rev 650, trunk/debian/tao-time.install)
===================================================================
--- trunk/debian/tao-costime.install	                        (rev 0)
+++ trunk/debian/tao-costime.install	2010-05-12 21:53:19 UTC (rev 673)
@@ -0,0 +1,2 @@
+usr/bin/tao_costime_clerk
+usr/bin/tao_costime_server

Copied: trunk/debian/tao-costrading.docs (from rev 650, trunk/debian/tao-trading.docs)
===================================================================
--- trunk/debian/tao-costrading.docs	                        (rev 0)
+++ trunk/debian/tao-costrading.docs	2010-05-12 21:53:19 UTC (rev 673)
@@ -0,0 +1 @@
+ACE_wrappers/TAO/orbsvcs/Trading_Service/README

Copied: trunk/debian/tao-costrading.install (from rev 650, trunk/debian/tao-trading.install)
===================================================================
--- trunk/debian/tao-costrading.install	                        (rev 0)
+++ trunk/debian/tao-costrading.install	2010-05-12 21:53:19 UTC (rev 673)
@@ -0,0 +1 @@
+usr/bin/tao_costrading

Deleted: trunk/debian/tao-event.docs
===================================================================
--- trunk/debian/tao-event.docs	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/tao-event.docs	2010-05-12 21:53:19 UTC (rev 673)
@@ -1 +0,0 @@
-ACE_wrappers/TAO/orbsvcs/CosEvent_Service/README

Deleted: trunk/debian/tao-event.install
===================================================================
--- trunk/debian/tao-event.install	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/tao-event.install	2010-05-12 21:53:19 UTC (rev 673)
@@ -1 +0,0 @@
-usr/bin/CosEvent_Service

Deleted: trunk/debian/tao-lifecycle.install
===================================================================
--- trunk/debian/tao-lifecycle.install	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/tao-lifecycle.install	2010-05-12 21:53:19 UTC (rev 673)
@@ -1 +0,0 @@
-usr/bin/LifeCycle_Service

Deleted: trunk/debian/tao-naming.docs
===================================================================
--- trunk/debian/tao-naming.docs	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/tao-naming.docs	2010-05-12 21:53:19 UTC (rev 673)
@@ -1 +0,0 @@
-ACE_wrappers/TAO/orbsvcs/Naming_Service/README

Deleted: trunk/debian/tao-naming.install
===================================================================
--- trunk/debian/tao-naming.install	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/tao-naming.install	2010-05-12 21:53:19 UTC (rev 673)
@@ -1 +0,0 @@
-usr/bin/Naming_Service

Deleted: trunk/debian/tao-notify.docs
===================================================================
--- trunk/debian/tao-notify.docs	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/tao-notify.docs	2010-05-12 21:53:19 UTC (rev 673)
@@ -1 +0,0 @@
-ACE_wrappers/TAO/orbsvcs/Notify_Service/README

Deleted: trunk/debian/tao-notify.install
===================================================================
--- trunk/debian/tao-notify.install	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/tao-notify.install	2010-05-12 21:53:19 UTC (rev 673)
@@ -1 +0,0 @@
-usr/bin/Notify_Service

Modified: trunk/debian/tao-rtevent.install
===================================================================
--- trunk/debian/tao-rtevent.install	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/tao-rtevent.install	2010-05-12 21:53:19 UTC (rev 673)
@@ -1 +1 @@
-usr/bin/Event_Service
+usr/bin/tao_rtevent

Deleted: trunk/debian/tao-time.docs
===================================================================
--- trunk/debian/tao-time.docs	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/tao-time.docs	2010-05-12 21:53:19 UTC (rev 673)
@@ -1 +0,0 @@
-ACE_wrappers/TAO/orbsvcs/Time_Service/README

Deleted: trunk/debian/tao-time.install
===================================================================
--- trunk/debian/tao-time.install	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/tao-time.install	2010-05-12 21:53:19 UTC (rev 673)
@@ -1,2 +0,0 @@
-usr/bin/Time_Service_Server
-usr/bin/Time_Service_Clerk

Deleted: trunk/debian/tao-trading.docs
===================================================================
--- trunk/debian/tao-trading.docs	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/tao-trading.docs	2010-05-12 21:53:19 UTC (rev 673)
@@ -1 +0,0 @@
-ACE_wrappers/TAO/orbsvcs/Trading_Service/README

Deleted: trunk/debian/tao-trading.install
===================================================================
--- trunk/debian/tao-trading.install	2010-05-12 21:01:58 UTC (rev 672)
+++ trunk/debian/tao-trading.install	2010-05-12 21:53:19 UTC (rev 673)
@@ -1 +0,0 @@
-usr/bin/Trading_Service




More information about the Pkg-ace-commits mailing list