diff options
6 files changed, 30 insertions, 74 deletions
diff --git a/debian/_base/applications/graphics/digikam/debian/control b/debian/_base/applications/graphics/digikam/debian/control index 9a0ce57b7..dd96d8130 100644 --- a/debian/_base/applications/graphics/digikam/debian/control +++ b/debian/_base/applications/graphics/digikam/debian/control @@ -4,12 +4,11 @@ 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: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: cdbs, debhelper (>= 10~), quilt, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libtiff-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev, libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6), libjasper-dev, libpng-dev, libexiv2-dev, - libkdcraw3-trinity-dev (>= 0.1.4), - automake, autoconf, libtool, libltdl-dev + libkdcraw3-trinity-dev (>= 0.1.4) Standards-Version: 3.8.4 Homepage: http://www.digikam.org diff --git a/debian/_base/applications/graphics/digikam/debian/digikam-trinity.install b/debian/_base/applications/graphics/digikam/debian/digikam-trinity.install index 67fe3a3b9..223a24aa6 100644 --- a/debian/_base/applications/graphics/digikam/debian/digikam-trinity.install +++ b/debian/_base/applications/graphics/digikam/debian/digikam-trinity.install @@ -1,5 +1,5 @@ /opt/trinity/bin/digi* -/opt/trinity/include/tde +/opt/trinity/include /opt/trinity/lib /opt/trinity/share/apps/digikam /opt/trinity/share/apps/konqueror/servicemenus/digikam*.desktop diff --git a/debian/_base/applications/graphics/digikam/debian/rules b/debian/_base/applications/graphics/digikam/debian/rules index 3b310f8f1..a6797f19a 100755 --- a/debian/_base/applications/graphics/digikam/debian/rules +++ b/debian/_base/applications/graphics/digikam/debian/rules @@ -1,38 +1,17 @@ #!/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) - -TARBALL_EXT=tar.bz2 - -DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3 --prefix=/opt/trinity --disable-static - -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" - -DEB_KDE_ENABLE_FINAL := yes -DEB_INSTALL_DOCS_ALL := - -DEB_DH_MAKESHLIBS_ARGS_ALL := -V -DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/opt/trinity/lib) - -PKG_CONFIG_PATH=/opt/trinity/lib/pkgconfig:$PKG_CONFIG_PATH - -ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb - ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) - cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) - else - cdbs_kde_enable_final = - endif -endif - -binary-install/digikam-trinity-doc:: - # remove empty API-docs dirs tree - rm -rf $(CURDIR)/debian/digikam-trinity-doc/opt/trinity/share/doc/tde/HTML/en/digikam-apidocs +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" diff --git a/ubuntu/_base/applications/graphics/digikam/debian/control b/ubuntu/_base/applications/graphics/digikam/debian/control index f0da4b350..64015de3c 100644 --- a/ubuntu/_base/applications/graphics/digikam/debian/control +++ b/ubuntu/_base/applications/graphics/digikam/debian/control @@ -4,12 +4,11 @@ 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: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: cdbs, debhelper (>= 10~), quilt, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libtiff-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev, libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6), libjasper-dev, libpng-dev, libexiv2-dev, - libkdcraw3-trinity-dev (>= 0.1.4), - automake, autoconf, libtool, libltdl-dev + libkdcraw3-trinity-dev (>= 0.1.4) Standards-Version: 3.8.4 Homepage: http://www.digikam.org diff --git a/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.install b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.install index 67fe3a3b9..223a24aa6 100644 --- a/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.install +++ b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.install @@ -1,5 +1,5 @@ /opt/trinity/bin/digi* -/opt/trinity/include/tde +/opt/trinity/include /opt/trinity/lib /opt/trinity/share/apps/digikam /opt/trinity/share/apps/konqueror/servicemenus/digikam*.desktop diff --git a/ubuntu/_base/applications/graphics/digikam/debian/rules b/ubuntu/_base/applications/graphics/digikam/debian/rules index 3b310f8f1..a6797f19a 100755 --- a/ubuntu/_base/applications/graphics/digikam/debian/rules +++ b/ubuntu/_base/applications/graphics/digikam/debian/rules @@ -1,38 +1,17 @@ #!/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) - -TARBALL_EXT=tar.bz2 - -DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3 --prefix=/opt/trinity --disable-static - -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" - -DEB_KDE_ENABLE_FINAL := yes -DEB_INSTALL_DOCS_ALL := - -DEB_DH_MAKESHLIBS_ARGS_ALL := -V -DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/opt/trinity/lib) - -PKG_CONFIG_PATH=/opt/trinity/lib/pkgconfig:$PKG_CONFIG_PATH - -ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb - ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) - cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) - else - cdbs_kde_enable_final = - endif -endif - -binary-install/digikam-trinity-doc:: - # remove empty API-docs dirs tree - rm -rf $(CURDIR)/debian/digikam-trinity-doc/opt/trinity/share/doc/tde/HTML/en/digikam-apidocs +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" |