diff options
Diffstat (limited to 'ubuntu/_base/libraries/libkdcraw')
-rw-r--r-- | ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk | 18 | ||||
-rw-r--r-- | ubuntu/_base/libraries/libkdcraw/debian/compat | 2 | ||||
-rw-r--r-- | ubuntu/_base/libraries/libkdcraw/debian/control | 4 | ||||
-rw-r--r-- | ubuntu/_base/libraries/libkdcraw/debian/docs | 3 | ||||
-rwxr-xr-x | ubuntu/_base/libraries/libkdcraw/debian/rules | 23 |
5 files changed, 33 insertions, 17 deletions
diff --git a/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk index 5b4e8bfd7..aba508624 100644 --- a/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/libraries/libkdcraw/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,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 | \ @@ -193,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; \ @@ -214,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/libkdcraw/debian/compat b/ubuntu/_base/libraries/libkdcraw/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/libraries/libkdcraw/debian/compat +++ b/ubuntu/_base/libraries/libkdcraw/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/libraries/libkdcraw/debian/control b/ubuntu/_base/libraries/libkdcraw/debian/control index 96c4ee08e..26cb1d4ef 100644 --- a/ubuntu/_base/libraries/libkdcraw/debian/control +++ b/ubuntu/_base/libraries/libkdcraw/debian/control @@ -4,9 +4,9 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, liblcms2-dev | liblcms1-dev, libjpeg-dev, pkg-config, - automake, autoconf, libtool, libltdl-dev + libomp-dev [amd64 arm64 armhf i386 mips64el ppc64el] | libiomp-dev [amd64 arm64 armhf i386 mips64el ppc64el] Standards-Version: 3.8.4 Homepage: http://www.kipi-plugins.org/ diff --git a/ubuntu/_base/libraries/libkdcraw/debian/docs b/ubuntu/_base/libraries/libkdcraw/debian/docs index 50bd824bb..46a4ca718 100644 --- a/ubuntu/_base/libraries/libkdcraw/debian/docs +++ b/ubuntu/_base/libraries/libkdcraw/debian/docs @@ -1,2 +1,3 @@ +AUTHORS NEWS -README +README.md diff --git a/ubuntu/_base/libraries/libkdcraw/debian/rules b/ubuntu/_base/libraries/libkdcraw/debian/rules index a5de48a38..f69d1ece9 100755 --- a/ubuntu/_base/libraries/libkdcraw/debian/rules +++ b/ubuntu/_base/libraries/libkdcraw/debian/rules @@ -1,19 +1,20 @@ #!/usr/bin/make -f 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/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed" -DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" # add installed liblcms*-dev to libkdcraw3-trinity-dev depends common-binary-arch:: |