diff options
Diffstat (limited to 'debian/_base/libraries/libtdeldap/debian')
5 files changed, 40 insertions, 13 deletions
diff --git a/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk b/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk index 7a55130b2..aba508624 100644 --- a/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk +++ b/debian/_base/libraries/libtdeldap/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 @@ -113,6 +132,14 @@ ifndef _cdbs_class_cmake endif debian/rules clean +.tdepkginfo: + 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" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + common-build-arch:: debian/stamp-man-pages debian/stamp-man-pages: if ! test -d debian/man/out; then mkdir -p debian/man/out; fi @@ -175,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; \ @@ -196,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)) @@ -212,6 +244,7 @@ ifndef _cdbs_class_cmake subdirs; \ fi endif + rm -f .tdepkginfo rm -f debian/stamp-kde-apidox rm -f debian/stamp-cvs-make diff --git a/debian/_base/libraries/libtdeldap/debian/compat b/debian/_base/libraries/libtdeldap/debian/compat index 7f8f011eb..f599e28b8 100644 --- a/debian/_base/libraries/libtdeldap/debian/compat +++ b/debian/_base/libraries/libtdeldap/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/debian/_base/libraries/libtdeldap/debian/control b/debian/_base/libraries/libtdeldap/debian/control index 1debe6d5d..6c8ce3269 100644 --- a/debian/_base/libraries/libtdeldap/debian/control +++ b/debian/_base/libraries/libtdeldap/debian/control @@ -1,8 +1,8 @@ Source: libtdeldap-trinity Section: tde Priority: optional -Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev Standards-Version: 3.8.4 Package: libtdeldap-trinity diff --git a/debian/_base/libraries/libtdeldap/debian/docs b/debian/_base/libraries/libtdeldap/debian/docs index 62deb0497..0b6e0f321 100644 --- a/debian/_base/libraries/libtdeldap/debian/docs +++ b/debian/_base/libraries/libtdeldap/debian/docs @@ -1 +1,2 @@ AUTHORS +README.md diff --git a/debian/_base/libraries/libtdeldap/debian/rules b/debian/_base/libraries/libtdeldap/debian/rules index 3c4dc0568..5a0da42af 100755 --- a/debian/_base/libraries/libtdeldap/debian/rules +++ b/debian/_base/libraries/libtdeldap/debian/rules @@ -4,15 +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_CONFIGURE_INCLUDEDIR := /opt/trinity/include -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -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" \ |