diff options
Diffstat (limited to 'ubuntu/_base/applications/themes/gtk-qt-engine')
8 files changed, 14 insertions, 56 deletions
diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 deleted file mode 100644 index 6bc424f8e..000000000 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 +++ /dev/null @@ -1,13 +0,0 @@ -# This file was written by TDE -# You can edit it in the Trinity control center, under "GTK Styles and Fonts" - -include "/usr/share/themes/Qt/gtk-2.0/gtkrc" - -style "user-font" -{ - font_name="Sans Serif 9" -} -widget_class "*" style "user-font" - -gtk-theme-name="Qt" -gtk-font-name="Sans Serif 9" diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4 b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4 deleted file mode 100644 index e25e89fd4..000000000 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4 +++ /dev/null @@ -1,13 +0,0 @@ -# This file was written by TDE -# You can edit it in the Trinity control center, under "GTK Styles and Fonts" - -include "/usr/share/themes/Qt/gtk-2.0/gtkrc" - -style "user-font" -{ - font_name="Tahoma 10" -} -widget_class "*" style "user-font" - -gtk-theme-name="Qt" -gtk-font-name="Tahoma 10" diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat +++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control index ceaa8edc8..a61cbc58b 100644 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control +++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev (>= 2.10.1) +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev (>= 2.10.1) Standards-Version: 3.8.4 Package: gtk-qt-engine-trinity diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs index 5502ed8f4..76c3076c9 100644 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs +++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs @@ -1,3 +1,3 @@ -NEWS -README +AUTHORS +README.md TODO diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh deleted file mode 100644 index b477f5ce2..000000000 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -# Make sure our customised gtkrc file is loaded. -export GTK2_RC_FILES=$HOME/.gtkrc-2.0-kde4 diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules index 8f250b682..a6797f19a 100755 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules +++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules @@ -1,34 +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 - -binary-install/gtk-qt-engine-trinity:: - mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ - cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde4 $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ - cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde-kde4 $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ - cp -Rp $(CURDIR)/debian/gtk-qt-engine.rc.sh $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" |