From c8c1b39746f68a5958c5f70652a063585811ec63 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 16 Nov 2011 13:42:01 -0600 Subject: [PATCH] Additional renaming of kde to tde --- ChangeLog | 2 +- Doxyfile | 2 +- Makefile.am | 6 +- acinclude.m4 | 126 ++++++++++++++++++++-------------------- doc/Makefile.am | 4 +- doc/en/HTML/Makefile.am | 4 +- doc/en/Makefile.am | 4 +- krename.kdevelop | 6 +- po/Makefile.am | 4 +- po/it.po | 2 +- po/zh_CN.GB2312.po | 2 +- po/zh_TW.Big5.po | 2 +- 12 files changed, 82 insertions(+), 82 deletions(-) diff --git a/ChangeLog b/ChangeLog index 718d0a7..0de6976 100644 --- a/ChangeLog +++ b/ChangeLog @@ -302,7 +302,7 @@ Version 2.7 Runtime switching of GUI mode is now possible Fixed compilation problems on SuSE 8.0 (Qt <= 3.0.5) Defined const functions as const - Fixed includes (thanks to the excellent fixincludes script from kdesdk) + Fixed includes (thanks to the excellent fixincludes script from tdesdk) Added a GUI mode selection dialog on first start Added support for formating numbers from plugins (e.g.: [##Tracknumber]) Fixed service menu entries (thanks to Mark Volkert) diff --git a/Doxyfile b/Doxyfile index 42e3237..e4612f3 100644 --- a/Doxyfile +++ b/Doxyfile @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = krename.kdevelop +PROJECT_NAME = krename.tdevelop PROJECT_NUMBER = OUTPUT_DIRECTORY = OUTPUT_LANGUAGE = English diff --git a/Makefile.am b/Makefile.am index 5368ff5..2b04825 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## SUBDIRS = krename po doc -EXTRA_DIST = krename.kdevelop admin AUTHORS COPYING ChangeLog INSTALL README TODO krename.spec +EXTRA_DIST = krename.tdevelop admin AUTHORS COPYING ChangeLog INSTALL README TODO krename.spec -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs AUTOMAKE_OPTIONS = foreign diff --git a/acinclude.m4 b/acinclude.m4 index a78948b..b2f364a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -378,7 +378,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1824,7 +1824,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1839,7 +1839,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -3499,16 +3499,16 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config AC_DEFUN([KDE_CHECK_LIB64], [ - kdelibsuff="$kde_libs_suffix" - if test -z "$kdelibsuff"; then - kdelibsuff="auto" + tdelibsuff="$kde_libs_suffix" + if test -z "$tdelibsuff"; then + tdelibsuff="auto" fi AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval) + tdelibsuff=$enableval) - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include @@ -3516,23 +3516,23 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out | grep -E "libc.so"| grep -E -o "/lib[[^\/]]*/" | sed "s/lib//" | sed "s/\/*//g"` + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out | grep -E "libc.so"| grep -E -o "/lib[[^\/]]*/" | sed "s/lib//" | sed "s/\/*//g"` rm -rf conftest.* fi - if test "$kdelibsuff" = "no"; then - kdelibsuff= + if test "$tdelibsuff" = "no"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -4557,7 +4557,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4945,7 +4945,7 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], @@ -4992,9 +4992,9 @@ AC_DEFUN([KDE_SET_PREFIX], kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -5660,7 +5660,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5680,7 +5680,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5917,9 +5917,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/doc/Makefile.am b/doc/Makefile.am index 6063bd6..9f56c25 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## SUBDIRS = en -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/doc/en/HTML/Makefile.am b/doc/en/HTML/Makefile.am index b668138..84ba063 100644 --- a/doc/en/HTML/Makefile.am +++ b/doc/en/HTML/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = index.html @@ -10,4 +10,4 @@ install-data-local: uninstall-local: -rm -f $(kde_htmldir)/en/krename/index.html -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am index 8838c6b..f7a12ac 100644 --- a/doc/en/Makefile.am +++ b/doc/en/Makefile.am @@ -1,8 +1,8 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## SUBDIRS = HTML -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ KDE_LANG = en KDE_DOCS = krename diff --git a/krename.kdevelop b/krename.kdevelop index 9c7f1ff..8c5394f 100644 --- a/krename.kdevelop +++ b/krename.kdevelop @@ -1,5 +1,5 @@ - - + + Dominik Seichter domseichter@web.de @@ -192,4 +192,4 @@ true -C - + diff --git a/po/Makefile.am b/po/Makefile.am index a226c2c..0eade3d 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -1,8 +1,8 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = krename.pot -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ POFILES = AUTO diff --git a/po/it.po b/po/it.po index cb3e500..3553f1a 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2005-10-16 10:49+0200\n" "PO-Revision-Date: 2006-03-02 13:24+0100\n" "Last-Translator: Vincenzo Reale \n" -"Language-Team: Italian \n" +"Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 02c41ee..f93d81b 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -1618,7 +1618,7 @@ msgstr "支持的记号：" #~ msgstr "添加目录里的所有文件" #~ msgid "" -#~ "Please install the kdeutils package to use the regular expressions editor." +#~ "Please install the tdeutils package to use the regular expressions editor." #~ msgstr "请安装KDEUTILS套件以使用正规表达式编辑器。" #, fuzzy diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po index 2cfd132..aa9dab4 100644 --- a/po/zh_TW.Big5.po +++ b/po/zh_TW.Big5.po @@ -1711,7 +1711,7 @@ msgstr "支援的影像格式：" #~ msgstr "新增目錄裡的所有檔案" #~ msgid "" -#~ "Please install the kdeutils package to use the regular expressions editor." +#~ "Please install the tdeutils package to use the regular expressions editor." #~ msgstr "請安裝KDEUTILS套件以使用正規表達式編輯器。" #, fuzzy