From 617dd978171d339a4fff6a707220468c4ab4b385 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 31 Dec 2011 04:23:35 -0600 Subject: [PATCH] Enable elficon support on Debian and Ubuntu --- debian/lenny/tdelibs/debian/control | 2 +- debian/lenny/tdelibs/debian/rules | 2 +- debian/squeeze/tdelibs/debian/control | 2 +- debian/squeeze/tdelibs/debian/rules | 2 +- ubuntu/maverick/tdelibs/debian/control | 2 +- ubuntu/maverick/tdelibs/debian/rules | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control index f41f6bebf..f6462c732 100644 --- a/debian/lenny/tdelibs/debian/control +++ b/debian/lenny/tdelibs/debian/control @@ -15,7 +15,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev, libtiff4-dev (>= 3.7.3-1), libavahi-client-dev (>= 0.4), libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo, libogg-dev-la, libtqtinterface-dev, - gettext-kde, lsb-release, base-files, sudo, + gettext-kde, lsb-release, base-files, sudo, libr-dev, cmake, libltdl-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11 Standards-Version: 3.8.3 diff --git a/debian/lenny/tdelibs/debian/rules b/debian/lenny/tdelibs/debian/rules index 119f2a4fe..73323de78 100755 --- a/debian/lenny/tdelibs/debian/rules +++ b/debian/lenny/tdelibs/debian/rules @@ -21,7 +21,7 @@ version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" +-DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/debian/squeeze/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control index f41f6bebf..f6462c732 100644 --- a/debian/squeeze/tdelibs/debian/control +++ b/debian/squeeze/tdelibs/debian/control @@ -15,7 +15,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev, libtiff4-dev (>= 3.7.3-1), libavahi-client-dev (>= 0.4), libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo, libogg-dev-la, libtqtinterface-dev, - gettext-kde, lsb-release, base-files, sudo, + gettext-kde, lsb-release, base-files, sudo, libr-dev, cmake, libltdl-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11 Standards-Version: 3.8.3 diff --git a/debian/squeeze/tdelibs/debian/rules b/debian/squeeze/tdelibs/debian/rules index 119f2a4fe..73323de78 100755 --- a/debian/squeeze/tdelibs/debian/rules +++ b/debian/squeeze/tdelibs/debian/rules @@ -21,7 +21,7 @@ version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" +-DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control index f2de6e248..dae47fa6b 100644 --- a/ubuntu/maverick/tdelibs/debian/control +++ b/ubuntu/maverick/tdelibs/debian/control @@ -15,7 +15,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev, libtiff4-dev (>= 3.7.3-1), libavahi-client-dev (>= 0.4), libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo, libogg-dev, libtqtinterface-dev, - gettext-kde, lsb-release, base-files, sudo, + gettext-kde, lsb-release, base-files, sudo, libr-dev, cmake, libltdl-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11 Standards-Version: 3.8.3 diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules index 119f2a4fe..73323de78 100755 --- a/ubuntu/maverick/tdelibs/debian/rules +++ b/ubuntu/maverick/tdelibs/debian/rules @@ -21,7 +21,7 @@ version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" +-DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS.