Merge all changes from the debian packaging effort

9 files changed, 30 insertions, 54 deletions

diff --git a/ACE/debian/README.source b/ACE/debian/README.source
index a18a0e64ed9..744eb818d06 100644
--- a/ACE/debian/README.source
+++ b/ACE/debian/README.source
@@ -23,31 +23,3 @@ When preparing a new release, there are several things to remember:
    from toplevel directory:
 
    $ debian/fix_doxygen.sh
-
- - Regenerate the list of include files for libace-inet-dev and
-   libace-inet-ssl-dev:
-
-   From debian/tmp:
-
-   $ find . -type f | grep -vi https | grep -vi ssl  --> These go to libace-inet-dev
-
-   The ones matching HTTPS or SSL go in libace-inet-ssl-dev.install:
-
-   usr/include/ace/INet/*SSL*
-   usr/include/ace/INet/*HTTPS*
-
-   But that might need updating if ACE_INet_SSL starts supporting FTPS or others
-
-   libace-inet-ssl-dev requires libace-inet-dev
-
-   Also, make sure none of the files in libace-inet-dev include anything from
-   libace-inet-ssl-dev. Test with:
-
-   From debian/tmp/usr/include/ace/INet:
-
-   $ find . -type f | grep -vi https | grep -vi ssl | xargs -I {} grep -Hi "include.*ssl"
-
-   $ find . -type f | grep -vi https | grep -vi ssl | xargs -I {} grep -Hi "include.*https"
-
-   (both should return nothing)
-
diff --git a/ACE/debian/debian.changelog b/ACE/debian/debian.changelog
index 97dddd47569..ed34c59f384 100644
--- a/ACE/debian/debian.changelog
+++ b/ACE/debian/debian.changelog
@@ -1,10 +1,22 @@
-ace (6.4.4+dfsg-1) unstable; urgency=medium
+ace (6.4.5+dfsg-1) unstable; urgency=medium
 
   [ Johnny Willemsen ]
-  * New upstream version
-  * Cleanup packaging
+  * New upstream version:
+    - fixes FTBFS with GCC-7. Closes: #853299.
+    - can use openssl 1.1. Closes: #851424.
+    - fixes GNU/FreeBSD FTBFS. Closes: #823592.
+  * Cleanup packaging:
+    - re-enable PIE. Closes: #859350.
+    - remove Marek from uploaders.
+
+  [ Thomas Girard ]
+  * Remove Pau from uploaders.
+  * Fix repackaging process by removing bashism.
+  * Remove QtReactor until it gets ported to Qt5. Closes: #874813.
+  * Remove d/p/37-remove-google-tracking.diff, no longer needed.
+  * Bump Standards-Version: to 4.1.0.
 
- -- Johnny Willemsen <jwillemsen@remedy.nl>  Mon, 4 Sep 2017 09:11:41 +0000
+ -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 16 Sep 2017 17:29:35 +0200
 
 ace (6.3.3+dfsg-1.2) unstable; urgency=medium
 
diff --git a/ACE/debian/debian.rules b/ACE/debian/debian.rules
index 655a47eb4ca..9078a188dab 100644
--- a/ACE/debian/debian.rules
+++ b/ACE/debian/debian.rules
@@ -35,7 +35,6 @@ ALL_ACEXML   := $(filter libacexml%,$(ALL_PACKAGES))
 export ACE_ROOT := $(shell pwd)
 export MPC_ROOT := $(ACE_ROOT)/MPC
 export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib
-export QTDIR := /usr/share/qt4
 
 %:
 	dh $@
@@ -53,15 +52,15 @@ configure-stamp:
 	touch $@
 
 override_dh_auto_build-arch: configure-stamp
-	$(MAKE) -C $(ACE_ROOT) $(DSO_MAKE_FLAG) $(FIXUP)
+	$(MAKE) -C $(ACE_ROOT) $(DSO_MAKE_FLAG)
 
 override_dh_auto_build-indep: configure-stamp
-	$(MAKE) -C $(ACE_ROOT) $(DSO_MAKE_FLAG) $(FIXUP)
+	$(MAKE) -C $(ACE_ROOT) $(DSO_MAKE_FLAG)
 	cd $(ACE_ROOT) && bin/generate_doxygen.pl -is_release -exclude_tao -exclude_ciao -exclude_dance
 	find $(ACE_ROOT)/html $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f
 
 override_dh_auto_install: manpages-stamp
-	$(MAKE) -C $(ACE_ROOT) install $(INSTALL_FLAGS) $(FIXUP)
+	$(MAKE) -C $(ACE_ROOT) install $(INSTALL_FLAGS)
 	mkdir -p $(DT)/usr/share/man/man1
 	cp $(ACE_ROOT)/apps/gperf/ace_gperf.1 $(DT)/usr/share/man/man1
 #	Relocate .idl and .pidl files
@@ -72,7 +71,7 @@ override_dh_auto_install: manpages-stamp
 	   done
 
 override_dh_auto_clean:
-	[ -f $(ACE_ROOT)/GNUmakefile ] && $(MAKE) -C $(ACE_ROOT) realclean $(DSO_MAKE_FLAG) $(FIXUP) || true
+	[ -f $(ACE_ROOT)/GNUmakefile ] && $(MAKE) -C $(ACE_ROOT) realclean $(DSO_MAKE_FLAG) || true
 	find $(ACE_ROOT) -name 'GNUmakefile*' -o -name '.depend.*' | xargs -r rm
 	rm -f $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
 	rm -f $(ACE_ROOT)/bin/MakeProjectCreator/config/default.features
@@ -99,7 +98,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_4
+	dh_installchangelogs --remaining-packages ChangeLogs/ACE-6_4_5
 
 override_dh_fixperms:
 ifneq (,$(filter libace-doc, $(shell dh_listpackages)))
diff --git a/ACE/debian/default.features b/ACE/debian/default.features
index c566ce08fc3..e1eb5270a02 100644
--- a/ACE/debian/default.features
+++ b/ACE/debian/default.features
@@ -17,9 +17,9 @@ ace_tkreactor   = 1
 fl              = 1
 ace_flreactor   = 1
 
-qt              = 1
-qt4             = 1
-ace_qtreactor   = 1
+qt              = 0
+qt4             = 0
+ace_qtreactor   = 0
 
 fox             = 1
 ace_foxreactor  = 1
diff --git a/ACE/debian/libace-6.4.5.lintian-overrides b/ACE/debian/libace-6.4.5.lintian-overrides
index 0da1475380e..240f8e08d0c 100644
--- a/ACE/debian/libace-6.4.5.lintian-overrides
+++ b/ACE/debian/libace-6.4.5.lintian-overrides
@@ -2,3 +2,5 @@ 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
diff --git a/ACE/debian/libace-dev.lintian-overrides b/ACE/debian/libace-dev.lintian-overrides
index 370eba1d7ad..1c42e72e101 100644
--- a/ACE/debian/libace-dev.lintian-overrides
+++ b/ACE/debian/libace-dev.lintian-overrides
@@ -2,6 +2,3 @@ libace-dev: extended-description-is-probably-too-short
 
 # Required by some downstreams that use custom-built ACE instead of system-wide ACE for development
 libace-dev: symlink-is-self-recursive usr/lib/ace/lib ..
-
-# It is indeed a script and lintian 2.5.26 seems to work fine, 2.5.25 reports the false positive
-libace-dev: executable-not-elf-or-script usr/lib/ace/bin/generate_export_file.pl
diff --git a/ACE/debian/libace-xml-utils-6.4.5.lintian-overrides b/ACE/debian/libace-xml-utils-6.4.5.lintian-overrides
index 3ae23978f97..dfe499a9dbb 100644
--- a/ACE/debian/libace-xml-utils-6.4.5.lintian-overrides
+++ b/ACE/debian/libace-xml-utils-6.4.5.lintian-overrides
@@ -1,2 +1 @@
-libace-xml-utils-6.4.5: extended-description-is-probably-too-short
 libace-xml-utils-6.4.5: no-symbols-control-file usr/lib/libACE_XML_Utils-6.4.5.so
diff --git a/ACE/debian/platform_macros.GNU b/ACE/debian/platform_macros.GNU
index 62e1a014c23..ae54f3863b9 100644
--- a/ACE/debian/platform_macros.GNU
+++ b/ACE/debian/platform_macros.GNU
@@ -8,16 +8,11 @@ xt             = 1
 tk             = 1
 fl             = 1
 fox            = 1
-qt4            = 1
-ace_qt4reactor = 1
+qt4            = 0
+ace_qt4reactor = 0
 
 xerces3        = 1
-
-# Work-around #593225
-ARMEL_TARGET := $(shell echo '__ARMEL__' | $(CC) -E - | tail -n 1)
-ifeq ($(ARMEL_TARGET),1)
-  no_hidden_visibility = 1
-endif
+versioned_so   = 2
 
 include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
 
diff --git a/ACE/debian/watch b/ACE/debian/watch
index 13bb93cad10..60d47694f2d 100644
--- a/ACE/debian/watch
+++ b/ACE/debian/watch
@@ -1,4 +1,4 @@
-version=3
+version=4
 opts=uversionmangle=s/-rc/~rc/g,dversionmangle=s/\+dfsg$// \
  http://download.dre.vanderbilt.edu/previous_versions/ACE\-src-(\d\.\d\.\d[-a-z0-9]*)\.tar\.gz \
   debian /bin/sh debian/get-orig-source.sh