summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/core/tdeaccessibility/debian
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/_base/core/tdeaccessibility/debian')
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk30
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/compat2
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/control4
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/kmag-trinity.install1
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/kmag-trinity.manpages1
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/kmousetool-trinity.install1
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/kmousetool-trinity.manpages1
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/kmouth-trinity.install6
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/kmouth-trinity.manpages1
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/ksayit-trinity.install3
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/kttsd-trinity.install2
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/man/kdeopt-trinity.part110
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/man/kmag-trinity.man15
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/man/kmousetool-trinity.man18
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/man/kmouth-trinity.man15
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/patches/series3
-rwxr-xr-xubuntu/_base/core/tdeaccessibility/debian/rules34
20 files changed, 56 insertions, 246 deletions
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk
index 24191b2cd..aba508624 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk
@@ -57,6 +57,15 @@ ifndef _cdbs_class_cmake
include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
endif
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
endif
@@ -73,7 +82,17 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
@@ -117,7 +136,7 @@ endif
echo "# TDE package information" >.tdepkginfo
dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
- date +"DateTime: %m/%d/%Y %H:%M" -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+ date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
post-patches:: .tdepkginfo
@@ -183,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
@@ -204,7 +228,7 @@ debian/stamp-kde-apidox:
common-install-indep:: common-install-kde-apidox
common-install-kde-apidox::
- $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
cleanbuilddir::
-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/compat b/ubuntu/_base/core/tdeaccessibility/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/compat
+++ b/ubuntu/_base/core/tdeaccessibility/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/control b/ubuntu/_base/core/tdeaccessibility/debian/control
index c7f270372..ecc06a9a0 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/control
+++ b/ubuntu/_base/core/tdeaccessibility/debian/control
@@ -1,10 +1,10 @@
Source: tdeaccessibility-trinity
Section: tde
Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, gawk, groff-base, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev
Standards-Version: 3.8.4
Package: tdeaccessibility-trinity
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/kmag-trinity.install b/ubuntu/_base/core/tdeaccessibility/debian/kmag-trinity.install
index 23013e6da..012fd8bab 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/kmag-trinity.install
+++ b/ubuntu/_base/core/tdeaccessibility/debian/kmag-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmag.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmag.png
debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kmag.png
debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kmag.png
+debian/tmp/opt/trinity/share/man/man1/kmag.1
debian/icons/kmag.xpm /opt/trinity/share/pixmaps
debian/icons/kmag-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/kmag-trinity.manpages b/ubuntu/_base/core/tdeaccessibility/debian/kmag-trinity.manpages
deleted file mode 100644
index 6579ddb0f..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/kmag-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/kmag-trinity.1
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/kmousetool-trinity.install b/ubuntu/_base/core/tdeaccessibility/debian/kmousetool-trinity.install
index cc13c6d89..249ea428a 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/kmousetool-trinity.install
+++ b/ubuntu/_base/core/tdeaccessibility/debian/kmousetool-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmousetool/index.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmousetool/man-kmousetool.1.docbook
debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmousetool.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmousetool.png
+debian/tmp/opt/trinity/share/man/man1/kmousetool.1
debian/icons/kmousetool.xpm /opt/trinity/share/pixmaps
debian/icons/kmousetool-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/kmousetool-trinity.manpages b/ubuntu/_base/core/tdeaccessibility/debian/kmousetool-trinity.manpages
deleted file mode 100644
index 4ebe07483..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/kmousetool-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/kmousetool-trinity.1
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/kmouth-trinity.install b/ubuntu/_base/core/tdeaccessibility/debian/kmouth-trinity.install
index 546b65791..e80a73c32 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/kmouth-trinity.install
+++ b/ubuntu/_base/core/tdeaccessibility/debian/kmouth-trinity.install
@@ -11,6 +11,11 @@ debian/tmp/opt/trinity/share/apps/kmouth/books/en/en-greetings.phrasebook
debian/tmp/opt/trinity/share/apps/kmouth/books/en/en-howareyou.phrasebook
debian/tmp/opt/trinity/share/apps/kmouth/books/en/en-personal.phrasebook
debian/tmp/opt/trinity/share/apps/kmouth/books/en/en.desktop
+debian/tmp/opt/trinity/share/apps/kmouth/books/nl/nl-courteousness.phrasebook
+debian/tmp/opt/trinity/share/apps/kmouth/books/nl/nl-greetings.phrasebook
+debian/tmp/opt/trinity/share/apps/kmouth/books/nl/nl-howareyou.phrasebook
+debian/tmp/opt/trinity/share/apps/kmouth/books/nl/nl-personal.phrasebook
+debian/tmp/opt/trinity/share/apps/kmouth/books/nl/nl.desktop
debian/tmp/opt/trinity/share/apps/kmouth/books/sv/sv-courteousness.phrasebook
debian/tmp/opt/trinity/share/apps/kmouth/books/sv/sv-greetings.phrasebook
debian/tmp/opt/trinity/share/apps/kmouth/books/sv/sv-howareyou.phrasebook
@@ -92,6 +97,7 @@ debian/tmp/opt/trinity/share/icons/locolor/22x22/actions/speak.png
debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kmouth.png
debian/tmp/opt/trinity/share/icons/locolor/22x22/apps/kmouth.png
debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kmouth.png
+debian/tmp/opt/trinity/share/man/man1/kmouth.1
debian/icons/kmouth.xpm /opt/trinity/share/pixmaps
debian/icons/kmouth-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/kmouth-trinity.manpages b/ubuntu/_base/core/tdeaccessibility/debian/kmouth-trinity.manpages
deleted file mode 100644
index b459b0888..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/kmouth-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/kmouth-trinity.1
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/ksayit-trinity.install b/ubuntu/_base/core/tdeaccessibility/debian/ksayit-trinity.install
index 010831729..87729d105 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/ksayit-trinity.install
+++ b/ubuntu/_base/core/tdeaccessibility/debian/ksayit-trinity.install
@@ -1,5 +1,5 @@
debian/tmp/opt/trinity/bin/ksayit
-debian/tmp/opt/trinity/include/tde/ksayit_fxplugin.h
+debian/tmp/opt/trinity/include/ksayit_fxplugin.h
debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.la
debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.so
debian/tmp/opt/trinity/lib/libKTTSD_Lib.la
@@ -15,6 +15,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksayit_clipempty.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksayit_talking.png
debian/tmp/opt/trinity/share/services/ksayit_libFreeverb.desktop
debian/tmp/opt/trinity/share/servicetypes/ksayit_libFreeverb_service.desktop
+debian/tmp/opt/trinity/share/man/man1/ksayit.1
debian/icons/ksayit.xpm /opt/trinity/share/pixmaps
debian/icons/ksayit-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/kttsd-trinity.install b/ubuntu/_base/core/tdeaccessibility/debian/kttsd-trinity.install
index 2ad412a7f..c1ade102d 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/kttsd-trinity.install
+++ b/ubuntu/_base/core/tdeaccessibility/debian/kttsd-trinity.install
@@ -89,3 +89,5 @@ debian/tmp/opt/trinity/share/services/kttsjobmgr.desktop
debian/tmp/opt/trinity/share/servicetypes/kttsd_audioplugin.desktop
debian/tmp/opt/trinity/share/servicetypes/kttsd_filterplugin.desktop
debian/tmp/opt/trinity/share/servicetypes/kttsd_synthplugin.desktop
+debian/tmp/opt/trinity/share/man/man1/kttsd.1
+debian/tmp/opt/trinity/share/man/man1/kttsmgr.1
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/man/kdeopt-trinity.part b/ubuntu/_base/core/tdeaccessibility/debian/man/kdeopt-trinity.part
deleted file mode 100644
index 37fdfded7..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/man/kdeopt-trinity.part
+++ /dev/null
@@ -1,110 +0,0 @@
-.\" This portion of the manual page is from kdeopt.man, from the
-.\" tdeaccessibility Debian package.
-.SH GENERIC OPTIONS
-.TP
-.B \-\-help
-Show help about options.
-.TP
-.B \-\-help-qt
-Show Qt specific options.
-.TP
-.B \-\-help-tde
-Show TDE specific options.
-.TP
-.B \-\-help-all
-Show all options.
-.TP
-.B \-\-author
-Show author information.
-.TP
-.B \-v, \-\-version
-Show version information.
-.TP
-.B \-\-license
-Show license information.
-.TP
-.B \-\-
-End of options.
-.SH QT OPTIONS
-.TP
-.B \-\-display \fI<displayname>\fB
-Use the X-server display `displayname'.
-.TP
-.B \-\-session \fI<sessionId>\fB
-Restore the application for the given `sessionId'.
-.TP
-.B \-\-cmap
-Causes the application to install a private color map on an 8\-bit
-display.
-.TP
-.B \-\-ncols \fI<count>\fB
-Limits the number of colors allocated in the color cube on an 8\-bit
-display, if the application is using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-Running under a debugger can cause an implicit \-nograb, use \-dograb
-to override.
-.TP
-.B \-\-sync
-Switches to synchronous mode for debugging.
-.TP
-.B \-\-fn, \-\-font \fI<fontname>\fB
-Defines the application font.
-.TP
-.B \-\-bg, \-\-background \fI<color>\fB
-Sets the default background color and an application palette (light
-and dark shades are calculated).
-.TP
-.B \-\-fg, \-\-foreground \fI<color>\fB
-Sets the default foreground color.
-.TP
-.B \-\-btn, \-\-button \fI<color>\fB
-Sets the default button color.
-.TP
-.B \-\-name \fI<name>\fB
-Sets the application name.
-.TP
-.B \-\-title \fI<title>\fB
-Sets the application title (caption).
-.TP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on an 8-bit display.
-.TP
-.B \-\-inputstyle \fI<inputstyle>\fB
-Sets XIM (X Input Method) input style. Possible values are
-\fIonthespot\fP, \fIoverthespot\fP, \fIoffthespot\fP and \fIroot\fP.
-.TP
-.B \-\-im \fI<XIM server>\fB
-Set XIM server.
-.TP
-.B \-\-noxim
-Disable XIM.
-.SH TDE OPTIONS
-.TP
-.B \-\-caption \fI<caption>\fB
-Use `caption' as name in the titlebar.
-.TP
-.B \-\-icon \fI<icon>\fB
-Use `icon' as the application icon.
-.TP
-.B \-\-miniicon \fI<icon>\fB
-Use `icon' as the icon in the titlebar.
-.TP
-.B \-\-dcopserver \fI<server>\fB
-Use the DCOP Server specified by `server'.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.B \-\-style \fI<style>\fB
-Sets the application GUI style.
-.TP
-.B \-\-geometry \fI<geometry>\fB
-Sets the client geometry of the main widget.
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/man/kmag-trinity.man b/ubuntu/_base/core/tdeaccessibility/debian/man/kmag-trinity.man
deleted file mode 100644
index 1f7debb82..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/man/kmag-trinity.man
+++ /dev/null
@@ -1,15 +0,0 @@
-.TH KMAG 1
-.SH NAME
-kmag \- A screen magnifier for TDE
-.SH SYNOPSIS
-.B kmag [file]
-.I [Qt-options] [TDE-options]
-.SH DESCRIPTION
-.B kmag
-Kmag is a TDE screen magnifier for the visually impaired.
-.so kdeopt.part
-.SH SEE ALSO
-More detailed user documentation is available from
-.BR help:/kmag
-(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
-help:/kmag').
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/man/kmousetool-trinity.man b/ubuntu/_base/core/tdeaccessibility/debian/man/kmousetool-trinity.man
deleted file mode 100644
index 4a4d6b411..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/man/kmousetool-trinity.man
+++ /dev/null
@@ -1,18 +0,0 @@
-.TH KMOUSETOOL 1
-.SH NAME
-kmousetool \- TDE mouse manipulation tool
-.SH SYNOPSIS
-.B kmousetool
-.I [Qt-options] [TDE-options]
-.SH DESCRIPTION
-.B kmousetool
-Kmousetool is a TDE mouse manipulation tool aimed to help aid
-disabled people but useful for many. It includes features
-and options that provide artificial intelligence on common
-mouse gestures to perform actions.
-.so kdeopt.part
-.SH SEE ALSO
-More detailed user documentation is available from
-.BR help:/kmousetool
-(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
-help:/kmousetool').
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/man/kmouth-trinity.man b/ubuntu/_base/core/tdeaccessibility/debian/man/kmouth-trinity.man
deleted file mode 100644
index ce2a38b5d..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/man/kmouth-trinity.man
+++ /dev/null
@@ -1,15 +0,0 @@
-.TH KMOUTH 1
-.SH NAME
-kmouth \- A type and say TDE front end for speech synthesizers
-.SH SYNOPSIS
-.B kmouth [file]
-.I [Qt-options] [TDE-options]
-.SH DESCRIPTION
-.B kmouth
-Kmouth is a type and say TDE front end for speech synthesizers.
-.so kdeopt.part
-.SH SEE ALSO
-More detailed user documentation is available from
-.BR help:/kmouth
-(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
-help:/kmouth').
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/core/tdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/core/tdeaccessibility/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/core/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 39dd7745e..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/opt/trinity/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/patches/series b/ubuntu/_base/core/tdeaccessibility/debian/patches/series
index 6b3ddc8ec..e69de29bb 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/patches/series
+++ b/ubuntu/_base/core/tdeaccessibility/debian/patches/series
@@ -1,3 +0,0 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/rules b/ubuntu/_base/core/tdeaccessibility/debian/rules
index 9e4e2c943..2748fa452 100755
--- a/ubuntu/_base/core/tdeaccessibility/debian/rules
+++ b/ubuntu/_base/core/tdeaccessibility/debian/rules
@@ -1,25 +1,19 @@
#! /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_EXTRA_FLAGS := \
- --enable-ksayit-audio-plugins --with-akode --prefix=/opt/trinity \
- --with-extra-libs=/opt/trinity/lib
-
-DEB_DH_STRIP_ARGS := --dbg-package=tdeaccessibility-trinity-dbg
-
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-
-PACKAGES_WITH_LIBS := kttsd-trinity ksayit-trinity
-
-#shlibs_ver = 4:3.5.0
-#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
+#DEB_MAKE_CHECK_TARGET = check
+
+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"