diff options
6 files changed, 28 insertions, 64 deletions
diff --git a/debian/_base/applications/misc/krecipes/debian/control b/debian/_base/applications/misc/krecipes/debian/control index cafce1080..846edf473 100644 --- a/debian/_base/applications/misc/krecipes/debian/control +++ b/debian/_base/applications/misc/krecipes/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Matthias Julius <mdeb@julius-net.net> -Build-Depends: cdbs, debhelper (>= 10~), autotools-dev, automake, libtool, chrpath, tdelibs14-trinity-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev Standards-Version: 3.8.1 Homepage: http://krecipes.sourceforge.net/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-kde/kde-extras/krecipes/trunk/ diff --git a/debian/_base/applications/misc/krecipes/debian/krecipes-trinity.install b/debian/_base/applications/misc/krecipes/debian/krecipes-trinity.install index b40fc39e9..2541a2c6c 100644 --- a/debian/_base/applications/misc/krecipes/debian/krecipes-trinity.install +++ b/debian/_base/applications/misc/krecipes/debian/krecipes-trinity.install @@ -1,3 +1,2 @@ debian/tmp/opt/trinity/bin - -debian/tmp/opt/trinity/share/applnk/Utilities/krecipes.desktop opt/trinity/share/applications/ +debian/tmp/opt/trinity/share/applications diff --git a/debian/_base/applications/misc/krecipes/debian/rules b/debian/_base/applications/misc/krecipes/debian/rules index da431839b..a6797f19a 100755 --- a/debian/_base/applications/misc/krecipes/debian/rules +++ b/debian/_base/applications/misc/krecipes/debian/rules @@ -1,34 +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 -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: - dh_testdir - - # Regenerate build system -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - autoreconf --install && automake -f && \ - $(MAKE) -f admin/Makefile.common && \ - touch debian/stamp-bootstrap - -clean:: - dh_testdir - rm -f debian/stamp-bootstrap +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/krecipes/debian/control b/ubuntu/_base/applications/misc/krecipes/debian/control index cafce1080..846edf473 100644 --- a/ubuntu/_base/applications/misc/krecipes/debian/control +++ b/ubuntu/_base/applications/misc/krecipes/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Matthias Julius <mdeb@julius-net.net> -Build-Depends: cdbs, debhelper (>= 10~), autotools-dev, automake, libtool, chrpath, tdelibs14-trinity-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev Standards-Version: 3.8.1 Homepage: http://krecipes.sourceforge.net/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-kde/kde-extras/krecipes/trunk/ diff --git a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.install b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.install index b40fc39e9..2541a2c6c 100644 --- a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.install +++ b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-trinity.install @@ -1,3 +1,2 @@ debian/tmp/opt/trinity/bin - -debian/tmp/opt/trinity/share/applnk/Utilities/krecipes.desktop opt/trinity/share/applications/ +debian/tmp/opt/trinity/share/applications diff --git a/ubuntu/_base/applications/misc/krecipes/debian/rules b/ubuntu/_base/applications/misc/krecipes/debian/rules index da431839b..a6797f19a 100755 --- a/ubuntu/_base/applications/misc/krecipes/debian/rules +++ b/ubuntu/_base/applications/misc/krecipes/debian/rules @@ -1,34 +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 -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: - dh_testdir - - # Regenerate build system -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - autoreconf --install && automake -f && \ - $(MAKE) -f admin/Makefile.common && \ - touch debian/stamp-bootstrap - -clean:: - dh_testdir - rm -f debian/stamp-bootstrap +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" |