diff options
Diffstat (limited to 'debian/_base/core/tdetoys/debian')
5 files changed, 14 insertions, 19 deletions
diff --git a/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk b/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdetoys/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/debian/_base/core/tdetoys/debian/compat b/debian/_base/core/tdetoys/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/core/tdetoys/debian/compat +++ b/debian/_base/core/tdetoys/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/core/tdetoys/debian/control b/debian/_base/core/tdetoys/debian/control index f8fc79be5..cdc77d77b 100644 --- a/debian/_base/core/tdetoys/debian/control +++ b/debian/_base/core/tdetoys/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev Standards-Version: 3.8.4 Package: tdetoys-trinity diff --git a/debian/_base/core/tdetoys/debian/kweather-trinity.install b/debian/_base/core/tdetoys/debian/kweather-trinity.install index 34499d446..4ce8d6ef8 100644 --- a/debian/_base/core/tdetoys/debian/kweather-trinity.install +++ b/debian/_base/core/tdetoys/debian/kweather-trinity.install @@ -2,10 +2,12 @@ debian/tmp/opt/trinity/bin/kweatherservice debian/tmp/opt/trinity/bin/kweatherreport debian/tmp/opt/trinity/lib/libtdeinit_kweatherreport.so debian/tmp/opt/trinity/lib/libtdeinit_kweatherreport.la -debian/tmp/opt/trinity/lib/trinity/kcm_weather.so -debian/tmp/opt/trinity/lib/trinity/kcm_weather.la +debian/tmp/opt/trinity/lib/trinity/kcm_weatherapplet.so +debian/tmp/opt/trinity/lib/trinity/kcm_weatherapplet.la debian/tmp/opt/trinity/lib/trinity/kcm_weatherservice.so debian/tmp/opt/trinity/lib/trinity/kcm_weatherservice.la +debian/tmp/opt/trinity/lib/trinity/kcm_weatherstations.so +debian/tmp/opt/trinity/lib/trinity/kcm_weatherstations.la debian/tmp/opt/trinity/lib/trinity/kweatherreport.so debian/tmp/opt/trinity/lib/trinity/kweatherreport.la debian/tmp/opt/trinity/lib/trinity/weather_panelapplet.la @@ -27,5 +29,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kweather.png debian/tmp/opt/trinity/share/man/man1/kweatherreport.1 debian/tmp/opt/trinity/share/man/man1/kweatherservice.1 debian/tmp/opt/trinity/share/services/kweatherservice.desktop -debian/tmp/opt/trinity/share/services/kcmweather.desktop +debian/tmp/opt/trinity/share/services/kcmweatherapplet.desktop debian/tmp/opt/trinity/share/services/kcmweatherservice.desktop +debian/tmp/opt/trinity/share/services/kcmweatherstations.desktop diff --git a/debian/_base/core/tdetoys/debian/kweather-trinity.postinst b/debian/_base/core/tdetoys/debian/kweather-trinity.postinst deleted file mode 100644 index 99a084399..000000000 --- a/debian/_base/core/tdetoys/debian/kweather-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for kweather-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 |