summaryrefslogtreecommitdiff
path: root/ACE
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-04-22 07:53:43 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-04-22 07:53:43 +0000
commit9a27b802089b39b829d55012e786c74b5c00ce2c (patch)
tree4d3886eae9eadb570b249a7b69116501ccb36eba /ACE
parent6328a68ef94385cd3567d8a712c8a6d0fc1209a0 (diff)
downloadATCD-9a27b802089b39b829d55012e786c74b5c00ce2c.tar.gz
Thu Apr 22 07:51:42 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* Release: * bin/make_release.py: Updated because of rename * debian: * debianbuild: Renamed debianbuild to debianbuild
Diffstat (limited to 'ACE')
-rw-r--r--ACE/ChangeLog110
-rw-r--r--ACE/Release2
-rwxr-xr-xACE/bin/make_release.py16
-rw-r--r--ACE/debian/Basic_Logging_Service.sgml (renamed from ACE/debianbuild/Basic_Logging_Service.sgml)0
-rw-r--r--ACE/debian/Event_Logging_Service.sgml (renamed from ACE/debianbuild/Event_Logging_Service.sgml)0
-rw-r--r--ACE/debian/Notify_Logging_Service.sgml (renamed from ACE/debianbuild/Notify_Logging_Service.sgml)0
-rw-r--r--ACE/debian/README.Debian (renamed from ACE/debianbuild/README.Debian)0
-rw-r--r--ACE/debian/RTEvent_Logging_Service.sgml (renamed from ACE/debianbuild/RTEvent_Logging_Service.sgml)0
-rw-r--r--ACE/debian/TAO_ORB_Options.sgml (renamed from ACE/debianbuild/TAO_ORB_Options.sgml)0
-rw-r--r--ACE/debian/TODO (renamed from ACE/debianbuild/TODO)0
-rw-r--r--ACE/debian/changelog (renamed from ACE/debianbuild/changelog)0
-rwxr-xr-xACE/debian/cmp-installation.sh (renamed from ACE/debianbuild/cmp-installation.sh)0
-rw-r--r--ACE/debian/compat (renamed from ACE/debianbuild/compat)0
-rw-r--r--ACE/debian/control (renamed from ACE/debianbuild/control)0
-rw-r--r--ACE/debian/copyright (renamed from ACE/debianbuild/copyright)0
-rw-r--r--ACE/debian/dsc (renamed from ACE/debianbuild/dsc)0
-rw-r--r--ACE/debian/gperf-ace.docs (renamed from ACE/debianbuild/gperf-ace.docs)0
-rw-r--r--ACE/debian/gperf-ace.install (renamed from ACE/debianbuild/gperf-ace.install)0
-rw-r--r--ACE/debian/libace-5.7.8.docs (renamed from ACE/debianbuild/libace-5.7.8.docs)0
-rw-r--r--ACE/debian/libace-5.7.8.install (renamed from ACE/debianbuild/libace-5.7.8.install)0
-rw-r--r--ACE/debian/libace-dev.docs (renamed from ACE/debianbuild/libace-dev.docs)0
-rw-r--r--ACE/debian/libace-dev.install (renamed from ACE/debianbuild/libace-dev.install)0
-rw-r--r--ACE/debian/libace-dev.links (renamed from ACE/debianbuild/libace-dev.links)0
-rw-r--r--ACE/debian/libace-doc.docs (renamed from ACE/debianbuild/libace-doc.docs)0
-rw-r--r--ACE/debian/libace-flreactor-5.7.8.install (renamed from ACE/debianbuild/libace-flreactor-5.7.8.install)0
-rw-r--r--ACE/debian/libace-flreactor-dev.install (renamed from ACE/debianbuild/libace-flreactor-dev.install)0
-rw-r--r--ACE/debian/libace-foxreactor-5.7.8.install (renamed from ACE/debianbuild/libace-foxreactor-5.7.8.install)0
-rw-r--r--ACE/debian/libace-foxreactor-dev.install (renamed from ACE/debianbuild/libace-foxreactor-dev.install)0
-rw-r--r--ACE/debian/libace-htbp-5.7.8.install (renamed from ACE/debianbuild/libace-htbp-5.7.8.install)0
-rw-r--r--ACE/debian/libace-htbp-dev.docs (renamed from ACE/debianbuild/libace-htbp-dev.docs)0
-rw-r--r--ACE/debian/libace-htbp-dev.install (renamed from ACE/debianbuild/libace-htbp-dev.install)0
-rw-r--r--ACE/debian/libace-qtreactor-5.7.8.install (renamed from ACE/debianbuild/libace-qtreactor-5.7.8.install)0
-rw-r--r--ACE/debian/libace-qtreactor-dev.install (renamed from ACE/debianbuild/libace-qtreactor-dev.install)0
-rw-r--r--ACE/debian/libace-rmcast-5.7.8.install (renamed from ACE/debianbuild/libace-rmcast-5.7.8.install)0
-rw-r--r--ACE/debian/libace-rmcast-dev.docs (renamed from ACE/debianbuild/libace-rmcast-dev.docs)0
-rw-r--r--ACE/debian/libace-rmcast-dev.install (renamed from ACE/debianbuild/libace-rmcast-dev.install)0
-rw-r--r--ACE/debian/libace-ssl-5.7.8.install (renamed from ACE/debianbuild/libace-ssl-5.7.8.install)0
-rw-r--r--ACE/debian/libace-ssl-dev.install (renamed from ACE/debianbuild/libace-ssl-dev.install)0
-rw-r--r--ACE/debian/libace-tkreactor-5.7.8.install (renamed from ACE/debianbuild/libace-tkreactor-5.7.8.install)0
-rw-r--r--ACE/debian/libace-tkreactor-dev.install (renamed from ACE/debianbuild/libace-tkreactor-dev.install)0
-rw-r--r--ACE/debian/libace-tmcast-5.7.8.install (renamed from ACE/debianbuild/libace-tmcast-5.7.8.install)0
-rw-r--r--ACE/debian/libace-tmcast-dev.docs (renamed from ACE/debianbuild/libace-tmcast-dev.docs)0
-rw-r--r--ACE/debian/libace-tmcast-dev.install (renamed from ACE/debianbuild/libace-tmcast-dev.install)0
-rw-r--r--ACE/debian/libace-xtreactor-5.7.8.install (renamed from ACE/debianbuild/libace-xtreactor-5.7.8.install)0
-rw-r--r--ACE/debian/libace-xtreactor-dev.install (renamed from ACE/debianbuild/libace-xtreactor-dev.install)0
-rw-r--r--ACE/debian/libacexml-5.7.8.docs (renamed from ACE/debianbuild/libacexml-5.7.8.docs)0
-rw-r--r--ACE/debian/libacexml-5.7.8.install (renamed from ACE/debianbuild/libacexml-5.7.8.install)0
-rw-r--r--ACE/debian/libacexml-dev.docs (renamed from ACE/debianbuild/libacexml-dev.docs)0
-rw-r--r--ACE/debian/libacexml-dev.install (renamed from ACE/debianbuild/libacexml-dev.install)0
-rw-r--r--ACE/debian/libacexml-dev.links (renamed from ACE/debianbuild/libacexml-dev.links)0
-rw-r--r--ACE/debian/libkokyu-5.7.8.docs (renamed from ACE/debianbuild/libkokyu-5.7.8.docs)0
-rw-r--r--ACE/debian/libkokyu-5.7.8.install (renamed from ACE/debianbuild/libkokyu-5.7.8.install)0
-rw-r--r--ACE/debian/libkokyu-dev.docs (renamed from ACE/debianbuild/libkokyu-dev.docs)0
-rw-r--r--ACE/debian/libkokyu-dev.install (renamed from ACE/debianbuild/libkokyu-dev.install)0
-rw-r--r--ACE/debian/libkokyu-dev.links (renamed from ACE/debianbuild/libkokyu-dev.links)0
-rw-r--r--ACE/debian/libtao-1.7.8.docs (renamed from ACE/debianbuild/libtao-1.7.8.docs)0
-rw-r--r--ACE/debian/libtao-1.7.8.install (renamed from ACE/debianbuild/libtao-1.7.8.install)0
-rw-r--r--ACE/debian/libtao-dev.dirs (renamed from ACE/debianbuild/libtao-dev.dirs)0
-rw-r--r--ACE/debian/libtao-dev.docs (renamed from ACE/debianbuild/libtao-dev.docs)0
-rw-r--r--ACE/debian/libtao-dev.install (renamed from ACE/debianbuild/libtao-dev.install)0
-rw-r--r--ACE/debian/libtao-dev.links (renamed from ACE/debianbuild/libtao-dev.links)0
-rw-r--r--ACE/debian/libtao-doc.docs (renamed from ACE/debianbuild/libtao-doc.docs)0
-rw-r--r--ACE/debian/libtao-flresource-1.7.8.install (renamed from ACE/debianbuild/libtao-flresource-1.7.8.install)0
-rw-r--r--ACE/debian/libtao-flresource-dev.install (renamed from ACE/debianbuild/libtao-flresource-dev.install)0
-rw-r--r--ACE/debian/libtao-foxresource-1.7.8.install (renamed from ACE/debianbuild/libtao-foxresource-1.7.8.install)0
-rw-r--r--ACE/debian/libtao-foxresource-dev.install (renamed from ACE/debianbuild/libtao-foxresource-dev.install)0
-rw-r--r--ACE/debian/libtao-orbsvcs-1.7.8.NEWS (renamed from ACE/debianbuild/libtao-orbsvcs-1.7.8.NEWS)0
-rw-r--r--ACE/debian/libtao-orbsvcs-1.7.8.install (renamed from ACE/debianbuild/libtao-orbsvcs-1.7.8.install)0
-rw-r--r--ACE/debian/libtao-orbsvcs-dev.install (renamed from ACE/debianbuild/libtao-orbsvcs-dev.install)0
-rw-r--r--ACE/debian/libtao-orbsvcs-dev.links (renamed from ACE/debianbuild/libtao-orbsvcs-dev.links)0
-rw-r--r--ACE/debian/libtao-qtresource-1.7.8.install (renamed from ACE/debianbuild/libtao-qtresource-1.7.8.install)0
-rw-r--r--ACE/debian/libtao-qtresource-dev.install (renamed from ACE/debianbuild/libtao-qtresource-dev.install)0
-rw-r--r--ACE/debian/libtao-tkresource-1.7.8.install (renamed from ACE/debianbuild/libtao-tkresource-1.7.8.install)0
-rw-r--r--ACE/debian/libtao-tkresource-dev.install (renamed from ACE/debianbuild/libtao-tkresource-dev.install)0
-rw-r--r--ACE/debian/libtao-xtresource-1.7.8.install (renamed from ACE/debianbuild/libtao-xtresource-1.7.8.install)0
-rw-r--r--ACE/debian/libtao-xtresource-dev.install (renamed from ACE/debianbuild/libtao-xtresource-dev.install)0
-rw-r--r--ACE/debian/mpc-ace.docs (renamed from ACE/debianbuild/mpc-ace.docs)0
-rw-r--r--ACE/debian/mpc-ace.install (renamed from ACE/debianbuild/mpc-ace.install)0
-rw-r--r--ACE/debian/mpc-ace.links (renamed from ACE/debianbuild/mpc-ace.links)0
-rw-r--r--ACE/debian/mpc-ace.manpages (renamed from ACE/debianbuild/mpc-ace.manpages)0
-rw-r--r--ACE/debian/patches/00list (renamed from ACE/debianbuild/patches/00list)0
-rw-r--r--ACE/debian/patches/00patch-opts (renamed from ACE/debianbuild/patches/00patch-opts)0
-rw-r--r--ACE/debian/patches/24-add-missing-headers.dpatch (renamed from ACE/debianbuild/patches/24-add-missing-headers.dpatch)0
-rw-r--r--ACE/debian/patches/34-bts386713.dpatch (renamed from ACE/debianbuild/patches/34-bts386713.dpatch)0
-rw-r--r--ACE/debian/patches/50-prepatch-dummy-mark.dpatch (renamed from ACE/debianbuild/patches/50-prepatch-dummy-mark.dpatch)0
-rw-r--r--ACE/debian/patches/90-patch-mpc-basedir.dpatch (renamed from ACE/debianbuild/patches/90-patch-mpc-basedir.dpatch)0
-rw-r--r--ACE/debian/patches/91-patch-dg-basedir.dpatch (renamed from ACE/debianbuild/patches/91-patch-dg-basedir.dpatch)0
-rw-r--r--ACE/debian/patches/92-default-ACE_ROOT.dpatch (renamed from ACE/debianbuild/patches/92-default-ACE_ROOT.dpatch)0
-rw-r--r--ACE/debian/platform_macros.GNU.in (renamed from ACE/debianbuild/platform_macros.GNU.in)0
-rw-r--r--ACE/debian/rules (renamed from ACE/debianbuild/rules)0
-rw-r--r--ACE/debian/tao-concurrency.docs (renamed from ACE/debianbuild/tao-concurrency.docs)0
-rw-r--r--ACE/debian/tao-concurrency.install (renamed from ACE/debianbuild/tao-concurrency.install)0
-rw-r--r--ACE/debian/tao-event.docs (renamed from ACE/debianbuild/tao-event.docs)0
-rw-r--r--ACE/debian/tao-event.install (renamed from ACE/debianbuild/tao-event.install)0
-rw-r--r--ACE/debian/tao-ft.docs (renamed from ACE/debianbuild/tao-ft.docs)0
-rw-r--r--ACE/debian/tao-ft.install (renamed from ACE/debianbuild/tao-ft.install)0
-rw-r--r--ACE/debian/tao-ftrtevent.install (renamed from ACE/debianbuild/tao-ftrtevent.install)0
-rw-r--r--ACE/debian/tao-idl.install (renamed from ACE/debianbuild/tao-idl.install)0
-rw-r--r--ACE/debian/tao-idl.links (renamed from ACE/debianbuild/tao-idl.links)0
-rw-r--r--ACE/debian/tao-idl.manpages (renamed from ACE/debianbuild/tao-idl.manpages)0
-rw-r--r--ACE/debian/tao-ifr.docs (renamed from ACE/debianbuild/tao-ifr.docs)0
-rw-r--r--ACE/debian/tao-ifr.install (renamed from ACE/debianbuild/tao-ifr.install)0
-rw-r--r--ACE/debian/tao-imr.docs (renamed from ACE/debianbuild/tao-imr.docs)0
-rw-r--r--ACE/debian/tao-imr.install (renamed from ACE/debianbuild/tao-imr.install)0
-rw-r--r--ACE/debian/tao-lifecycle.install (renamed from ACE/debianbuild/tao-lifecycle.install)0
-rw-r--r--ACE/debian/tao-load.docs (renamed from ACE/debianbuild/tao-load.docs)0
-rw-r--r--ACE/debian/tao-load.install (renamed from ACE/debianbuild/tao-load.install)0
-rw-r--r--ACE/debian/tao-log.docs (renamed from ACE/debianbuild/tao-log.docs)0
-rw-r--r--ACE/debian/tao-log.install (renamed from ACE/debianbuild/tao-log.install)0
-rw-r--r--ACE/debian/tao-log.manpages (renamed from ACE/debianbuild/tao-log.manpages)0
-rw-r--r--ACE/debian/tao-naming.docs (renamed from ACE/debianbuild/tao-naming.docs)0
-rw-r--r--ACE/debian/tao-naming.install (renamed from ACE/debianbuild/tao-naming.install)0
-rw-r--r--ACE/debian/tao-notify.docs (renamed from ACE/debianbuild/tao-notify.docs)0
-rw-r--r--ACE/debian/tao-notify.install (renamed from ACE/debianbuild/tao-notify.install)0
-rw-r--r--ACE/debian/tao-rtevent.install (renamed from ACE/debianbuild/tao-rtevent.install)0
-rw-r--r--ACE/debian/tao-scheduling.install (renamed from ACE/debianbuild/tao-scheduling.install)0
-rw-r--r--ACE/debian/tao-time.docs (renamed from ACE/debianbuild/tao-time.docs)0
-rw-r--r--ACE/debian/tao-time.install (renamed from ACE/debianbuild/tao-time.install)0
-rw-r--r--ACE/debian/tao-trading.docs (renamed from ACE/debianbuild/tao-trading.docs)0
-rw-r--r--ACE/debian/tao-trading.install (renamed from ACE/debianbuild/tao-trading.install)0
-rw-r--r--ACE/debian/tao-utils.docs (renamed from ACE/debianbuild/tao-utils.docs)0
-rw-r--r--ACE/debian/tao-utils.install (renamed from ACE/debianbuild/tao-utils.install)0
-rw-r--r--ACE/debian/tao_idl (renamed from ACE/debianbuild/tao_idl)0
-rw-r--r--ACE/debian/tao_ifr (renamed from ACE/debianbuild/tao_ifr)0
-rw-r--r--ACE/debian/watch (renamed from ACE/debianbuild/watch)0
125 files changed, 69 insertions, 59 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 7f110bf2821..a9afc4e9598 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,67 +1,77 @@
+Thu Apr 22 07:51:42 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * Release:
+ * bin/make_release.py:
+ Updated because of rename
+
+ * debian:
+ * debianbuild:
+ Renamed debianbuild to debianbuild
+
Wed Apr 21 13:36:30 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
- * examples/Connection/blocking/SPIPE-connector.cpp:
- Use Reactor instead of Proactor, thanks to Dave <dwh0403 at 163 dot com>
- for reporting this
+ * examples/Connection/blocking/SPIPE-connector.cpp:
+ Use Reactor instead of Proactor, thanks to Dave <dwh0403 at 163 dot com>
+ for reporting this
Tue Apr 20 13:02:46 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
- * ace/Atomic_Op.h:
- Fix redefinition warning
+ * ace/Atomic_Op.h:
+ Fix redefinition warning
Mon Apr 19 18:17:30 UTC 2010 UTC 2010 Chad Beaulac <chad@objectivesolutions.com
- * ace/Service_Repository.cpp
- Modified ASR::fini to print debug info for empty
- service entries and handle empty service entries.
- This fixes the ASR remove functionality that was
- one of the reasons SC_Server was crashing at shutdown.
+ * ace/Service_Repository.cpp
+ Modified ASR::fini to print debug info for empty
+ service entries and handle empty service entries.
+ This fixes the ASR remove functionality that was
+ one of the reasons SC_Server was crashing at shutdown.
- * examples/ASX/CCM_App/SC_Server.cpp
- Removing signal handler before main exit to present SEGV
+ * examples/ASX/CCM_App/SC_Server.cpp
+ Removing signal handler before main exit to present SEGV
- * tests/run_test.lst
- Removed !FIXED_BUGS_ONLY from Bug_3334_Regression_Test
- Apparently it was missed in the last commit.
+ * tests/run_test.lst
+ Removed !FIXED_BUGS_ONLY from Bug_3334_Regression_Test
+ Apparently it was missed in the last commit.
- This fixes Bugzilla #2916 and #3205.
- I'll create another patch for #3334 after this commit.
+ This fixes Bugzilla #2916 and #3205.
+ I'll create another patch for #3334 after this commit.
Mon Apr 19 12:44:56 UTC 2010 Chad Beaulac <chad@objectivesolutions.com>
- * ace/Service_Types.h
- * ace/Service_Types.inl
- * ace/Service_Types.cpp
- Added service_type_ attr to expose the type of service being
- managed to the ACE_Service_Repository. This allows the ASR to
- manage the lifecycle of the ACE_Module and ACE_Stream in order to
- avoid a double delete of ACE_Module at shutdown.
-
- ACE_Stream_Type::fini was modified to not call ACE_Module_Type::fini
- as this will results in a double delete when ACE_Service_Repository::fini
- is called. ACE_Stream_Type::remove(module_name) was modified to not call
- ACE_Module_Type::fini as this will results in a double delete
- when ACE_Service_Repository::fini is called also.
-
- * ace/Service_Repository.cpp
- Modified ASR::fini to iterate over the service_array_ twice.
- ACE_Service_Type::fini is called on all ACE_Stream_Type and
- ACE_Service_Object_Type instances first. Then, fini is called on
- all ACE_Modules_Type instances. All calls to fini are done in the
- order the services appear in the ASR::service_array_ except for
- the grouping described here. The calls to ACE_Module_Type::fini
- must be done last because ACE_Stream_Type::fini accesses the Modules
- so they must not be deleted by a call to ACE_Module_Type::fini
- before that.
-
- * tests/Bug_3334_Regresssion_Test.cpp
- Added call to ACE_Service_Repository::fini_svcs() to capture all
- debug output before the application exits.
-
- * tests/run_tests.lst
- Removed !FIXED_BUGS_ONLY from Bug_3334_Regression_Test
-
- This fixes Bugzilla #3334
+ * ace/Service_Types.h
+ * ace/Service_Types.inl
+ * ace/Service_Types.cpp
+ Added service_type_ attr to expose the type of service being
+ managed to the ACE_Service_Repository. This allows the ASR to
+ manage the lifecycle of the ACE_Module and ACE_Stream in order to
+ avoid a double delete of ACE_Module at shutdown.
+
+ ACE_Stream_Type::fini was modified to not call ACE_Module_Type::fini
+ as this will results in a double delete when ACE_Service_Repository::fini
+ is called. ACE_Stream_Type::remove(module_name) was modified to not call
+ ACE_Module_Type::fini as this will results in a double delete
+ when ACE_Service_Repository::fini is called also.
+
+ * ace/Service_Repository.cpp
+ Modified ASR::fini to iterate over the service_array_ twice.
+ ACE_Service_Type::fini is called on all ACE_Stream_Type and
+ ACE_Service_Object_Type instances first. Then, fini is called on
+ all ACE_Modules_Type instances. All calls to fini are done in the
+ order the services appear in the ASR::service_array_ except for
+ the grouping described here. The calls to ACE_Module_Type::fini
+ must be done last because ACE_Stream_Type::fini accesses the Modules
+ so they must not be deleted by a call to ACE_Module_Type::fini
+ before that.
+
+ * tests/Bug_3334_Regresssion_Test.cpp
+ Added call to ACE_Service_Repository::fini_svcs() to capture all
+ debug output before the application exits.
+
+ * tests/run_tests.lst
+ Removed !FIXED_BUGS_ONLY from Bug_3334_Regression_Test
+
+ This fixes Bugzilla #3334
Mon Apr 19 06:54:01 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
diff --git a/ACE/Release b/ACE/Release
index 485f4a51eab..5126281422b 100644
--- a/ACE/Release
+++ b/ACE/Release
@@ -66,7 +66,7 @@ CONTROLLED_FILES = \
apps \
bin \
configure.ac \
- debianbuild \
+ debian \
lib \
MPC \
docs \
diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py
index 23e6cd4ef58..ffc6ec463ac 100755
--- a/ACE/bin/make_release.py
+++ b/ACE/bin/make_release.py
@@ -339,9 +339,9 @@ def update_spec_file ():
return [doc_root + "/ACE/rpmbuild/ace-tao.spec"]
def update_debianbuild ():
- """ Updates ACE_ROOT/debianbuild directory.
+ """ Updates ACE_ROOT/debian directory.
- renames all files with version nrs in name to new scheme.
- - updates version nrs in file debianbuild/control
+ - updates version nrs in file debian/control
Currently ONLY ACE & TAO stuff is handled here """
global comp_versions
@@ -360,7 +360,7 @@ def update_debianbuild ():
mask = re.compile ("(libace|libkokyu|libtao)(.*)(\d+\.\d+\.\d+)(.*)")
tao = re.compile ("tao", re.IGNORECASE)
- for fname in glob.iglob(doc_root + '/ACE/debianbuild/*'):
+ for fname in glob.iglob(doc_root + '/ACE/debian/*'):
match = None
fbase = basename (fname)
@@ -391,7 +391,7 @@ def update_debianbuild ():
else:
return match.group (1) + match.group (2) + comp_versions["ACE_version"] + match.group (4)
- with open (doc_root + "/ACE/debianbuild/control", 'r+') as control_file:
+ with open (doc_root + "/ACE/debian/control", 'r+') as control_file:
new_ctrl = ""
for line in control_file.readlines ():
if re.search ("^(Package|Depends|Suggests):", line) is not None:
@@ -409,9 +409,9 @@ def update_debianbuild ():
print "New control file:"
print "".join (new_ctrl)
- files.append (doc_root + "/ACE/debianbuild/control")
+ files.append (doc_root + "/ACE/debian/control")
- # rewrite debianbuild/dsc
+ # rewrite debian/dsc
dsc_lines = """# Format: 1.0
# Source: ace
# Version: %s
@@ -424,7 +424,7 @@ def update_debianbuild ():
#
""" % (comp_versions["TAO_version"], comp_versions["ACE_version"])
if opts.take_action:
- with open (doc_root + "/ACE/debianbuild/dsc", 'r+') as dsc_file:
+ with open (doc_root + "/ACE/debian/dsc", 'r+') as dsc_file:
dsc_file.seek (0)
dsc_file.truncate (0)
dsc_file.writelines (dsc_lines)
@@ -432,7 +432,7 @@ def update_debianbuild ():
print "New dsc file:\n"
print dsc_lines
- files.append (doc_root + "/ACE/debianbuild/dsc")
+ files.append (doc_root + "/ACE/debian/dsc")
return files
diff --git a/ACE/debianbuild/Basic_Logging_Service.sgml b/ACE/debian/Basic_Logging_Service.sgml
index bd74c24ef56..bd74c24ef56 100644
--- a/ACE/debianbuild/Basic_Logging_Service.sgml
+++ b/ACE/debian/Basic_Logging_Service.sgml
diff --git a/ACE/debianbuild/Event_Logging_Service.sgml b/ACE/debian/Event_Logging_Service.sgml
index 8980166a883..8980166a883 100644
--- a/ACE/debianbuild/Event_Logging_Service.sgml
+++ b/ACE/debian/Event_Logging_Service.sgml
diff --git a/ACE/debianbuild/Notify_Logging_Service.sgml b/ACE/debian/Notify_Logging_Service.sgml
index ec874c8c8a4..ec874c8c8a4 100644
--- a/ACE/debianbuild/Notify_Logging_Service.sgml
+++ b/ACE/debian/Notify_Logging_Service.sgml
diff --git a/ACE/debianbuild/README.Debian b/ACE/debian/README.Debian
index 46528c360d0..46528c360d0 100644
--- a/ACE/debianbuild/README.Debian
+++ b/ACE/debian/README.Debian
diff --git a/ACE/debianbuild/RTEvent_Logging_Service.sgml b/ACE/debian/RTEvent_Logging_Service.sgml
index 3bb123c89e6..3bb123c89e6 100644
--- a/ACE/debianbuild/RTEvent_Logging_Service.sgml
+++ b/ACE/debian/RTEvent_Logging_Service.sgml
diff --git a/ACE/debianbuild/TAO_ORB_Options.sgml b/ACE/debian/TAO_ORB_Options.sgml
index e31fbefd50a..e31fbefd50a 100644
--- a/ACE/debianbuild/TAO_ORB_Options.sgml
+++ b/ACE/debian/TAO_ORB_Options.sgml
diff --git a/ACE/debianbuild/TODO b/ACE/debian/TODO
index 721de639197..721de639197 100644
--- a/ACE/debianbuild/TODO
+++ b/ACE/debian/TODO
diff --git a/ACE/debianbuild/changelog b/ACE/debian/changelog
index 3c557761b45..3c557761b45 100644
--- a/ACE/debianbuild/changelog
+++ b/ACE/debian/changelog
diff --git a/ACE/debianbuild/cmp-installation.sh b/ACE/debian/cmp-installation.sh
index d12d8e83dd8..d12d8e83dd8 100755
--- a/ACE/debianbuild/cmp-installation.sh
+++ b/ACE/debian/cmp-installation.sh
diff --git a/ACE/debianbuild/compat b/ACE/debian/compat
index 7ed6ff82de6..7ed6ff82de6 100644
--- a/ACE/debianbuild/compat
+++ b/ACE/debian/compat
diff --git a/ACE/debianbuild/control b/ACE/debian/control
index 25eae3ec6f0..25eae3ec6f0 100644
--- a/ACE/debianbuild/control
+++ b/ACE/debian/control
diff --git a/ACE/debianbuild/copyright b/ACE/debian/copyright
index 891512b3683..891512b3683 100644
--- a/ACE/debianbuild/copyright
+++ b/ACE/debian/copyright
diff --git a/ACE/debianbuild/dsc b/ACE/debian/dsc
index 7b532497bc4..7b532497bc4 100644
--- a/ACE/debianbuild/dsc
+++ b/ACE/debian/dsc
diff --git a/ACE/debianbuild/gperf-ace.docs b/ACE/debian/gperf-ace.docs
index b14ede1b24f..b14ede1b24f 100644
--- a/ACE/debianbuild/gperf-ace.docs
+++ b/ACE/debian/gperf-ace.docs
diff --git a/ACE/debianbuild/gperf-ace.install b/ACE/debian/gperf-ace.install
index 04c9b7c515b..04c9b7c515b 100644
--- a/ACE/debianbuild/gperf-ace.install
+++ b/ACE/debian/gperf-ace.install
diff --git a/ACE/debianbuild/libace-5.7.8.docs b/ACE/debian/libace-5.7.8.docs
index e367841dc93..e367841dc93 100644
--- a/ACE/debianbuild/libace-5.7.8.docs
+++ b/ACE/debian/libace-5.7.8.docs
diff --git a/ACE/debianbuild/libace-5.7.8.install b/ACE/debian/libace-5.7.8.install
index 0ce2ad9549f..0ce2ad9549f 100644
--- a/ACE/debianbuild/libace-5.7.8.install
+++ b/ACE/debian/libace-5.7.8.install
diff --git a/ACE/debianbuild/libace-dev.docs b/ACE/debian/libace-dev.docs
index 8d00ada38de..8d00ada38de 100644
--- a/ACE/debianbuild/libace-dev.docs
+++ b/ACE/debian/libace-dev.docs
diff --git a/ACE/debianbuild/libace-dev.install b/ACE/debian/libace-dev.install
index a0eb6eaa8ab..a0eb6eaa8ab 100644
--- a/ACE/debianbuild/libace-dev.install
+++ b/ACE/debian/libace-dev.install
diff --git a/ACE/debianbuild/libace-dev.links b/ACE/debian/libace-dev.links
index 3efd6197eb5..3efd6197eb5 100644
--- a/ACE/debianbuild/libace-dev.links
+++ b/ACE/debian/libace-dev.links
diff --git a/ACE/debianbuild/libace-doc.docs b/ACE/debian/libace-doc.docs
index f15b7f7c57e..f15b7f7c57e 100644
--- a/ACE/debianbuild/libace-doc.docs
+++ b/ACE/debian/libace-doc.docs
diff --git a/ACE/debianbuild/libace-flreactor-5.7.8.install b/ACE/debian/libace-flreactor-5.7.8.install
index cc5d0266057..cc5d0266057 100644
--- a/ACE/debianbuild/libace-flreactor-5.7.8.install
+++ b/ACE/debian/libace-flreactor-5.7.8.install
diff --git a/ACE/debianbuild/libace-flreactor-dev.install b/ACE/debian/libace-flreactor-dev.install
index 09358d7b67b..09358d7b67b 100644
--- a/ACE/debianbuild/libace-flreactor-dev.install
+++ b/ACE/debian/libace-flreactor-dev.install
diff --git a/ACE/debianbuild/libace-foxreactor-5.7.8.install b/ACE/debian/libace-foxreactor-5.7.8.install
index a1ab4b6a52b..a1ab4b6a52b 100644
--- a/ACE/debianbuild/libace-foxreactor-5.7.8.install
+++ b/ACE/debian/libace-foxreactor-5.7.8.install
diff --git a/ACE/debianbuild/libace-foxreactor-dev.install b/ACE/debian/libace-foxreactor-dev.install
index 45f5eb41493..45f5eb41493 100644
--- a/ACE/debianbuild/libace-foxreactor-dev.install
+++ b/ACE/debian/libace-foxreactor-dev.install
diff --git a/ACE/debianbuild/libace-htbp-5.7.8.install b/ACE/debian/libace-htbp-5.7.8.install
index bc70a1e2b6c..bc70a1e2b6c 100644
--- a/ACE/debianbuild/libace-htbp-5.7.8.install
+++ b/ACE/debian/libace-htbp-5.7.8.install
diff --git a/ACE/debianbuild/libace-htbp-dev.docs b/ACE/debian/libace-htbp-dev.docs
index d8a3e7dc562..d8a3e7dc562 100644
--- a/ACE/debianbuild/libace-htbp-dev.docs
+++ b/ACE/debian/libace-htbp-dev.docs
diff --git a/ACE/debianbuild/libace-htbp-dev.install b/ACE/debian/libace-htbp-dev.install
index f63140c10bf..f63140c10bf 100644
--- a/ACE/debianbuild/libace-htbp-dev.install
+++ b/ACE/debian/libace-htbp-dev.install
diff --git a/ACE/debianbuild/libace-qtreactor-5.7.8.install b/ACE/debian/libace-qtreactor-5.7.8.install
index c98ee7e33e4..c98ee7e33e4 100644
--- a/ACE/debianbuild/libace-qtreactor-5.7.8.install
+++ b/ACE/debian/libace-qtreactor-5.7.8.install
diff --git a/ACE/debianbuild/libace-qtreactor-dev.install b/ACE/debian/libace-qtreactor-dev.install
index 8fa54fbacc4..8fa54fbacc4 100644
--- a/ACE/debianbuild/libace-qtreactor-dev.install
+++ b/ACE/debian/libace-qtreactor-dev.install
diff --git a/ACE/debianbuild/libace-rmcast-5.7.8.install b/ACE/debian/libace-rmcast-5.7.8.install
index faeb44041af..faeb44041af 100644
--- a/ACE/debianbuild/libace-rmcast-5.7.8.install
+++ b/ACE/debian/libace-rmcast-5.7.8.install
diff --git a/ACE/debianbuild/libace-rmcast-dev.docs b/ACE/debian/libace-rmcast-dev.docs
index 7e7b6b827e3..7e7b6b827e3 100644
--- a/ACE/debianbuild/libace-rmcast-dev.docs
+++ b/ACE/debian/libace-rmcast-dev.docs
diff --git a/ACE/debianbuild/libace-rmcast-dev.install b/ACE/debian/libace-rmcast-dev.install
index c946ee6dbb9..c946ee6dbb9 100644
--- a/ACE/debianbuild/libace-rmcast-dev.install
+++ b/ACE/debian/libace-rmcast-dev.install
diff --git a/ACE/debianbuild/libace-ssl-5.7.8.install b/ACE/debian/libace-ssl-5.7.8.install
index 26c71c39a2a..26c71c39a2a 100644
--- a/ACE/debianbuild/libace-ssl-5.7.8.install
+++ b/ACE/debian/libace-ssl-5.7.8.install
diff --git a/ACE/debianbuild/libace-ssl-dev.install b/ACE/debian/libace-ssl-dev.install
index 284f4326984..284f4326984 100644
--- a/ACE/debianbuild/libace-ssl-dev.install
+++ b/ACE/debian/libace-ssl-dev.install
diff --git a/ACE/debianbuild/libace-tkreactor-5.7.8.install b/ACE/debian/libace-tkreactor-5.7.8.install
index 883ec5c9678..883ec5c9678 100644
--- a/ACE/debianbuild/libace-tkreactor-5.7.8.install
+++ b/ACE/debian/libace-tkreactor-5.7.8.install
diff --git a/ACE/debianbuild/libace-tkreactor-dev.install b/ACE/debian/libace-tkreactor-dev.install
index cef0fdf1ae2..cef0fdf1ae2 100644
--- a/ACE/debianbuild/libace-tkreactor-dev.install
+++ b/ACE/debian/libace-tkreactor-dev.install
diff --git a/ACE/debianbuild/libace-tmcast-5.7.8.install b/ACE/debian/libace-tmcast-5.7.8.install
index 87463063a9b..87463063a9b 100644
--- a/ACE/debianbuild/libace-tmcast-5.7.8.install
+++ b/ACE/debian/libace-tmcast-5.7.8.install
diff --git a/ACE/debianbuild/libace-tmcast-dev.docs b/ACE/debian/libace-tmcast-dev.docs
index e740752c6a4..e740752c6a4 100644
--- a/ACE/debianbuild/libace-tmcast-dev.docs
+++ b/ACE/debian/libace-tmcast-dev.docs
diff --git a/ACE/debianbuild/libace-tmcast-dev.install b/ACE/debian/libace-tmcast-dev.install
index d9c10e67c72..d9c10e67c72 100644
--- a/ACE/debianbuild/libace-tmcast-dev.install
+++ b/ACE/debian/libace-tmcast-dev.install
diff --git a/ACE/debianbuild/libace-xtreactor-5.7.8.install b/ACE/debian/libace-xtreactor-5.7.8.install
index 2c6719943af..2c6719943af 100644
--- a/ACE/debianbuild/libace-xtreactor-5.7.8.install
+++ b/ACE/debian/libace-xtreactor-5.7.8.install
diff --git a/ACE/debianbuild/libace-xtreactor-dev.install b/ACE/debian/libace-xtreactor-dev.install
index 2e6b2db77d1..2e6b2db77d1 100644
--- a/ACE/debianbuild/libace-xtreactor-dev.install
+++ b/ACE/debian/libace-xtreactor-dev.install
diff --git a/ACE/debianbuild/libacexml-5.7.8.docs b/ACE/debian/libacexml-5.7.8.docs
index 4ebd1c55c18..4ebd1c55c18 100644
--- a/ACE/debianbuild/libacexml-5.7.8.docs
+++ b/ACE/debian/libacexml-5.7.8.docs
diff --git a/ACE/debianbuild/libacexml-5.7.8.install b/ACE/debian/libacexml-5.7.8.install
index 5e60388244d..5e60388244d 100644
--- a/ACE/debianbuild/libacexml-5.7.8.install
+++ b/ACE/debian/libacexml-5.7.8.install
diff --git a/ACE/debianbuild/libacexml-dev.docs b/ACE/debian/libacexml-dev.docs
index 77ec1b320a1..77ec1b320a1 100644
--- a/ACE/debianbuild/libacexml-dev.docs
+++ b/ACE/debian/libacexml-dev.docs
diff --git a/ACE/debianbuild/libacexml-dev.install b/ACE/debian/libacexml-dev.install
index 517f3b1c21e..517f3b1c21e 100644
--- a/ACE/debianbuild/libacexml-dev.install
+++ b/ACE/debian/libacexml-dev.install
diff --git a/ACE/debianbuild/libacexml-dev.links b/ACE/debian/libacexml-dev.links
index 16f0027f673..16f0027f673 100644
--- a/ACE/debianbuild/libacexml-dev.links
+++ b/ACE/debian/libacexml-dev.links
diff --git a/ACE/debianbuild/libkokyu-5.7.8.docs b/ACE/debian/libkokyu-5.7.8.docs
index 35ee2dbe99c..35ee2dbe99c 100644
--- a/ACE/debianbuild/libkokyu-5.7.8.docs
+++ b/ACE/debian/libkokyu-5.7.8.docs
diff --git a/ACE/debianbuild/libkokyu-5.7.8.install b/ACE/debian/libkokyu-5.7.8.install
index 81c58f1ba0d..81c58f1ba0d 100644
--- a/ACE/debianbuild/libkokyu-5.7.8.install
+++ b/ACE/debian/libkokyu-5.7.8.install
diff --git a/ACE/debianbuild/libkokyu-dev.docs b/ACE/debian/libkokyu-dev.docs
index 50165282295..50165282295 100644
--- a/ACE/debianbuild/libkokyu-dev.docs
+++ b/ACE/debian/libkokyu-dev.docs
diff --git a/ACE/debianbuild/libkokyu-dev.install b/ACE/debian/libkokyu-dev.install
index fd045e49943..fd045e49943 100644
--- a/ACE/debianbuild/libkokyu-dev.install
+++ b/ACE/debian/libkokyu-dev.install
diff --git a/ACE/debianbuild/libkokyu-dev.links b/ACE/debian/libkokyu-dev.links
index eb6d21d003a..eb6d21d003a 100644
--- a/ACE/debianbuild/libkokyu-dev.links
+++ b/ACE/debian/libkokyu-dev.links
diff --git a/ACE/debianbuild/libtao-1.7.8.docs b/ACE/debian/libtao-1.7.8.docs
index a79beab3449..a79beab3449 100644
--- a/ACE/debianbuild/libtao-1.7.8.docs
+++ b/ACE/debian/libtao-1.7.8.docs
diff --git a/ACE/debianbuild/libtao-1.7.8.install b/ACE/debian/libtao-1.7.8.install
index 5d7048446f3..5d7048446f3 100644
--- a/ACE/debianbuild/libtao-1.7.8.install
+++ b/ACE/debian/libtao-1.7.8.install
diff --git a/ACE/debianbuild/libtao-dev.dirs b/ACE/debian/libtao-dev.dirs
index 9ec18989c12..9ec18989c12 100644
--- a/ACE/debianbuild/libtao-dev.dirs
+++ b/ACE/debian/libtao-dev.dirs
diff --git a/ACE/debianbuild/libtao-dev.docs b/ACE/debian/libtao-dev.docs
index e9b5ab32d7c..e9b5ab32d7c 100644
--- a/ACE/debianbuild/libtao-dev.docs
+++ b/ACE/debian/libtao-dev.docs
diff --git a/ACE/debianbuild/libtao-dev.install b/ACE/debian/libtao-dev.install
index 3840f1eb44d..3840f1eb44d 100644
--- a/ACE/debianbuild/libtao-dev.install
+++ b/ACE/debian/libtao-dev.install
diff --git a/ACE/debianbuild/libtao-dev.links b/ACE/debian/libtao-dev.links
index d07668bc513..d07668bc513 100644
--- a/ACE/debianbuild/libtao-dev.links
+++ b/ACE/debian/libtao-dev.links
diff --git a/ACE/debianbuild/libtao-doc.docs b/ACE/debian/libtao-doc.docs
index 23026c0f89d..23026c0f89d 100644
--- a/ACE/debianbuild/libtao-doc.docs
+++ b/ACE/debian/libtao-doc.docs
diff --git a/ACE/debianbuild/libtao-flresource-1.7.8.install b/ACE/debian/libtao-flresource-1.7.8.install
index 47dfbd58ef8..47dfbd58ef8 100644
--- a/ACE/debianbuild/libtao-flresource-1.7.8.install
+++ b/ACE/debian/libtao-flresource-1.7.8.install
diff --git a/ACE/debianbuild/libtao-flresource-dev.install b/ACE/debian/libtao-flresource-dev.install
index 218c4c24c75..218c4c24c75 100644
--- a/ACE/debianbuild/libtao-flresource-dev.install
+++ b/ACE/debian/libtao-flresource-dev.install
diff --git a/ACE/debianbuild/libtao-foxresource-1.7.8.install b/ACE/debian/libtao-foxresource-1.7.8.install
index 1187fe1a182..1187fe1a182 100644
--- a/ACE/debianbuild/libtao-foxresource-1.7.8.install
+++ b/ACE/debian/libtao-foxresource-1.7.8.install
diff --git a/ACE/debianbuild/libtao-foxresource-dev.install b/ACE/debian/libtao-foxresource-dev.install
index b3b52d4941d..b3b52d4941d 100644
--- a/ACE/debianbuild/libtao-foxresource-dev.install
+++ b/ACE/debian/libtao-foxresource-dev.install
diff --git a/ACE/debianbuild/libtao-orbsvcs-1.7.8.NEWS b/ACE/debian/libtao-orbsvcs-1.7.8.NEWS
index ea0759e0ade..ea0759e0ade 100644
--- a/ACE/debianbuild/libtao-orbsvcs-1.7.8.NEWS
+++ b/ACE/debian/libtao-orbsvcs-1.7.8.NEWS
diff --git a/ACE/debianbuild/libtao-orbsvcs-1.7.8.install b/ACE/debian/libtao-orbsvcs-1.7.8.install
index 5fb5f3c21b3..5fb5f3c21b3 100644
--- a/ACE/debianbuild/libtao-orbsvcs-1.7.8.install
+++ b/ACE/debian/libtao-orbsvcs-1.7.8.install
diff --git a/ACE/debianbuild/libtao-orbsvcs-dev.install b/ACE/debian/libtao-orbsvcs-dev.install
index 0a2d79591cd..0a2d79591cd 100644
--- a/ACE/debianbuild/libtao-orbsvcs-dev.install
+++ b/ACE/debian/libtao-orbsvcs-dev.install
diff --git a/ACE/debianbuild/libtao-orbsvcs-dev.links b/ACE/debian/libtao-orbsvcs-dev.links
index 42fe43bc2a7..42fe43bc2a7 100644
--- a/ACE/debianbuild/libtao-orbsvcs-dev.links
+++ b/ACE/debian/libtao-orbsvcs-dev.links
diff --git a/ACE/debianbuild/libtao-qtresource-1.7.8.install b/ACE/debian/libtao-qtresource-1.7.8.install
index 84d4f97a06b..84d4f97a06b 100644
--- a/ACE/debianbuild/libtao-qtresource-1.7.8.install
+++ b/ACE/debian/libtao-qtresource-1.7.8.install
diff --git a/ACE/debianbuild/libtao-qtresource-dev.install b/ACE/debian/libtao-qtresource-dev.install
index d4bfe3864c8..d4bfe3864c8 100644
--- a/ACE/debianbuild/libtao-qtresource-dev.install
+++ b/ACE/debian/libtao-qtresource-dev.install
diff --git a/ACE/debianbuild/libtao-tkresource-1.7.8.install b/ACE/debian/libtao-tkresource-1.7.8.install
index 51ecfa59d2c..51ecfa59d2c 100644
--- a/ACE/debianbuild/libtao-tkresource-1.7.8.install
+++ b/ACE/debian/libtao-tkresource-1.7.8.install
diff --git a/ACE/debianbuild/libtao-tkresource-dev.install b/ACE/debian/libtao-tkresource-dev.install
index daaa40e9b7e..daaa40e9b7e 100644
--- a/ACE/debianbuild/libtao-tkresource-dev.install
+++ b/ACE/debian/libtao-tkresource-dev.install
diff --git a/ACE/debianbuild/libtao-xtresource-1.7.8.install b/ACE/debian/libtao-xtresource-1.7.8.install
index 11588ae9088..11588ae9088 100644
--- a/ACE/debianbuild/libtao-xtresource-1.7.8.install
+++ b/ACE/debian/libtao-xtresource-1.7.8.install
diff --git a/ACE/debianbuild/libtao-xtresource-dev.install b/ACE/debian/libtao-xtresource-dev.install
index 24782aea620..24782aea620 100644
--- a/ACE/debianbuild/libtao-xtresource-dev.install
+++ b/ACE/debian/libtao-xtresource-dev.install
diff --git a/ACE/debianbuild/mpc-ace.docs b/ACE/debian/mpc-ace.docs
index fb3dd6ec92c..fb3dd6ec92c 100644
--- a/ACE/debianbuild/mpc-ace.docs
+++ b/ACE/debian/mpc-ace.docs
diff --git a/ACE/debianbuild/mpc-ace.install b/ACE/debian/mpc-ace.install
index 0a5cec36962..0a5cec36962 100644
--- a/ACE/debianbuild/mpc-ace.install
+++ b/ACE/debian/mpc-ace.install
diff --git a/ACE/debianbuild/mpc-ace.links b/ACE/debian/mpc-ace.links
index e0fc68a6beb..e0fc68a6beb 100644
--- a/ACE/debianbuild/mpc-ace.links
+++ b/ACE/debian/mpc-ace.links
diff --git a/ACE/debianbuild/mpc-ace.manpages b/ACE/debian/mpc-ace.manpages
index 59e55053a00..59e55053a00 100644
--- a/ACE/debianbuild/mpc-ace.manpages
+++ b/ACE/debian/mpc-ace.manpages
diff --git a/ACE/debianbuild/patches/00list b/ACE/debian/patches/00list
index d77c48fbc12..d77c48fbc12 100644
--- a/ACE/debianbuild/patches/00list
+++ b/ACE/debian/patches/00list
diff --git a/ACE/debianbuild/patches/00patch-opts b/ACE/debian/patches/00patch-opts
index d49694774c8..d49694774c8 100644
--- a/ACE/debianbuild/patches/00patch-opts
+++ b/ACE/debian/patches/00patch-opts
diff --git a/ACE/debianbuild/patches/24-add-missing-headers.dpatch b/ACE/debian/patches/24-add-missing-headers.dpatch
index 96dfc8a0ad1..96dfc8a0ad1 100644
--- a/ACE/debianbuild/patches/24-add-missing-headers.dpatch
+++ b/ACE/debian/patches/24-add-missing-headers.dpatch
diff --git a/ACE/debianbuild/patches/34-bts386713.dpatch b/ACE/debian/patches/34-bts386713.dpatch
index 8f3aca63c55..8f3aca63c55 100644
--- a/ACE/debianbuild/patches/34-bts386713.dpatch
+++ b/ACE/debian/patches/34-bts386713.dpatch
diff --git a/ACE/debianbuild/patches/50-prepatch-dummy-mark.dpatch b/ACE/debian/patches/50-prepatch-dummy-mark.dpatch
index 758f5225979..758f5225979 100644
--- a/ACE/debianbuild/patches/50-prepatch-dummy-mark.dpatch
+++ b/ACE/debian/patches/50-prepatch-dummy-mark.dpatch
diff --git a/ACE/debianbuild/patches/90-patch-mpc-basedir.dpatch b/ACE/debian/patches/90-patch-mpc-basedir.dpatch
index 594844a615b..594844a615b 100644
--- a/ACE/debianbuild/patches/90-patch-mpc-basedir.dpatch
+++ b/ACE/debian/patches/90-patch-mpc-basedir.dpatch
diff --git a/ACE/debianbuild/patches/91-patch-dg-basedir.dpatch b/ACE/debian/patches/91-patch-dg-basedir.dpatch
index 0703e3e6a38..0703e3e6a38 100644
--- a/ACE/debianbuild/patches/91-patch-dg-basedir.dpatch
+++ b/ACE/debian/patches/91-patch-dg-basedir.dpatch
diff --git a/ACE/debianbuild/patches/92-default-ACE_ROOT.dpatch b/ACE/debian/patches/92-default-ACE_ROOT.dpatch
index c9be527c910..c9be527c910 100644
--- a/ACE/debianbuild/patches/92-default-ACE_ROOT.dpatch
+++ b/ACE/debian/patches/92-default-ACE_ROOT.dpatch
diff --git a/ACE/debianbuild/platform_macros.GNU.in b/ACE/debian/platform_macros.GNU.in
index 4ab8f0aac88..4ab8f0aac88 100644
--- a/ACE/debianbuild/platform_macros.GNU.in
+++ b/ACE/debian/platform_macros.GNU.in
diff --git a/ACE/debianbuild/rules b/ACE/debian/rules
index cfaa1f713f0..cfaa1f713f0 100644
--- a/ACE/debianbuild/rules
+++ b/ACE/debian/rules
diff --git a/ACE/debianbuild/tao-concurrency.docs b/ACE/debian/tao-concurrency.docs
index 27759070d95..27759070d95 100644
--- a/ACE/debianbuild/tao-concurrency.docs
+++ b/ACE/debian/tao-concurrency.docs
diff --git a/ACE/debianbuild/tao-concurrency.install b/ACE/debian/tao-concurrency.install
index d5056db405c..d5056db405c 100644
--- a/ACE/debianbuild/tao-concurrency.install
+++ b/ACE/debian/tao-concurrency.install
diff --git a/ACE/debianbuild/tao-event.docs b/ACE/debian/tao-event.docs
index 323dd9c38cc..323dd9c38cc 100644
--- a/ACE/debianbuild/tao-event.docs
+++ b/ACE/debian/tao-event.docs
diff --git a/ACE/debianbuild/tao-event.install b/ACE/debian/tao-event.install
index 6bebccee3e8..6bebccee3e8 100644
--- a/ACE/debianbuild/tao-event.install
+++ b/ACE/debian/tao-event.install
diff --git a/ACE/debianbuild/tao-ft.docs b/ACE/debian/tao-ft.docs
index 2ba85e3736d..2ba85e3736d 100644
--- a/ACE/debianbuild/tao-ft.docs
+++ b/ACE/debian/tao-ft.docs
diff --git a/ACE/debianbuild/tao-ft.install b/ACE/debian/tao-ft.install
index 54f6167bc6d..54f6167bc6d 100644
--- a/ACE/debianbuild/tao-ft.install
+++ b/ACE/debian/tao-ft.install
diff --git a/ACE/debianbuild/tao-ftrtevent.install b/ACE/debian/tao-ftrtevent.install
index df412324715..df412324715 100644
--- a/ACE/debianbuild/tao-ftrtevent.install
+++ b/ACE/debian/tao-ftrtevent.install
diff --git a/ACE/debianbuild/tao-idl.install b/ACE/debian/tao-idl.install
index 84f7a05b480..84f7a05b480 100644
--- a/ACE/debianbuild/tao-idl.install
+++ b/ACE/debian/tao-idl.install
diff --git a/ACE/debianbuild/tao-idl.links b/ACE/debian/tao-idl.links
index a331370709b..a331370709b 100644
--- a/ACE/debianbuild/tao-idl.links
+++ b/ACE/debian/tao-idl.links
diff --git a/ACE/debianbuild/tao-idl.manpages b/ACE/debian/tao-idl.manpages
index bbaa6e3fb67..bbaa6e3fb67 100644
--- a/ACE/debianbuild/tao-idl.manpages
+++ b/ACE/debian/tao-idl.manpages
diff --git a/ACE/debianbuild/tao-ifr.docs b/ACE/debian/tao-ifr.docs
index 4b680d8f663..4b680d8f663 100644
--- a/ACE/debianbuild/tao-ifr.docs
+++ b/ACE/debian/tao-ifr.docs
diff --git a/ACE/debianbuild/tao-ifr.install b/ACE/debian/tao-ifr.install
index e281cfffc67..e281cfffc67 100644
--- a/ACE/debianbuild/tao-ifr.install
+++ b/ACE/debian/tao-ifr.install
diff --git a/ACE/debianbuild/tao-imr.docs b/ACE/debian/tao-imr.docs
index 015d20b03f7..015d20b03f7 100644
--- a/ACE/debianbuild/tao-imr.docs
+++ b/ACE/debian/tao-imr.docs
diff --git a/ACE/debianbuild/tao-imr.install b/ACE/debian/tao-imr.install
index 1054516f613..1054516f613 100644
--- a/ACE/debianbuild/tao-imr.install
+++ b/ACE/debian/tao-imr.install
diff --git a/ACE/debianbuild/tao-lifecycle.install b/ACE/debian/tao-lifecycle.install
index a34fa7b8ee6..a34fa7b8ee6 100644
--- a/ACE/debianbuild/tao-lifecycle.install
+++ b/ACE/debian/tao-lifecycle.install
diff --git a/ACE/debianbuild/tao-load.docs b/ACE/debian/tao-load.docs
index d9c83468cb0..d9c83468cb0 100644
--- a/ACE/debianbuild/tao-load.docs
+++ b/ACE/debian/tao-load.docs
diff --git a/ACE/debianbuild/tao-load.install b/ACE/debian/tao-load.install
index 203a48c0296..203a48c0296 100644
--- a/ACE/debianbuild/tao-load.install
+++ b/ACE/debian/tao-load.install
diff --git a/ACE/debianbuild/tao-log.docs b/ACE/debian/tao-log.docs
index 8a75e5909f2..8a75e5909f2 100644
--- a/ACE/debianbuild/tao-log.docs
+++ b/ACE/debian/tao-log.docs
diff --git a/ACE/debianbuild/tao-log.install b/ACE/debian/tao-log.install
index f2197fef495..f2197fef495 100644
--- a/ACE/debianbuild/tao-log.install
+++ b/ACE/debian/tao-log.install
diff --git a/ACE/debianbuild/tao-log.manpages b/ACE/debian/tao-log.manpages
index b94e70dc2db..b94e70dc2db 100644
--- a/ACE/debianbuild/tao-log.manpages
+++ b/ACE/debian/tao-log.manpages
diff --git a/ACE/debianbuild/tao-naming.docs b/ACE/debian/tao-naming.docs
index 1f38248a647..1f38248a647 100644
--- a/ACE/debianbuild/tao-naming.docs
+++ b/ACE/debian/tao-naming.docs
diff --git a/ACE/debianbuild/tao-naming.install b/ACE/debian/tao-naming.install
index d76b87af15c..d76b87af15c 100644
--- a/ACE/debianbuild/tao-naming.install
+++ b/ACE/debian/tao-naming.install
diff --git a/ACE/debianbuild/tao-notify.docs b/ACE/debian/tao-notify.docs
index 08af3d3f8fe..08af3d3f8fe 100644
--- a/ACE/debianbuild/tao-notify.docs
+++ b/ACE/debian/tao-notify.docs
diff --git a/ACE/debianbuild/tao-notify.install b/ACE/debian/tao-notify.install
index 40deedfaf5a..40deedfaf5a 100644
--- a/ACE/debianbuild/tao-notify.install
+++ b/ACE/debian/tao-notify.install
diff --git a/ACE/debianbuild/tao-rtevent.install b/ACE/debian/tao-rtevent.install
index 48ff34c9df0..48ff34c9df0 100644
--- a/ACE/debianbuild/tao-rtevent.install
+++ b/ACE/debian/tao-rtevent.install
diff --git a/ACE/debianbuild/tao-scheduling.install b/ACE/debian/tao-scheduling.install
index 5dfc36c35d8..5dfc36c35d8 100644
--- a/ACE/debianbuild/tao-scheduling.install
+++ b/ACE/debian/tao-scheduling.install
diff --git a/ACE/debianbuild/tao-time.docs b/ACE/debian/tao-time.docs
index d474eb065e6..d474eb065e6 100644
--- a/ACE/debianbuild/tao-time.docs
+++ b/ACE/debian/tao-time.docs
diff --git a/ACE/debianbuild/tao-time.install b/ACE/debian/tao-time.install
index f179e39461c..f179e39461c 100644
--- a/ACE/debianbuild/tao-time.install
+++ b/ACE/debian/tao-time.install
diff --git a/ACE/debianbuild/tao-trading.docs b/ACE/debian/tao-trading.docs
index 5c5869da934..5c5869da934 100644
--- a/ACE/debianbuild/tao-trading.docs
+++ b/ACE/debian/tao-trading.docs
diff --git a/ACE/debianbuild/tao-trading.install b/ACE/debian/tao-trading.install
index 61109722f34..61109722f34 100644
--- a/ACE/debianbuild/tao-trading.install
+++ b/ACE/debian/tao-trading.install
diff --git a/ACE/debianbuild/tao-utils.docs b/ACE/debian/tao-utils.docs
index 3d8830cfa42..3d8830cfa42 100644
--- a/ACE/debianbuild/tao-utils.docs
+++ b/ACE/debian/tao-utils.docs
diff --git a/ACE/debianbuild/tao-utils.install b/ACE/debian/tao-utils.install
index bb19843035e..bb19843035e 100644
--- a/ACE/debianbuild/tao-utils.install
+++ b/ACE/debian/tao-utils.install
diff --git a/ACE/debianbuild/tao_idl b/ACE/debian/tao_idl
index 2d48cb8614e..2d48cb8614e 100644
--- a/ACE/debianbuild/tao_idl
+++ b/ACE/debian/tao_idl
diff --git a/ACE/debianbuild/tao_ifr b/ACE/debian/tao_ifr
index baf5a4c7698..baf5a4c7698 100644
--- a/ACE/debianbuild/tao_ifr
+++ b/ACE/debian/tao_ifr
diff --git a/ACE/debianbuild/watch b/ACE/debian/watch
index ecc70a07613..ecc70a07613 100644
--- a/ACE/debianbuild/watch
+++ b/ACE/debian/watch