diff options
4 files changed, 26 insertions, 22 deletions
diff --git a/debian/_base/applications/settings/kmyfirewall/debian/control b/debian/_base/applications/settings/kmyfirewall/debian/control index 79617857e..cae29f6a7 100644 --- a/debian/_base/applications/settings/kmyfirewall/debian/control +++ b/debian/_base/applications/settings/kmyfirewall/debian/control @@ -2,7 +2,7 @@ Source: kmyfirewall-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 10~), tdelibs14-trinity-dev (>= 3.3.0), chrpath, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://kmyfirewall.sourceforge.net/ diff --git a/debian/_base/applications/settings/kmyfirewall/debian/rules b/debian/_base/applications/settings/kmyfirewall/debian/rules index 76a0f44d3..a6797f19a 100755 --- a/debian/_base/applications/settings/kmyfirewall/debian/rules +++ b/debian/_base/applications/settings/kmyfirewall/debian/rules @@ -1,15 +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 - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -binary-install/kmyfirewall-trinity:: - rm -f debian/$(cdbs_curpkg)/opt/trinity/lib/*.so - chmod +x debian/$(cdbs_curpkg)/opt/trinity/share/apps/kmyfirewall/scripts/installer/linux/*.sh +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/settings/kmyfirewall/debian/control b/ubuntu/_base/applications/settings/kmyfirewall/debian/control index 5c4cc4d06..bd8bcd2c2 100644 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/control +++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/control @@ -2,7 +2,7 @@ Source: kmyfirewall-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 10~), tdelibs14-trinity-dev (>= 3.3.0), chrpath, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://kmyfirewall.sourceforge.net/ diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/rules b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules index 76a0f44d3..a6797f19a 100755 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/rules +++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules @@ -1,15 +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 - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -binary-install/kmyfirewall-trinity:: - rm -f debian/$(cdbs_curpkg)/opt/trinity/lib/*.so - chmod +x debian/$(cdbs_curpkg)/opt/trinity/share/apps/kmyfirewall/scripts/installer/linux/*.sh +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" |