diff --git a/debian/_base/applications/misc/bibletime/debian/control b/debian/_base/applications/misc/bibletime/debian/control index efb47392c..f7c0bf9bf 100644 --- a/debian/_base/applications/misc/bibletime/debian/control +++ b/debian/_base/applications/misc/bibletime/debian/control @@ -1,6 +1,6 @@ Source: bibletime-trinity Section: tde -Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 9~), tdelibs14-trinity-dev, libsword-dev, libclucene-dev, poxml-trinity, libboost-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libsword-dev, libclucene-dev, libboost-dev Priority: optional Maintainer: TDE Debian Team Standards-Version: 3.8.4 diff --git a/debian/_base/applications/misc/bibletime/debian/install b/debian/_base/applications/misc/bibletime/debian/install index 14cee70ee..dcf290ae2 100644 --- a/debian/_base/applications/misc/bibletime/debian/install +++ b/debian/_base/applications/misc/bibletime/debian/install @@ -1 +1 @@ -bibletime.xpm /opt/trinity/share/pixmaps/ +debian/bibletime.xpm /opt/trinity/share/pixmaps/ diff --git a/debian/_base/applications/misc/bibletime/debian/rules b/debian/_base/applications/misc/bibletime/debian/rules index 430b47715..a6797f19a 100755 --- a/debian/_base/applications/misc/bibletime/debian/rules +++ b/debian/_base/applications/misc/bibletime/debian/rules @@ -1,23 +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_DH_INSTALL_SOURCEDIR := debian - -DEB_BUILDDIR = $(DEB_SRCDIR) - -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 -DEB_CMAKE_CUSTOM_FLAGS := -DKGTK_KDE3=true -DKGTK_QT3=true - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - -binary-install/bibletime-trinity:: - chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/* - chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc - chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/tips +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/misc/bibletime/debian/control b/ubuntu/_base/applications/misc/bibletime/debian/control index e68bb12de..6b987bdad 100644 --- a/ubuntu/_base/applications/misc/bibletime/debian/control +++ b/ubuntu/_base/applications/misc/bibletime/debian/control @@ -1,6 +1,6 @@ Source: bibletime-trinity Section: tde -Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 9~), tdelibs14-trinity-dev, libsword-dev, libclucene-dev, poxml-trinity, libboost-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libsword-dev, libclucene-dev, libboost-dev Priority: optional Maintainer: TDE Debian Team Standards-Version: 3.8.4 diff --git a/ubuntu/_base/applications/misc/bibletime/debian/install b/ubuntu/_base/applications/misc/bibletime/debian/install index 14cee70ee..dcf290ae2 100644 --- a/ubuntu/_base/applications/misc/bibletime/debian/install +++ b/ubuntu/_base/applications/misc/bibletime/debian/install @@ -1 +1 @@ -bibletime.xpm /opt/trinity/share/pixmaps/ +debian/bibletime.xpm /opt/trinity/share/pixmaps/ diff --git a/ubuntu/_base/applications/misc/bibletime/debian/rules b/ubuntu/_base/applications/misc/bibletime/debian/rules index 430b47715..a6797f19a 100755 --- a/ubuntu/_base/applications/misc/bibletime/debian/rules +++ b/ubuntu/_base/applications/misc/bibletime/debian/rules @@ -1,23 +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_DH_INSTALL_SOURCEDIR := debian - -DEB_BUILDDIR = $(DEB_SRCDIR) - -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 -DEB_CMAKE_CUSTOM_FLAGS := -DKGTK_KDE3=true -DKGTK_QT3=true - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - -binary-install/bibletime-trinity:: - chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/* - chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc - chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/tips +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"