diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2013-01-03 22:47:53 +0100 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2013-01-03 22:47:53 +0100 |
| commit | d2f32337f00cf98faef8475e769d9c0381efd257 (patch) | |
| tree | 9890ceb134945c4f24e624dca8ac4fa03888a979 /ubuntu/maverick/tdevelop | |
| parent | b566058ccb7fa94c6e34fb1e1349b093d4482d6a (diff) | |
| parent | fe7329f1eaa98f63b62e23449bb1345b3395ed37 (diff) | |
| download | tde-packaging-d2f32337f00cf98faef8475e769d9c0381efd257.tar.gz tde-packaging-d2f32337f00cf98faef8475e769d9c0381efd257.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdevelop')
| -rw-r--r-- | ubuntu/maverick/tdevelop/debian/control | 2 | ||||
| -rwxr-xr-x | ubuntu/maverick/tdevelop/debian/rules | 18 | ||||
| -rw-r--r-- | ubuntu/maverick/tdevelop/debian/source/options | 4 |
3 files changed, 21 insertions, 3 deletions
diff --git a/ubuntu/maverick/tdevelop/debian/control b/ubuntu/maverick/tdevelop/debian/control index 6203fd52d..ba0e5814b 100644 --- a/ubuntu/maverick/tdevelop/debian/control +++ b/ubuntu/maverick/tdevelop/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org> -Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), tdelibs4-trinity-dev, gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), cmake, tdelibs4-trinity-dev, gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdevelop-trinity diff --git a/ubuntu/maverick/tdevelop/debian/rules b/ubuntu/maverick/tdevelop/debian/rules index 74b304533..95a3981ea 100755 --- a/ubuntu/maverick/tdevelop/debian/rules +++ b/ubuntu/maverick/tdevelop/debian/rules @@ -5,6 +5,7 @@ makebuilddir:: [ -f debian/control.tmp ] || cp debian/control debian/control.tmp include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -16,6 +17,9 @@ 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_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := tdevelop-trinity DEB_KDE_ENABLE_FINAL := @@ -53,6 +57,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ --prefix=/opt/trinity \ --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -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_BUILDTOOL_ALL="ON" \ + -DWITH_LANGUAGE_ALL="ON" \ + -DWITH_VCS_ALL="ON" \ + -DQT_DOCDIR="/usr/share/qt3/doc/html" + binary-install/tdevelop-trinity:: mkdir -p debian/tdevelop-trinity/opt/trinity/share/pixmaps cp debian/tdevelop.xpm debian/tdevelop-trinity/opt/trinity/share/pixmaps diff --git a/ubuntu/maverick/tdevelop/debian/source/options b/ubuntu/maverick/tdevelop/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/ubuntu/maverick/tdevelop/debian/source/options +++ b/ubuntu/maverick/tdevelop/debian/source/options @@ -1,5 +1,5 @@ -# Use bzip2 instead of gzip -compression = "bzip2" +# Use xz instead of gzip +compression = "xz" compression-level = 9 # Don't run differences |