diff options
Diffstat (limited to 'debian/_base/core/tdetoys/debian')
| -rw-r--r-- | debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk | 11 | ||||
| -rw-r--r-- | debian/_base/core/tdetoys/debian/control | 2 | ||||
| -rw-r--r-- | debian/_base/core/tdetoys/debian/kweather-trinity.install | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk b/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk index 5b4e8bfd7..f36e3527c 100644 --- a/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk @@ -57,6 +57,15 @@ ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) endif +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches endif @@ -214,7 +223,7 @@ debian/stamp-kde-apidox: common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) cleanbuilddir:: -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) diff --git a/debian/_base/core/tdetoys/debian/control b/debian/_base/core/tdetoys/debian/control index d77ac52aa..f8fc79be5 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 (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, 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 ae0fb921e..34499d446 100644 --- a/debian/_base/core/tdetoys/debian/kweather-trinity.install +++ b/debian/_base/core/tdetoys/debian/kweather-trinity.install @@ -10,7 +10,11 @@ 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 debian/tmp/opt/trinity/lib/trinity/weather_panelapplet.so +debian/tmp/opt/trinity/lib/trinity/weather_sidebar.la +debian/tmp/opt/trinity/lib/trinity/weather_sidebar.so debian/tmp/opt/trinity/share/apps/kicker/applets/kweather.desktop +debian/tmp/opt/trinity/share/apps/konqsidebartng/add/weatherbar_add.desktop +debian/tmp/opt/trinity/share/apps/konqsidebartng/entries/weatherbar.desktop debian/tmp/opt/trinity/share/apps/kweather debian/tmp/opt/trinity/share/apps/kweatherservice/stations.dat debian/tmp/opt/trinity/share/apps/kweatherservice/weather_stations.desktop |