Synchronize ACE/debian with contents of Debian source repository

Incorporate changes from the Debian source repository [1], but keep
the package version current (and where the package version is wrong,
correct it). Also fix corrupted version checks for external package
dependencies.

This does not introduce additional scripts from the repository that
are unused when building packages.

[1]: git://anonscm.debian.org/pkg-ace/pkg-ace.git

33 files changed, 112 insertions, 75 deletions

diff --git a/ACE/debian/ACE-DPKG.mwc b/ACE/debian/ACE-DPKG.mwc
new file mode 100644
index 00000000000..b7e05296932
--- /dev/null
+++ b/ACE/debian/ACE-DPKG.mwc
@@ -0,0 +1,29 @@
+workspace {
+  exclude {
+    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..0a8a196a7ac 100644..100755
--- a/ACE/debian/debian.rules
+++ b/ACE/debian/rules
@@ -79,9 +79,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 +95,7 @@ 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-6_4_7
 
 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