Enable lzma/xz support in tdelibs on Debian and Ubuntu

(cherry picked from commit 9b51e58c26e6427912deddf4aaa6ec04e2785e2a)

4 files changed, 5 insertions, 2 deletions

diff --git a/ubuntu/maverick/kdelibs/debian/control b/ubuntu/maverick/kdelibs/debian/control
index 01a640eb4..d02601b64 100644
--- a/ubuntu/maverick/kdelibs/debian/control
+++ b/ubuntu/maverick/kdelibs/debian/control
@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), quilt, autotools-
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 2.3.17), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- aspell, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
+ aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, libldap2-dev,
  liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev,
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.install b/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.install
index 98a1521bc..c85d01033 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.install
+++ b/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.install
@@ -3599,6 +3599,7 @@ debian/tmp/opt/trinity/share/services/ktexteditor_docwordcompletion.desktop
 debian/tmp/opt/trinity/share/services/ktexteditor_insertfile.desktop
 debian/tmp/opt/trinity/share/services/ktexteditor_isearch.desktop
 debian/tmp/opt/trinity/share/services/ktexteditor_kdatatool.desktop
+debian/tmp/opt/trinity/share/services/kxzfilter.desktop
 debian/tmp/opt/trinity/share/services/metainfo.protocol
 debian/tmp/opt/trinity/share/services/mms.protocol
 debian/tmp/opt/trinity/share/services/mmst.protocol
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.install b/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.install
index 6ee941938..4c8be8e62 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.install
+++ b/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.install
@@ -183,6 +183,8 @@ debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.la
 debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.so
 debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.la
 debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.so
+debian/tmp/opt/trinity/lib/trinity/kxzfilter.la
+debian/tmp/opt/trinity/lib/trinity/kxzfilter.so
 debian/tmp/opt/trinity/lib/trinity/libkatepart.la
 debian/tmp/opt/trinity/lib/trinity/libkatepart.so
 debian/tmp/opt/trinity/lib/trinity/libkcertpart.la
diff --git a/ubuntu/maverick/kdelibs/debian/rules b/ubuntu/maverick/kdelibs/debian/rules
index 86a1f922b..c6771a164 100755
--- a/ubuntu/maverick/kdelibs/debian/rules
+++ b/ubuntu/maverick/kdelibs/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_LZMA="ON" \
 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to