29 files changed, 17 insertions, 40 deletions
diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py
index 8186bdac1bc..968f31a520e 100755
--- a/ACE/bin/make_release.py
+++ b/ACE/bin/make_release.py
@@ -333,37 +333,6 @@ def update_debianbuild ():
     def update_ver (match):
         return match.group (1) + match.group (2) + comp_versions["ACE_version"] + match.group (4)
 
-    # find files in debian/* matching mask
-    for fname in listdir(dname):
-        match = mask.search (fname)
-        if match is None:
-            continue
-
-        fnewname = update_ver (match)
-        prev_ace_ver = match.group (3)
-
-        # if file contains lintian overrides, update file
-        if match.group (4) == '.lintian-overrides':
-            with open (dname + fname, 'r+') as lintian_overrides_file:
-                new_lintian_overrides = ""
-                for line in lintian_overrides_file.readlines ():
-                    new_lintian_overrides += mask.sub (update_ver, line)
-
-                if opts.take_action:
-                    lintian_overrides_file.seek (0)
-                    lintian_overrides_file.truncate (0)
-                    lintian_overrides_file.writelines (new_lintian_overrides)
-                else:
-                    print "New lintian-overrides file:"
-                    print "".join (new_lintian_overrides)
-
-            files.append (dname + fnewname)
-
-        # rename file
-        print "Rename: " + dname + fname + " to " + dname + fnewname + "\n"
-        if opts.take_action:
-            ex ("git mv " + dname + fname + " " + dname + fnewname)
-
     # update debian/control
     with open (dname + "control", 'r+') as control_file:
         new_ctrl = ""
@@ -371,7 +340,7 @@ def update_debianbuild ():
             if re.search ("^(Package|Depends|Suggests):", line) is not None:
                 line = mask.sub (update_ver, line)
             elif re.search ('^Replaces:', line) is not None:
-                line = line.replace (prev_ace_ver, comp_versions["ACE_version"])
+                line = line.replace (old_comp_versions["ACE_version"], comp_versions["ACE_version"])
 
             new_ctrl += line
 
diff --git a/ACE/debian/copyright b/ACE/debian/copyright
index 65ccfadae41..1c385528952 100644
--- a/ACE/debian/copyright
+++ b/ACE/debian/copyright
@@ -11,7 +11,7 @@ It is now maintained by:
 It was downloaded from: <http://download.dre.vanderbilt.edu/>
 
 Files: *
-Copyright: © 1993-2011 Douglas C. Schmidt and his research group at
+Copyright: © 1993-2019 Douglas C. Schmidt and his research group at
              Washington University, University of California, Irvine,
              and Vanderbilt University
 License: other-BSD
diff --git a/ACE/debian/libace-6.5.8.docs b/ACE/debian/libace-VERSION.docs
index ca760171412..ca760171412 100644
--- a/ACE/debian/libace-6.5.8.docs
+++ b/ACE/debian/libace-VERSION.docs
diff --git a/ACE/debian/libace-6.5.8.install.in b/ACE/debian/libace-VERSION.install.in
index b47b7240eaf..b47b7240eaf 100644
--- a/ACE/debian/libace-6.5.8.install.in
+++ b/ACE/debian/libace-VERSION.install.in
diff --git a/ACE/debian/libace-flreactor-6.5.8.install.in b/ACE/debian/libace-flreactor-VERSION.install.in
index c49638be388..c49638be388 100644
--- a/ACE/debian/libace-flreactor-6.5.8.install.in
+++ b/ACE/debian/libace-flreactor-VERSION.install.in
diff --git a/ACE/debian/libace-foxreactor-6.5.8.install.in b/ACE/debian/libace-foxreactor-VERSION.install.in
index b2f7852a85e..b2f7852a85e 100644
--- a/ACE/debian/libace-foxreactor-6.5.8.install.in
+++ b/ACE/debian/libace-foxreactor-VERSION.install.in
diff --git a/ACE/debian/libace-htbp-6.5.8.install.in b/ACE/debian/libace-htbp-VERSION.install.in
index c0661044fd6..c0661044fd6 100644
--- a/ACE/debian/libace-htbp-6.5.8.install.in
+++ b/ACE/debian/libace-htbp-VERSION.install.in
diff --git a/ACE/debian/libace-inet-6.5.8.lintian-overrides b/ACE/debian/libace-inet-6.5.8.lintian-overrides
deleted file mode 100644
index 966bb20fa15..00000000000
--- a/ACE/debian/libace-inet-6.5.8.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-inet-6.5.8: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-inet-6.5.8.install.in b/ACE/debian/libace-inet-VERSION.install.in
index c8cddd876f2..c8cddd876f2 100644
--- a/ACE/debian/libace-inet-6.5.8.install.in
+++ b/ACE/debian/libace-inet-VERSION.install.in
diff --git a/ACE/debian/libace-inet-VERSION.lintian-overrides.in b/ACE/debian/libace-inet-VERSION.lintian-overrides.in
new file mode 100644
index 00000000000..4c0402dc3ca
--- /dev/null
+++ b/ACE/debian/libace-inet-VERSION.lintian-overrides.in
@@ -0,0 +1 @@
+libace-inet-@ACE_VERSION@: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-inet-ssl-6.5.8.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.8.lintian-overrides
deleted file mode 100644
index d9c2fccd6a6..00000000000
--- a/ACE/debian/libace-inet-ssl-6.5.8.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-inet-ssl-6.5.8: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-inet-ssl-6.5.8.install.in b/ACE/debian/libace-inet-ssl-VERSION.install.in
index 7646d569860..7646d569860 100644
--- a/ACE/debian/libace-inet-ssl-6.5.8.install.in
+++ b/ACE/debian/libace-inet-ssl-VERSION.install.in
diff --git a/ACE/debian/libace-inet-ssl-VERSION.lintian-overrides.in b/ACE/debian/libace-inet-ssl-VERSION.lintian-overrides.in
new file mode 100644
index 00000000000..89b9936b826
--- /dev/null
+++ b/ACE/debian/libace-inet-ssl-VERSION.lintian-overrides.in
@@ -0,0 +1,2 @@
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-inet-ssl-@ACE_VERSION@: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-rmcast-6.5.8.install.in b/ACE/debian/libace-rmcast-VERSION.install.in
index d39b3033b18..d39b3033b18 100644
--- a/ACE/debian/libace-rmcast-6.5.8.install.in
+++ b/ACE/debian/libace-rmcast-VERSION.install.in
diff --git a/ACE/debian/libace-ssl-6.5.8.lintian-overrides b/ACE/debian/libace-ssl-6.5.8.lintian-overrides
deleted file mode 100644
index 9fbdcac8f3a..00000000000
--- a/ACE/debian/libace-ssl-6.5.8.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-libace-ssl-6.5.8: extended-description-is-probably-too-short
-
-# It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-ssl-6.5.8: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-ssl-6.5.8.NEWS b/ACE/debian/libace-ssl-VERSION.NEWS
index e5bd0e4aa10..e5bd0e4aa10 100644
--- a/ACE/debian/libace-ssl-6.5.8.NEWS
+++ b/ACE/debian/libace-ssl-VERSION.NEWS
diff --git a/ACE/debian/libace-ssl-6.5.8.install.in b/ACE/debian/libace-ssl-VERSION.install.in
index 5f55d22a0ae..5f55d22a0ae 100644
--- a/ACE/debian/libace-ssl-6.5.8.install.in
+++ b/ACE/debian/libace-ssl-VERSION.install.in
diff --git a/ACE/debian/libace-ssl-VERSION.lintian-overrides.in b/ACE/debian/libace-ssl-VERSION.lintian-overrides.in
new file mode 100644
index 00000000000..4081161f4ba
--- /dev/null
+++ b/ACE/debian/libace-ssl-VERSION.lintian-overrides.in
@@ -0,0 +1,4 @@
+libace-ssl-@ACE_VERSION@: extended-description-is-probably-too-short
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-ssl-@ACE_VERSION@: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-tkreactor-6.5.8.install.in b/ACE/debian/libace-tkreactor-VERSION.install.in
index abd630df6c1..abd630df6c1 100644
--- a/ACE/debian/libace-tkreactor-6.5.8.install.in
+++ b/ACE/debian/libace-tkreactor-VERSION.install.in
diff --git a/ACE/debian/libace-tmcast-6.5.8.install.in b/ACE/debian/libace-tmcast-VERSION.install.in
index b6eda852bb3..b6eda852bb3 100644
--- a/ACE/debian/libace-tmcast-6.5.8.install.in
+++ b/ACE/debian/libace-tmcast-VERSION.install.in
diff --git a/ACE/debian/libace-xml-utils-6.5.8.install.in b/ACE/debian/libace-xml-utils-VERSION.install.in
index 082320b5e97..082320b5e97 100644
--- a/ACE/debian/libace-xml-utils-6.5.8.install.in
+++ b/ACE/debian/libace-xml-utils-VERSION.install.in
diff --git a/ACE/debian/libace-xtreactor-6.5.8.install.in b/ACE/debian/libace-xtreactor-VERSION.install.in
index 75d4b27ef61..75d4b27ef61 100644
--- a/ACE/debian/libace-xtreactor-6.5.8.install.in
+++ b/ACE/debian/libace-xtreactor-VERSION.install.in
diff --git a/ACE/debian/libacexml-6.5.8.docs b/ACE/debian/libacexml-VERSION.docs
index 002855d7915..002855d7915 100644
--- a/ACE/debian/libacexml-6.5.8.docs
+++ b/ACE/debian/libacexml-VERSION.docs
diff --git a/ACE/debian/libacexml-6.5.8.install.in b/ACE/debian/libacexml-VERSION.install.in
index b7d27d6a1f4..b7d27d6a1f4 100644
--- a/ACE/debian/libacexml-6.5.8.install.in
+++ b/ACE/debian/libacexml-VERSION.install.in
diff --git a/ACE/debian/libkokyu-6.5.8.docs b/ACE/debian/libkokyu-VERSION.docs
index e8869c513b2..e8869c513b2 100644
--- a/ACE/debian/libkokyu-6.5.8.docs
+++ b/ACE/debian/libkokyu-VERSION.docs
diff --git a/ACE/debian/libkokyu-6.5.8.install.in b/ACE/debian/libkokyu-VERSION.install.in
index f13089a8b0f..f13089a8b0f 100644
--- a/ACE/debian/libkokyu-6.5.8.install.in
+++ b/ACE/debian/libkokyu-VERSION.install.in
diff --git a/ACE/debian/libnetsvcs-6.5.8.docs b/ACE/debian/libnetsvcs-VERSION.docs
index 0b03c55b91f..0b03c55b91f 100644
--- a/ACE/debian/libnetsvcs-6.5.8.docs
+++ b/ACE/debian/libnetsvcs-VERSION.docs
diff --git a/ACE/debian/libnetsvcs-6.5.8.install.in b/ACE/debian/libnetsvcs-VERSION.install.in
index 36f10c3ec98..36f10c3ec98 100644
--- a/ACE/debian/libnetsvcs-6.5.8.install.in
+++ b/ACE/debian/libnetsvcs-VERSION.install.in
diff --git a/ACE/debian/rules b/ACE/debian/rules
index d7df711e919..62b2c3b5f91 100755
--- a/ACE/debian/rules
+++ b/ACE/debian/rules
@@ -39,18 +39,26 @@ export MPC_ROOT := $(ACE_ROOT)/MPC
 ACE_MAJOR_VERSION := $(shell awk '/ACE_MAJOR_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h)
 ACE_MINOR_VERSION := $(shell awk '/ACE_MINOR_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h)
 ACE_MICRO_VERSION := $(shell awk '/ACE_MICRO_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h)
+ACE_VERSION = ${ACE_MAJOR_VERSION}.${ACE_MINOR_VERSION}.${ACE_MICRO_VERSION}
 
 %:
 	dh $@
 
 # Implement our own configure machinery; it will copy Debian specific
 # configuration before launching MPC to generate ACE+TAO GNUmakefile
+#		fname1=echo $$fname; \
 .PHONY: configure
 configure: configure-stamp
 configure-stamp:
+	for fname in debian/*VERSION*; do \
+		cp $$fname $$(echo $$fname | \
+		sed -e 's/VERSION/${ACE_VERSION}/'); done
 	for flname in debian/*.install.in; do \
 		sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \
                 $$flname > $${flname%.in}; done
+	for flname in debian/*.lintian-overrides.in; do \
+		sed 's/@ACE_VERSION@/${ACE_VERSION}/g' \
+                $$flname > $${flname%.in}; done
 	cp debian/platform_macros.GNU $(ACE_ROOT)/include/makeinclude
 	cp debian/config*.h $(ACE_ROOT)/ace/
 	cp debian/default.features $(ACE_ROOT)/bin/MakeProjectCreator/config