CVS commit by cramblitt: Remove kcmkttsmgr. Use kcmkttsd instead.
M +3 -0 ChangeLog 1.58 M +0 -1 TODO 1.37 M +4 -6 clean_obsolete.sh 1.6 M +0 -2 debian/kttsd.install 1.15 M +2 -12 kcmkttsmgr/Makefile.am 1.15 R kcmkttsmgr/kcmkttsmgr.desktop 1.28 --- kdenonbeta/kttsd/ChangeLog #1.57:1.58 @@ -1,2 +1,5 @@ +2004-12-18 Gary Cramblitt (PhantomsDad) + * Remove kcmkttsmgr. Use kcmkttsd instead. + 2004-12-14 Gary Cramblitt (PhantomsDad) * Under KDE 3.2, FestivalInt plugin automatically finding /usr/share/festival, rather --- kdenonbeta/kttsd/TODO #1.36:1.37 @@ -49,5 +49,4 @@ _ Add method for apps to play a sound file, including in the middle of a job. Could be done with SSML or with special Talker Code = "sound". -_ Remove kcm_kttsmgr once all apps (KSayIt) have stopped using it. _ Add a plugin for TuxTalk, http://tuxtalk.sourceforge.net/. Since it only supports English (at the moment) and is alpha, don't think it is worth it now. --- kdenonbeta/kttsd/clean_obsolete.sh #1.5:1.6 @@ -36,10 +36,8 @@ rm -f $PREFIX/share/servicetypes/kttsd.desktop -# kcm_kttsmgr and kcm_kttsd are now identical. Apps should use -# kcm_kttsd. Once all apps no longer use kcm_kttsmgr, remove it. -# Change made on or about 20 Oct 2004. - -# $LIBTOOL --mode=uninstall $PREFIX/lib/kde3/kcm_kttsmgr -# rm -f $PREFIX/share/applnk/Settings/Accessibility/kcmkttsmgr.desktop +# kcm_kttsmgr removed. Use kcm_kttsd instead. +# Change made on or about 18 Dec 2004. +$LIBTOOL --mode=uninstall $PREFIX/lib/kde3/kcm_kttsmgr +rm -f $PREFIX/share/applnk/Settings/Accessibility/kcmkttsmgr.desktop rm -f $PREFIX/share/applications/kde/kcmkttsmgr.desktop --- kdenonbeta/kttsd/debian/kttsd.install #1.14:1.15 @@ -23,6 +23,4 @@ debian/tmp/usr/lib/kde3/libkttsjobmgrpart.so debian/tmp/usr/lib/kde3/libkttsjobmgrpart.la -debian/tmp/usr/lib/kde3/kcm_kttsmgr.so -debian/tmp/usr/lib/kde3/kcm_kttsmgr.la debian/tmp/usr/lib/kde3/kcm_kttsd.so debian/tmp/usr/lib/kde3/kcm_kttsd.la --- kdenonbeta/kttsd/kcmkttsmgr/Makefile.am #1.14:1.15 @@ -21,7 +21,5 @@ # of the other Makefile.am variables. -# Build two identical libraries, but with different names. -# Once all apps have stopped using kcm_kttsmgr, remove it. -kde_module_LTLIBRARIES = kcm_kttsd.la kcm_kttsmgr.la +kde_module_LTLIBRARIES = kcm_kttsd.la # The source, library search path, and link libraries. @@ -34,12 +32,4 @@ kcm_kttsd_la_LIBADD = $(top_builddir)/kttsd/libktts/libktts.la $(top_builddir)/kttsd/libkttsd/libkttsd.la $(LIB_QT) $(LIB_KIO) $(LIB_KDECORE) -kcm_kttsmgr_la_SOURCES = \ - kcmkttsmgr.cpp \ - kcmkttsmgrwidget.ui \ - addtalker.cpp \ - addtalkerwidget.ui -kcm_kttsmgr_la_LDFLAGS = -avoid-version -module -no-undefined -kcm_kttsmgr_la_LIBADD = $(top_builddir)/kttsd/libktts/libktts.la $(top_builddir)/kttsd/libkttsd/libkttsd.la $(LIB_QT) $(LIB_KIO) $(LIB_KDECORE) - # Header files that should not be installed. noinst_HEADERS = \ @@ -50,5 +40,5 @@ # Install desktop file to application directory. -apps_DATA = kcmkttsd.desktop kcmkttsmgr.desktop +apps_DATA = kcmkttsd.desktop appsdir = $(kde_appsdir)/Settings/Accessibility