diff options
6 files changed, 26 insertions, 32 deletions
diff --git a/debian/_base/applications/office/kile/debian/control b/debian/_base/applications/office/kile/debian/control index 696646d5a..e6c22beb3 100644 --- a/debian/_base/applications/office/kile/debian/control +++ b/debian/_base/applications/office/kile/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <[email protected]> XSBC-Original-Maintainer: Debian KDE Extras Team <[email protected]> Uploaders: Fathi Boudra <[email protected]>, Mark Purcell <[email protected]> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, pkg-config, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://kile.sourceforge.net diff --git a/debian/_base/applications/office/kile/debian/rules b/debian/_base/applications/office/kile/debian/rules index 414e7390e..3a717eab1 100755 --- a/debian/_base/applications/office/kile/debian/rules +++ b/debian/_base/applications/office/kile/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,--as-needed" -DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp -DEB_INSTALL_MANPAGES_kile := debian/kile.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +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" common-install-indep:: # Install translations into individual packages @@ -28,7 +29,5 @@ install/kile-trinity:: # Install pixmap install -D -p -m0644 debian/kile.xpm debian/kile-trinity/opt/trinity/share/pixmaps/kile.xpm - chmod +x debian/tmp/opt/trinity/share/apps/kile/test/runTests.sh - clean:: rm -rf debian/kile-trinity-i18n-* diff --git a/debian/_base/applications/office/kile/debian/watch b/debian/_base/applications/office/kile/debian/watch deleted file mode 100644 index e372a7062..000000000 --- a/debian/_base/applications/office/kile/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/kile/kile-([\d\.].[\d])\.tar\.bz2 debian svn-upgrade diff --git a/ubuntu/_base/applications/office/kile/debian/control b/ubuntu/_base/applications/office/kile/debian/control index 7b699f3b0..cb01d0882 100644 --- a/ubuntu/_base/applications/office/kile/debian/control +++ b/ubuntu/_base/applications/office/kile/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <[email protected]> XSBC-Original-Maintainer: Debian KDE Extras Team <[email protected]> Uploaders: Fathi Boudra <[email protected]>, Mark Purcell <[email protected]> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, pkg-config, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://kile.sourceforge.net diff --git a/ubuntu/_base/applications/office/kile/debian/rules b/ubuntu/_base/applications/office/kile/debian/rules index 414e7390e..3a717eab1 100755 --- a/ubuntu/_base/applications/office/kile/debian/rules +++ b/ubuntu/_base/applications/office/kile/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,--as-needed" -DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp -DEB_INSTALL_MANPAGES_kile := debian/kile.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +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" common-install-indep:: # Install translations into individual packages @@ -28,7 +29,5 @@ install/kile-trinity:: # Install pixmap install -D -p -m0644 debian/kile.xpm debian/kile-trinity/opt/trinity/share/pixmaps/kile.xpm - chmod +x debian/tmp/opt/trinity/share/apps/kile/test/runTests.sh - clean:: rm -rf debian/kile-trinity-i18n-* diff --git a/ubuntu/_base/applications/office/kile/debian/watch b/ubuntu/_base/applications/office/kile/debian/watch deleted file mode 100644 index e372a7062..000000000 --- a/ubuntu/_base/applications/office/kile/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/kile/kile-([\d\.].[\d])\.tar\.bz2 debian svn-upgrade |