DEB gtk-qt-engine: Housekeeping of CMake rules.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs

@@ -1,2 +1,3 @@
+AUTHORS
 README.md
 TODO

debian/_base/applications/themes/gtk-qt-engine/debian/rules

@@ -1,37 +1,17 @@
 #!/usr/bin/make -f
 
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=/opt/trinity/lib:debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :/opt/trinity/lib:debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
- -DLIB_SUFFIX="" \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
  -DCONFIG_INSTALL_DIR="/etc/trinity" \
  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
- -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \
- -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" \
- -DAUTODETECT_QT_DIRS="ON" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
- -DBUILD_ALL="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"

ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs

@@ -1,2 +1,3 @@
+AUTHORS
 README.md
 TODO

ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules

@@ -1,28 +1,17 @@
 #!/usr/bin/make -f
 
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=/opt/trinity/lib:debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :/opt/trinity/lib:debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
- -DLIB_SUFFIX="" \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
  -DCONFIG_INSTALL_DIR="/etc/trinity" \
  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
- -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \
- -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" \
- -DAUTODETECT_QT_DIRS="ON" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
- -DBUILD_ALL="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"