diff options
Diffstat (limited to 'ubuntu/_base/libraries/libkipi/debian')
| -rw-r--r-- | ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk | 30 | ||||
| -rw-r--r-- | ubuntu/_base/libraries/libkipi/debian/compat | 2 | ||||
| -rw-r--r-- | ubuntu/_base/libraries/libkipi/debian/control | 4 | ||||
| -rwxr-xr-x | ubuntu/_base/libraries/libkipi/debian/rules | 4 |
4 files changed, 31 insertions, 9 deletions
diff --git a/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk index 24191b2cd..aba508624 100644 --- a/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/libraries/libkipi/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 @@ -73,7 +82,17 @@ 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 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb @@ -117,7 +136,7 @@ endif echo "# TDE package information" >.tdepkginfo dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo - date +"DateTime: %m/%d/%Y %H:%M" -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo post-patches:: .tdepkginfo @@ -183,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; \ @@ -204,7 +228,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/ubuntu/_base/libraries/libkipi/debian/compat b/ubuntu/_base/libraries/libkipi/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/libraries/libkipi/debian/compat +++ b/ubuntu/_base/libraries/libkipi/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/libraries/libkipi/debian/control b/ubuntu/_base/libraries/libkipi/debian/control index 92ea0efca..ebbb57a7e 100644 --- a/ubuntu/_base/libraries/libkipi/debian/control +++ b/ubuntu/_base/libraries/libkipi/debian/control @@ -1,9 +1,9 @@ Source: libkipi-trinity Section: libs Priority: optional -Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2) +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libexif-dev, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: libkipi0-trinity-dev diff --git a/ubuntu/_base/libraries/libkipi/debian/rules b/ubuntu/_base/libraries/libkipi/debian/rules index cee2a3058..5a0da42af 100755 --- a/ubuntu/_base/libraries/libkipi/debian/rules +++ b/ubuntu/_base/libraries/libkipi/debian/rules @@ -4,10 +4,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \ -DSYSCONF_INSTALL_DIR="/etc" \ |