From 17ad11ff99cf97c9bb9a61b55f6991bffab3e3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 25 Sep 2013 20:41:15 +0200 Subject: Enable WITH_XRANDR and WITH_XCOMPOSITE on Debian and Ubuntu --- ubuntu/raring/tdelibs/debian/rules | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) (limited to 'ubuntu/raring/tdelibs') diff --git a/ubuntu/raring/tdelibs/debian/rules b/ubuntu/raring/tdelibs/debian/rules index d64786b7d..6889b4098 100755 --- a/ubuntu/raring/tdelibs/debian/rules +++ b/ubuntu/raring/tdelibs/debian/rules @@ -20,9 +20,38 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CMAKE_EXTRA_FLAGS := -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" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" -DWITH_LIBBFD="ON" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" -DWITH_TDEHWLIB_DAEMONS="ON" -DWITH_UPOWER="ON" -DWITH_UDISKS="ON" -DWITH_UDISKS2="ON" -DWITH_CONSOLEKIT="ON" -DWITH_NETWORK_MANAGER_BACKEND="ON" -DWITH_LZMA="ON" \ --DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_CMAKE_EXTRA_FLAGS := \ + -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" \ + -DAUTODETECT_QT_DIRS="ON" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DBUILD_ALL="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ + -DWITH_LIBBFD="ON" \ + -DWITH_LIBART="ON" \ + -DWITH_LIBIDN="ON" \ + -DWITH_TIFF="ON" \ + -DWITH_JASPER="ON" \ + -DWITH_OPENEXR="ON" \ + -DWITH_AVAHI="ON" \ + -DWITH_ASPELL="ON" \ + -DWITH_HSPELL="ON" \ + -DWITH_ELFICON="ON" \ + -DWITH_TDEHWLIB_DAEMONS="ON" \ + -DWITH_UPOWER="ON" \ + -DWITH_UDISKS="ON" \ + -DWITH_UDISKS2="ON" \ + -DWITH_CONSOLEKIT="ON" \ + -DWITH_NETWORK_MANAGER_BACKEND="ON" \ + -DWITH_LZMA="ON" \ + -DWITH_XRANDR="ON" \ + -DWITH_XCOMPOSITE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. -- cgit v1.2.1 From 08239218fe4a7b455a4ae58d9ba25586ccc46e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 25 Sep 2013 21:01:20 +0200 Subject: Fix startup tdecmshell in administrator mode on Debian and Ubuntu --- ubuntu/raring/tdelibs/debian/tdecmshell | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ubuntu/raring/tdelibs') diff --git a/ubuntu/raring/tdelibs/debian/tdecmshell b/ubuntu/raring/tdelibs/debian/tdecmshell index 4e24cd356..64dea7e87 100755 --- a/ubuntu/raring/tdelibs/debian/tdecmshell +++ b/ubuntu/raring/tdelibs/debian/tdecmshell @@ -1,4 +1,6 @@ #!/bin/sh -export TDEDIRS=/usr/:/opt/trinity/ -/opt/trinity/bin/tdecmshell.real $1 $2 $3 $4 $5 $6 $7 $8 +export XDG_CONFIG_DIRS=/opt/trinity/etc/xdg:/etc/xdg +export XDG_DATA_DIRS=/opt/trinity/share:/usr/share + +${0}.real "$@" -- cgit v1.2.1