Merge pull request #601 from dpward/master

RPM and Debian packaging fixes

38 files changed, 167 insertions, 210 deletions

diff --git a/ACE/THANKS b/ACE/THANKS
index 6072880a6fa..10b22318872 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -2324,7 +2324,7 @@ Tim Pinkawa <tpinkawa at eagleseven dot com>
 Ed Blackmond <ed dot blackmond at themis dot com>
 Dave <dwh0403 at 163 dot com>
 Inma Perea <inma dot perea dot fdz at gmail dot com>
-David Ward <dpward at mit dot edu>
+David Ward <david dot ward at ll dot mit dot edu>
 Anatoli Sakhnik <sakhnik at gmail dot com>
 Max Zhou <earthdog at 126 dot com>
 Daynesh Mangal <daynesh at gmail dot com>
diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py
index a55ba82d9da..d5042bc4ade 100755
--- a/ACE/bin/make_release.py
+++ b/ACE/bin/make_release.py
@@ -302,66 +302,64 @@ def update_spec_file ():
 
 def update_debianbuild ():
     """ Updates ACE_ROOT/debian directory.
-    - renames all files with version nrs in name to new scheme.
-    - updates version nrs in file debian/control
-    Currently ONLY ACE & TAO stuff is handled here """
+    - renames all files with version numbers in name; if file contains
+      lintian overrides, update version numbers inside file
+    - updates version numbers inside file debian/control
+    Currently ONLY ACE is handled here """
 
     global comp_versions
 
-    import glob
     import re
-    from os.path import basename
-    from os.path import dirname
-    from os.path import join
+    from os import listdir
 
     files = list ()
     prev_ace_ver = None
-    prev_tao_ver = None
 
-    # rename files
-    mask = re.compile ("(libace|libkokyu|libnetsvcs)(.*)(\d+\.\d+\.\d+)(.*)")
-    tao = re.compile ("tao", re.IGNORECASE)
+    dname = doc_root + '/ACE_TAO/ACE/debian/'
 
-    for fname in glob.iglob(doc_root + '/ACE_TAO/ACE/debian/*'):
-        print "Considering " + fname
-        match = None
+    mask = re.compile ("(libace|libACE|libkokyu|libKokyu|libnetsvcs)([^\s,:]*-)(\d+\.\d+\.\d+)([^\s,:]*)")
 
-        fbase = basename (fname)
+    def update_ver (match):
+        return match.group (1) + match.group (2) + comp_versions["ACE_version"] + match.group (4)
 
-        match = mask.search (fbase)
-        fnewname = None
-        if match is not None:
-            if tao.search (fbase) is not None:
-                fnewname = join (dirname (fname), match.group (1) + match.group (2) + comp_versions["TAO_version"] + match.group (4))
-                prev_tao_ver = match.group (3)
-            else:
-                fnewname = join (dirname (fname), match.group (1) + match.group (2) + comp_versions["ACE_version"] + match.group (4))
-                prev_ace_ver = match.group (3)
+    # find files in debian/* matching mask
+    for fname in listdir(dname):
+        match = mask.search (fname)
+        if match is None:
+            continue
 
-        print prev_ace_ver
-#        print prev_tao_var
+        fnewname = update_ver (match)
+        prev_ace_ver = match.group (3)
 
-        if fnewname is not None:
-            if opts.take_action:
-                print "Rename: " + fname + " to " + fnewname + "\n"
-                ex ("git mv " + fname + " " + fnewname)
-            else:
-                print "Rename: " + fname + " to " + fnewname + "\n"
+        # 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)
 
-    # update debianbuild/control
-    def update_ver (match):
-        if match.group (1) == 'libtao':
-            return match.group (1) + match.group (2) + comp_versions["TAO_version"] + match.group (4)
-        else:
-            return match.group (1) + match.group (2) + comp_versions["ACE_version"] + match.group (4)
+                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)
 
-    with open (doc_root + "/ACE_TAO/ACE/debian/debian.control", 'r+') as control_file:
+            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 = ""
         for line in control_file.readlines ():
             if re.search ("^(Package|Depends|Suggests):", line) is not None:
                 line = mask.sub (update_ver, line)
             elif re.search ('^Replaces:', line) is not None:
-                print comp_versions["ACE_version"]
                 line = line.replace (prev_ace_ver, comp_versions["ACE_version"])
 
             new_ctrl += line
@@ -374,30 +372,7 @@ def update_debianbuild ():
             print "New control file:"
             print "".join (new_ctrl)
 
-    files.append (doc_root + "/ACE_TAO/ACE/debian/debian.control")
-
-    # rewrite debian/dsc
-    dsc_lines = """Format: 1.0
-Source: ACE+src-%s
-Version: %s
-Binary: ace
-Maintainer: Johnny Willemsen  <jwillemsen@remedy.nl>
-Architecture: any
-Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, docbook-to-man, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev
-Files:
- 65b34001c9605f056713a7e146b052d1 46346654 ACE-src-%s.tar.gz
-
-""" % (comp_versions["ACE_version"], comp_versions["TAO_version"], comp_versions["ACE_version"])
-    if opts.take_action:
-        with open (doc_root + "/ACE_TAO/ACE/debian/ace.dsc", 'r+') as dsc_file:
-            dsc_file.seek (0)
-            dsc_file.truncate (0)
-            dsc_file.writelines (dsc_lines)
-    else:
-        print "New dsc file:\n"
-        print dsc_lines
-
-    files.append (doc_root + "/ACE_TAO/ACE/debian/ace.dsc")
+    files.append (dname + "control")
 
     return files
 
diff --git a/ACE/debian/ACE-DPKG.mwc b/ACE/debian/ACE-DPKG.mwc
new file mode 100644
index 00000000000..cdbfe475b9f
--- /dev/null
+++ b/ACE/debian/ACE-DPKG.mwc
@@ -0,0 +1,31 @@
+workspace {
+  exclude {
+    TAO
+
+    performance-tests
+
+    examples
+    ACEXML/examples
+    ASNMP
+
+    tests
+    Kokyu/tests
+    ACEXML/tests
+    apps/gperf/tests
+    apps/drwho
+    apps/Gateway
+    apps/AWS
+    apps/JAWS
+    apps/JAWS2
+    apps/JAWS3
+    apps/mkcsregdb
+    apps/soreduce
+
+    websvcs
+    contrib
+    protocols/tests
+    protocols/examples
+
+    netsvcs/clients
+  }
+}
diff --git a/ACE/debian/TOREMOVE b/ACE/debian/TOREMOVE
deleted file mode 100644
index b2ceb242f5a..00000000000
--- a/ACE/debian/TOREMOVE
+++ /dev/null
@@ -1,25 +0,0 @@
-TAO/orbsvcs/orbsvcs/LB_ORTS.cpp
-TAO/orbsvcs/orbsvcs/SecurityLevel3S.cpp
-TAO/orbsvcs/orbsvcs/SecurityLevel3S.h
-TAO/orbsvcs/orbsvcs/RtecEventCommS.inl
-TAO/orbsvcs/orbsvcs/RtecUDPAdminS_T.h
-TAO/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h
-TAO/orbsvcs/orbsvcs/RtecEventCommS.cpp
-TAO/orbsvcs/orbsvcs/GSSUPS.cpp
-TAO/orbsvcs/orbsvcs/RtecEventChannelAdminS.inl
-TAO/orbsvcs/orbsvcs/GSSUPS.h
-TAO/orbsvcs/orbsvcs/RtecDefaultEventDataS.h
-TAO/orbsvcs/orbsvcs/RtecEventCommS.h
-TAO/orbsvcs/orbsvcs/RtecUDPAdminS.cpp
-TAO/orbsvcs/orbsvcs/RtecEventChannelAdminS.cpp
-TAO/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h
-TAO/orbsvcs/orbsvcs/RtecDefaultEventDataS.inl
-TAO/orbsvcs/orbsvcs/CSIIOPS.cpp
-TAO/orbsvcs/orbsvcs/RtecEventChannelAdminS.h
-TAO/orbsvcs/orbsvcs/RtecUDPAdminS.inl
-TAO/orbsvcs/orbsvcs/RtecEventCommS_T.h
-TAO/orbsvcs/orbsvcs/CSIIOPS.h
-TAO/orbsvcs/orbsvcs/RtecDefaultEventDataS.cpp
-TAO/orbsvcs/orbsvcs/CSIS.h
-TAO/orbsvcs/orbsvcs/CSIS.cpp
-TAO/orbsvcs/orbsvcs/RtecUDPAdminS.h
diff --git a/ACE/debian/ace-netsvcs.doc-base b/ACE/debian/ace-netsvcs.doc-base
new file mode 100644
index 00000000000..9e20176dac6
--- /dev/null
+++ b/ACE/debian/ace-netsvcs.doc-base
@@ -0,0 +1,10 @@
+Document: ace-netsvcs
+Title: ACE network services
+Author: Douglas C. Schmidt and his research group
+Abstract: This document describes the ACE network services: naming, time,
+ token, and logging services.
+Section: Programming/C++
+
+Format: html
+Index: /usr/share/doc/ace-netsvcs/ACE-netsvcs.html
+Files: /usr/share/doc/ace-netsvcs/*.html
diff --git a/ACE/debian/ace-netsvcs.docs b/ACE/debian/ace-netsvcs.docs
new file mode 100644
index 00000000000..307913e25f2
--- /dev/null
+++ b/ACE/debian/ace-netsvcs.docs
@@ -0,0 +1,3 @@
+PROBLEM-REPORT-FORM
+netsvcs/servers/README
+netsvcs/ACE-netsvcs.html
diff --git a/ACE/debian/ace-netsvcs.install b/ACE/debian/ace-netsvcs.install
new file mode 100644
index 00000000000..61f06619abb
--- /dev/null
+++ b/ACE/debian/ace-netsvcs.install
@@ -0,0 +1,2 @@
+../../netsvcs/servers/ace_netsvcs usr/bin
+../../netsvcs/servers/svc.conf* usr/share/ace-netsvcs
diff --git a/ACE/debian/ace-netsvcs.manpages b/ACE/debian/ace-netsvcs.manpages
new file mode 100644
index 00000000000..43bf0f7a731
--- /dev/null
+++ b/ACE/debian/ace-netsvcs.manpages
@@ -0,0 +1 @@
+debian/ace_netsvcs.1
diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc
deleted file mode 100644
index 5e386aaf397..00000000000
--- a/ACE/debian/ace.dsc
+++ /dev/null
@@ -1,10 +0,0 @@
-Format: 1.0
-Source: ACE+src-6.4.7
-Version: 2.4.7
-Binary: ace
-Maintainer: Johnny Willemsen  <jwillemsen@remedy.nl>
-Architecture: any
-Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, docbook-to-man, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev
-Files:
- 65b34001c9605f056713a7e146b052d1 46346654 ACE-src-6.4.7.tar.gz
-
diff --git a/ACE/debian/debian.changelog b/ACE/debian/changelog
index ed34c59f384..ed34c59f384 100644
--- a/ACE/debian/debian.changelog
+++ b/ACE/debian/changelog
diff --git a/ACE/debian/debian.control b/ACE/debian/control
index 20c2ed49c96..f9fc99c8e62 100644
--- a/ACE/debian/debian.control
+++ b/ACE/debian/control
@@ -154,7 +154,7 @@ Description: ACE Inet protocol library - development files
 Package: libace-inet-ssl-6.4.7
 Architecture: any
 Section: libs
-Depends: libace-inet-6.4.6, libace-ssl-6.4.7, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.4.7, libace-ssl-6.4.7, ${shlibs:Depends}, ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library
  This package provides an ACE addon library for clients (and possibly
  servers at some point) using Inet protocols which support SSL, such as
@@ -257,7 +257,7 @@ Description: ACE-GUI reactor integration for Xt
 Package: libace-xtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-xtreactor-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.4.7), ${misc:Depends}
+Depends: libace-xtreactor-6.4.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
 Description: ACE-GUI reactor integration for Xt - development files
  This package contains header files and static library for the ACE-Xt
  reactor integration.
@@ -304,7 +304,7 @@ Description: ACE-GUI reactor integration for FLTK
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-flreactor-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.4.7), ${misc:Depends}
+Depends: libace-flreactor-6.4.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
 Description: ACE-GUI reactor integration for FLTK - development files
  This package contains header files and static library for the ACE-FLTK
  reactor integration.
diff --git a/ACE/debian/debian.compat b/ACE/debian/debian.compat
deleted file mode 100644
index ec635144f60..00000000000
--- a/ACE/debian/debian.compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ACE/debian/get-orig-source.sh b/ACE/debian/get-orig-source.sh
new file mode 100755
index 00000000000..4d3df97152b
--- /dev/null
+++ b/ACE/debian/get-orig-source.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+set -ex
+
+UPSTREAM_VERSION=$2
+ORIG_TARBALL=../ace_${UPSTREAM_VERSION}.orig.tar.gz
+
+REAL_TARBALL=`readlink -f ${ORIG_TARBALL}`
+
+WORKING_DIR=`dirname ${ORIG_TARBALL}`
+
+ORIG_TARBALL_DFSG=`echo ${ORIG_TARBALL} | sed -e "s/\(${UPSTREAM_VERSION}\)\(\.orig\)/\1+dfsg\2/g"`
+ORIG_TARBALL_DIR=`echo ${ORIG_TARBALL_DFSG} | sed -e "s/_\(${UPSTREAM_VERSION}\)/-\1/g" -e "s/\.tar\.gz//g"`
+ORIG_TARBALL_DIR_STRIP=`basename ${ORIG_TARBALL_DIR}`
+
+mkdir -p ${ORIG_TARBALL_DIR}
+tar --directory=${ORIG_TARBALL_DIR} --strip 1 -xzf ${REAL_TARBALL} || exit 1
+rm -f ${ORIG_TARBALL} ${REAL_TARBALL}
+
+cd ${ORIG_TARBALL_DIR}
+
+rm -rf ASNMP
+rm -rf performance-tests
+rm -rf rpmbuild debian
+rm -rf websvcs
+rm bin/LabVIEW_RT/*.exe
+rm -rf examples/C++NPv2
+rm -rf examples/C++NPv1
+rm -rf examples/APG
+
+GZIP=-9 tar --remove-files -czf ${ORIG_TARBALL_DFSG} ${ORIG_TARBALL_DIR} || exit 1
+
+exit 0
diff --git a/ACE/debian/libace-6.4.7.lintian-overrides b/ACE/debian/libace-6.4.7.lintian-overrides
index 240f8e08d0c..468b430838b 100644
--- a/ACE/debian/libace-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-6.4.7.lintian-overrides
@@ -1,6 +1,6 @@
-libace-6.4.5: no-symbols-control-file usr/lib/libACE-6.4.5.so
-libace-6.4.5: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.4.5.so
-libace-6.4.5: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.4.5.so
-libace-6.4.5: no-symbols-control-file usr/lib/libACE_ETCL-6.4.5.so
-libace-6.4.5: no-symbols-control-file usr/lib/libACE_RLECompression-6.4.5.so
-libace-6.4.5: no-symbols-control-file usr/lib/libACE_Compression-6.4.5.so
+libace-6.4.7: no-symbols-control-file usr/lib/libACE-6.4.7.so
+libace-6.4.7: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.4.7.so
+libace-6.4.7: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.4.7.so
+libace-6.4.7: no-symbols-control-file usr/lib/libACE_ETCL-6.4.7.so
+libace-6.4.7: no-symbols-control-file usr/lib/libACE_RLECompression-6.4.7.so
+libace-6.4.7: no-symbols-control-file usr/lib/libACE_Compression-6.4.7.so
diff --git a/ACE/debian/libace-flreactor-6.4.7.lintian-overrides b/ACE/debian/libace-flreactor-6.4.7.lintian-overrides
index 4b58af00d10..f280d745380 100644
--- a/ACE/debian/libace-flreactor-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-flreactor-6.4.7.lintian-overrides
@@ -1 +1 @@
-libace-flreactor-6.4.5: no-symbols-control-file usr/lib/libACE_FlReactor-6.4.5.so
+libace-flreactor-6.4.7: no-symbols-control-file usr/lib/libACE_FlReactor-6.4.7.so
diff --git a/ACE/debian/libace-foxreactor-6.4.7.lintian-overrides b/ACE/debian/libace-foxreactor-6.4.7.lintian-overrides
index 61c403e638b..a8ade20654d 100644
--- a/ACE/debian/libace-foxreactor-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-foxreactor-6.4.7.lintian-overrides
@@ -1 +1 @@
-libace-foxreactor-6.4.5: no-symbols-control-file usr/lib/libACE_FoxReactor-6.4.5.so
+libace-foxreactor-6.4.7: no-symbols-control-file usr/lib/libACE_FoxReactor-6.4.7.so
diff --git a/ACE/debian/libace-htbp-6.4.7.lintian-overrides b/ACE/debian/libace-htbp-6.4.7.lintian-overrides
index 32697f5e2c0..151a2aa10a9 100644
--- a/ACE/debian/libace-htbp-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-htbp-6.4.7.lintian-overrides
@@ -1 +1 @@
-libace-htbp-6.4.5: no-symbols-control-file usr/lib/libACE_HTBP-6.4.5.so
+libace-htbp-6.4.7: no-symbols-control-file usr/lib/libACE_HTBP-6.4.7.so
diff --git a/ACE/debian/libace-inet-6.4.7.lintian-overrides b/ACE/debian/libace-inet-6.4.7.lintian-overrides
index afb8bb9f959..0fc5348e278 100644
--- a/ACE/debian/libace-inet-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-inet-6.4.7.lintian-overrides
@@ -1,2 +1,2 @@
-libace-inet-6.4.5: extended-description-is-probably-too-short
-libace-inet-6.4.5: no-symbols-control-file usr/lib/libACE_INet-6.4.5.so
+libace-inet-6.4.7: extended-description-is-probably-too-short
+libace-inet-6.4.7: no-symbols-control-file usr/lib/libACE_INet-6.4.7.so
diff --git a/ACE/debian/libace-inet-ssl-6.4.7.lintian-overrides b/ACE/debian/libace-inet-ssl-6.4.7.lintian-overrides
index dcf77c5c4a0..448bd49cbe1 100644
--- a/ACE/debian/libace-inet-ssl-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-inet-ssl-6.4.7.lintian-overrides
@@ -1,4 +1,4 @@
-libace-inet-ssl-6.4.5: no-symbols-control-file usr/lib/libACE_INet_SSL-6.4.5.so
+libace-inet-ssl-6.4.7: no-symbols-control-file usr/lib/libACE_INet_SSL-6.4.7.so
 
 # It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-inet-ssl-6.4.5: possible-gpl-code-linked-with-openssl
+libace-inet-ssl-6.4.7: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-qtreactor-6.4.7.install b/ACE/debian/libace-qtreactor-6.4.7.install
deleted file mode 100644
index 1d371e1e571..00000000000
--- a/ACE/debian/libace-qtreactor-6.4.7.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_QtReactor-*.so
diff --git a/ACE/debian/libace-qtreactor-6.4.7.lintian-overrides b/ACE/debian/libace-qtreactor-6.4.7.lintian-overrides
deleted file mode 100644
index 31bc9dc3867..00000000000
--- a/ACE/debian/libace-qtreactor-6.4.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-qtreactor-6.4.5: no-symbols-control-file usr/lib/libACE_QtReactor-6.4.5.so
diff --git a/ACE/debian/libace-qtreactor-dev.install b/ACE/debian/libace-qtreactor-dev.install
deleted file mode 100644
index c5fd689c59a..00000000000
--- a/ACE/debian/libace-qtreactor-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libACE_QtReactor.so
-usr/include/ace/QtReactor
-usr/lib/pkgconfig/ACE_QtReactor.pc
diff --git a/ACE/debian/libace-qtreactor-dev.lintian-overrides b/ACE/debian/libace-qtreactor-dev.lintian-overrides
deleted file mode 100644
index 2bf18f7681a..00000000000
--- a/ACE/debian/libace-qtreactor-dev.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-qtreactor-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-rmcast-6.4.7.lintian-overrides b/ACE/debian/libace-rmcast-6.4.7.lintian-overrides
index 89d1e6523ce..63d10b11b9f 100644
--- a/ACE/debian/libace-rmcast-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-rmcast-6.4.7.lintian-overrides
@@ -1 +1 @@
-libace-rmcast-6.4.5: no-symbols-control-file usr/lib/libACE_RMCast-6.4.5.so
+libace-rmcast-6.4.7: no-symbols-control-file usr/lib/libACE_RMCast-6.4.7.so
diff --git a/ACE/debian/libace-ssl-6.4.7.lintian-overrides b/ACE/debian/libace-ssl-6.4.7.lintian-overrides
index 2b0bc5f692a..93aae1a9edd 100644
--- a/ACE/debian/libace-ssl-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-ssl-6.4.7.lintian-overrides
@@ -1,5 +1,5 @@
-libace-ssl-6.4.5: extended-description-is-probably-too-short
-libace-ssl-6.4.5: no-symbols-control-file usr/lib/libACE_SSL-6.4.5.so
+libace-ssl-6.4.7: extended-description-is-probably-too-short
+libace-ssl-6.4.7: no-symbols-control-file usr/lib/libACE_SSL-6.4.7.so
 
 # It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-ssl-6.4.5: possible-gpl-code-linked-with-openssl
+libace-ssl-6.4.7: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-tkreactor-6.4.7.lintian-overrides b/ACE/debian/libace-tkreactor-6.4.7.lintian-overrides
index 836f6d37a9f..4bf8830fa9e 100644
--- a/ACE/debian/libace-tkreactor-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-tkreactor-6.4.7.lintian-overrides
@@ -1 +1 @@
-libace-tkreactor-6.4.5: no-symbols-control-file usr/lib/libACE_TkReactor-6.4.5.so
+libace-tkreactor-6.4.7: no-symbols-control-file usr/lib/libACE_TkReactor-6.4.7.so
diff --git a/ACE/debian/libace-tmcast-6.4.7.lintian-overrides b/ACE/debian/libace-tmcast-6.4.7.lintian-overrides
index fbb009770a6..eaf1def89d4 100644
--- a/ACE/debian/libace-tmcast-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-tmcast-6.4.7.lintian-overrides
@@ -1 +1 @@
-libace-tmcast-6.4.5: no-symbols-control-file usr/lib/libACE_TMCast-6.4.5.so
+libace-tmcast-6.4.7: no-symbols-control-file usr/lib/libACE_TMCast-6.4.7.so
diff --git a/ACE/debian/libace-xml-utils-6.4.7.lintian-overrides b/ACE/debian/libace-xml-utils-6.4.7.lintian-overrides
index dfe499a9dbb..b5662dc4b6f 100644
--- a/ACE/debian/libace-xml-utils-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-xml-utils-6.4.7.lintian-overrides
@@ -1 +1 @@
-libace-xml-utils-6.4.5: no-symbols-control-file usr/lib/libACE_XML_Utils-6.4.5.so
+libace-xml-utils-6.4.7: no-symbols-control-file usr/lib/libACE_XML_Utils-6.4.7.so
diff --git a/ACE/debian/libace-xtreactor-6.4.7.lintian-overrides b/ACE/debian/libace-xtreactor-6.4.7.lintian-overrides
index 683006fa589..197f8bb0866 100644
--- a/ACE/debian/libace-xtreactor-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-xtreactor-6.4.7.lintian-overrides
@@ -1 +1 @@
-libace-xtreactor-6.4.5: no-symbols-control-file usr/lib/libACE_XtReactor-6.4.5.so
+libace-xtreactor-6.4.7: no-symbols-control-file usr/lib/libACE_XtReactor-6.4.7.so
diff --git a/ACE/debian/libacexml-6.4.7.lintian-overrides b/ACE/debian/libacexml-6.4.7.lintian-overrides
index 62753f80cfe..711cbf02321 100644
--- a/ACE/debian/libacexml-6.4.7.lintian-overrides
+++ b/ACE/debian/libacexml-6.4.7.lintian-overrides
@@ -1,3 +1,3 @@
-libacexml-6.4.5: no-symbols-control-file usr/lib/libACEXML_Parser-6.4.5.so
-libacexml-6.4.5: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.4.5.so
-libacexml-6.4.5: no-symbols-control-file usr/lib/libACEXML-6.4.5.so
+libacexml-6.4.7: no-symbols-control-file usr/lib/libACEXML_Parser-6.4.7.so
+libacexml-6.4.7: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.4.7.so
+libacexml-6.4.7: no-symbols-control-file usr/lib/libACEXML-6.4.7.so
diff --git a/ACE/debian/libkokyu-6.4.7.lintian-overrides b/ACE/debian/libkokyu-6.4.7.lintian-overrides
index 73e11dec443..bbdf1f09523 100644
--- a/ACE/debian/libkokyu-6.4.7.lintian-overrides
+++ b/ACE/debian/libkokyu-6.4.7.lintian-overrides
@@ -1 +1 @@
-libkokyu-6.4.5: no-symbols-control-file usr/lib/libKokyu-6.4.5.so
+libkokyu-6.4.7: no-symbols-control-file usr/lib/libKokyu-6.4.7.so
diff --git a/ACE/debian/libnetsvcs-6.4.7.lintian-overrides b/ACE/debian/libnetsvcs-6.4.7.lintian-overrides
index 6ae68da92a4..eb9155573b5 100644
--- a/ACE/debian/libnetsvcs-6.4.7.lintian-overrides
+++ b/ACE/debian/libnetsvcs-6.4.7.lintian-overrides
@@ -1 +1 @@
-libnetsvcs-6.4.5: no-symbols-control-file usr/lib/libnetsvcs-6.4.5.so
+libnetsvcs-6.4.7: no-symbols-control-file usr/lib/libnetsvcs-6.4.7.so
diff --git a/ACE/debian/debian.rules b/ACE/debian/rules
index 9078a188dab..2bc9510ec4f 100644..100755
--- a/ACE/debian/debian.rules
+++ b/ACE/debian/rules
@@ -36,6 +36,10 @@ export ACE_ROOT := $(shell pwd)
 export MPC_ROOT := $(ACE_ROOT)/MPC
 export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib
 
+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)
+
 %:
 	dh $@
 
@@ -79,9 +83,6 @@ override_dh_auto_clean:
 	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
-# are not removed on make realclean
-	rm -f `cat debian/TOREMOVE`
 	rm -Rf $(ACE_ROOT)/html/libace-doc \
 		$(ACE_ROOT)/html/libacexml-doc \
 		$(ACE_ROOT)/doxygen_sqlite3.db
@@ -98,7 +99,8 @@ override_dh_installchangelogs:
 	dh_installchangelogs -pace-gperf -pgperf-ace apps/gperf/ChangeLog
 	dh_installchangelogs -pmpc-ace MPC/ChangeLog
 	dh_installchangelogs $(addprefix -p,$(ALL_ACEXML)) ACEXML/ChangeLog
-	dh_installchangelogs --remaining-packages ChangeLogs/ACE-6_4_5
+	dh_installchangelogs --remaining-packages \
+	        ChangeLogs/ACE-$(ACE_MAJOR_VERSION)_$(ACE_MINOR_VERSION)_$(ACE_MICRO_VERSION)
 
 override_dh_fixperms:
 ifneq (,$(filter libace-doc, $(shell dh_listpackages)))
diff --git a/ACE/debian/source/format b/ACE/debian/source/format
new file mode 100644
index 00000000000..163aaf8d82b
--- /dev/null
+++ b/ACE/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ACE/debian/source/lintian-overrides b/ACE/debian/source/lintian-overrides
new file mode 100644
index 00000000000..721df3d38a3
--- /dev/null
+++ b/ACE/debian/source/lintian-overrides
@@ -0,0 +1,3 @@
+# We are using a compat level marked as experimental 
+# (compat=9 in debhelper >= 8.1.3)
+ace source: package-needs-versioned-debhelper-build-depends 9
diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html
index d492b8832a3..b93eb95537f 100644
--- a/ACE/docs/bczar/bczar.html
+++ b/ACE/docs/bczar/bczar.html
@@ -419,16 +419,13 @@
       <li>
         Update the ACE/NEWS and TAO/NEWS files to have a new section for the next release.</li>
       <li>
-        Update OpenSuSE Build service using
+        Update openSUSE Build service using<br>
         <code>
-        osc checkout devel:libraries:ACE
-        osc add <new release>
-        cp rpmbuild/ace-tao.spec .
-        cp debian/control debian.control
-        cp debian/dsc ace.dsc
-        cp debian/changelog debian.changelog
-        cp debian/rules debian.rules
-        osc commit
+        osc checkout devel:libraries:ACE:micro ACE<br>
+        cd &quot;devel:libraries:ACE:micro/ACE&quot;<br>
+        osc rm ACE+TAO-src-*.tar.gz<br>
+        cp $DOC_ROOT/package-&lt;PID&gt;/ACE+TAO-src-*.tar.gz .<br>
+        osc commit<br>
         </code>
       </li>
       <li>
diff --git a/ACE/rpmbuild/ace-tao-macros.patch b/ACE/rpmbuild/ace-tao-macros.patch
deleted file mode 100644
index ca494dfa5c4..00000000000
--- a/ACE/rpmbuild/ace-tao-macros.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- ACE_wrappers/include/makeinclude/wrapper_macros.GNU.ORIG	2008-11-18 16:12:14.000000000 -0800
-+++ ACE_wrappers/include/makeinclude/wrapper_macros.GNU	2008-11-23 10:16:32.000000000 -0800
-@@ -299,13 +299,13 @@
- 
- #### Set up the build ACE version in case the platform_macros.GNU wants it.
- ifeq (cmd,$(findstring cmd,$(SHELL)))
--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_BETA_VERSION := $(shell awk "/ACE_BETA_VERSION/ { print $$3}" ${ACE_ROOT}/ace/Version.h)
--else
--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_BETA_VERSION := $(shell awk '/ACE_BETA_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h)
-+ACE_MAJOR_VERSION := $(shell awk "/ACE_MAJOR_VERSION/ { print $$3}" ${ACE_ROOT}/include/ace/Version.h)
-+ACE_MINOR_VERSION := $(shell awk "/ACE_MINOR_VERSION/ { print $$3}" ${ACE_ROOT}/include/ace/Version.h)
-+ACE_BETA_VERSION := $(shell awk "/ACE_BETA_VERSION/ { print $$3}" ${ACE_ROOT}/include/ace/Version.h)
-+else
-+ACE_MAJOR_VERSION := $(shell awk '/ACE_MAJOR_VERSION/ { print $$3}' ${ACE_ROOT}/include/ace/Version.h)
-+ACE_MINOR_VERSION := $(shell awk '/ACE_MINOR_VERSION/ { print $$3}' ${ACE_ROOT}/include/ace/Version.h)
-+ACE_BETA_VERSION := $(shell awk '/ACE_BETA_VERSION/ { print $$3}' ${ACE_ROOT}/include/ace/Version.h)
- endif
- 
- # Define some variables to silence warnings
-@@ -381,9 +381,11 @@
- IDL_SERVER_TSRC_EXT ?= S_T.cpp
- 
- ifeq (,$(findstring -I$(ACE_ROOT),$(INCLDIRS)))
--  INCLDIRS        += -I$(ACE_ROOT)
-+ifneq ("$(ACE_ROOT)","/usr")
-+  INCLDIRS        += -I$(ACE_ROOT)/include
- endif
--INSINC          ?= $(ACE_ROOT)/ace
-+endif
-+INSINC          ?= $(ACE_ROOT)/include/ace
- INSLIB          ?= $(ACE_ROOT)/lib
- INSMAN          ?= $(ACE_ROOT)/man
- ifeq (,$(findstring -L$(INSLIB),$(LDFLAGS)))
---- ACE_wrappers/TAO/rules.tao.GNU.ORIG	2008-11-23 10:13:02.000000000 -0800
-+++ ACE_wrappers/TAO/rules.tao.GNU	2008-11-22 20:43:49.000000000 -0800
-@@ -138,13 +138,13 @@
- # with different minor or major or beta versions to fail.
- #
- ifeq (cmd,$(findstring cmd,$(SHELL)))
--TAO_MAJOR_VERSION := $(shell awk "/TAO_MAJOR_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h)
--TAO_MINOR_VERSION := $(shell awk "/TAO_MINOR_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h)
--TAO_BETA_VERSION := $(shell awk "/TAO_BETA_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h)
-+TAO_MAJOR_VERSION := $(shell awk "/TAO_MAJOR_VERSION/ { print $$3}" ${TAO_ROOT}/include/tao/Version.h)
-+TAO_MINOR_VERSION := $(shell awk "/TAO_MINOR_VERSION/ { print $$3}" ${TAO_ROOT}/include/tao/Version.h)
-+TAO_BETA_VERSION := $(shell awk "/TAO_BETA_VERSION/ { print $$3}" ${TAO_ROOT}/include/tao/Version.h)
- else
--TAO_MAJOR_VERSION := $(shell awk '/TAO_MAJOR_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h)
--TAO_MINOR_VERSION := $(shell awk '/TAO_MINOR_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h)
--TAO_BETA_VERSION := $(shell awk '/TAO_BETA_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h)
-+TAO_MAJOR_VERSION := $(shell awk '/TAO_MAJOR_VERSION/ { print $$3}' ${TAO_ROOT}/include/tao/Version.h)
-+TAO_MINOR_VERSION := $(shell awk '/TAO_MINOR_VERSION/ { print $$3}' ${TAO_ROOT}/include/tao/Version.h)
-+TAO_BETA_VERSION := $(shell awk '/TAO_BETA_VERSION/ { print $$3}' ${TAO_ROOT}/include/tao/Version.h)
- endif
- # Version number of the libraries
- #
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index a91db76813a..e7cd5110617 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -83,7 +83,7 @@ BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define _extension .gz
 
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+%if 0%{?fedora} || 0%{?rhel}
 BuildRequires: redhat-rpm-config elfutils sendmail
 %endif
 
@@ -112,7 +112,7 @@ BuildRequires:  zlib-devel
 BuildRequires:  bzip2
 %endif
 
-BuildRequires:  perl
+BuildRequires:  perl perl(Data::Dumper)
 
 %if %{?_with_fltk:1}%{!?_with_fltk:0}
 BuildRequires:  fltk-devel