Branch: master

d1779def 2019-04-27 12:19:18 Michele Calgaro 
DEB: removed no longer required option in tqtinterface.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M debian/_base/dependencies/tqtinterface/debian/rules
M ubuntu/_base/dependencies/tqtinterface/debian/rules

debian/_base/dependencies/tqtinterface/debian/rules

diff --git a/debian/_base/dependencies/tqtinterface/debian/rules b/debian/_base/dependencies/tqtinterface/debian/rules
index 2a82576..d642db9 100755
--- a/debian/_base/dependencies/tqtinterface/debian/rules
+++ b/debian/_base/dependencies/tqtinterface/debian/rules
@@ -16,8 +16,7 @@
  -DCMAKE_INSTALL_PREFIX="/usr" \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DBUILD_ALL="ON" \
- -DWITH_QT3="ON"
+ -DBUILD_ALL="ON"
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)

ubuntu/_base/dependencies/tqtinterface/debian/rules

diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/rules b/ubuntu/_base/dependencies/tqtinterface/debian/rules
index 2a82576..d642db9 100755
--- a/ubuntu/_base/dependencies/tqtinterface/debian/rules
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/rules
@@ -16,8 +16,7 @@
  -DCMAKE_INSTALL_PREFIX="/usr" \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DBUILD_ALL="ON" \
- -DWITH_QT3="ON"
+ -DBUILD_ALL="ON"
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
96fe7f14 2019-04-27 12:56:32 Michele Calgaro 
DEB dubs-1-tqt: added cmake configuration option for api dox location.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M debian/_base/dependencies/dbus-1-tqt/debian/rules
M ubuntu/_base/dependencies/dbus-1-tqt/debian/rules

debian/_base/dependencies/dbus-1-tqt/debian/rules

diff --git a/debian/_base/dependencies/dbus-1-tqt/debian/rules b/debian/_base/dependencies/dbus-1-tqt/debian/rules
index 2c0059d..297b3d6 100755
--- a/debian/_base/dependencies/dbus-1-tqt/debian/rules
+++ b/debian/_base/dependencies/dbus-1-tqt/debian/rules
@@ -16,4 +16,5 @@
  -DCMAKE_SKIP_RPATH="OFF" \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_APIDOX_HTML_DIRECTORY="usr/share/doc/libdbus-1-tqt/HTML" \
  -DWITH_ALL_OPTIONS="ON"

ubuntu/_base/dependencies/dbus-1-tqt/debian/rules

diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules b/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules
index 2c0059d..297b3d6 100755
--- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules
@@ -16,4 +16,5 @@
  -DCMAKE_SKIP_RPATH="OFF" \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_APIDOX_HTML_DIRECTORY="usr/share/doc/libdbus-1-tqt/HTML" \
  -DWITH_ALL_OPTIONS="ON"