From b6b548012326fd26b2834f99adef2f77f7887bdb Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 21 Aug 2011 01:43:11 +0000 Subject: [PATCH] Convert remaining references to kde3 (e.g. in paths) to trinity git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/krusader@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ChangeLog | 2 +- FAQ | 4 ++-- INSTALL | 28 ++++++++++++------------ README | 4 ++-- acinclude.m4 | 40 +++++++++++++++++----------------- doc/en/faq.docbook | 4 ++-- doc/en/index.docbook | 4 ++-- doc/en/installation.docbook | 28 ++++++++++++------------ doc/en/viewer-editor.docbook | 2 +- doc/ru/faq.docbook | 4 ++-- doc/ru/index.docbook | 4 ++-- doc/ru/installation.docbook | 22 +++++++++---------- doc/ru/krusader-tools.docbook | 2 +- doc/update_pot | 4 ++-- krusader.spec | 6 ++--- krusader/Makefile.am | 2 +- krusader/UserAction/expander.h | 2 +- 17 files changed, 81 insertions(+), 81 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ee0df1..acb6d3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1234,7 +1234,7 @@ FIXED: don't watch read-only/not-readable directories - this should improve performance and avoid a loooong wait time on super-mounted cdroms. FIXED: multiple selctions modes are no-more. default mode is Konqueror. - the multi-mode become unstable after the kde3 porting and we had to + the multi-mode become unstable after the trinity porting and we had to disable it. FIXED: memory leak when starting konfigurator. diff --git a/FAQ b/FAQ index 6e61d97..819a141 100644 --- a/FAQ +++ b/FAQ @@ -233,7 +233,7 @@ Installation FAQ In this case only the Help menu is visible and all other menu items like e.g. File and Select are missing. This is because some distributions put the krusaderui.rc file in the wrong directory. To solve the problem, just - copy the krusaderui.rc file from the package krusader_kde3/krusader/ + copy the krusaderui.rc file from the package krusader_trinity/krusader/ krusaderui.rc to $KDEDIR/share/apps/krusader/krusaderui.rc and ~/.kde/ share/apps/krusader/krusaderui.rc and re-run Krusader. If you have compiled Krusader from sources this is often caused if the KDEDIR_-_QTDIR @@ -468,7 +468,7 @@ Usage FAQ 7. Krusader reports "krarc:... protocol not supported" error at opening an archive file, what to do? Install the krarc slave properly: - Copy the kio_krarc.so, kio_krarc.la files into $KDEDIR/lib/kde3 + Copy the kio_krarc.so, kio_krarc.la files into $KDEDIR/lib/trinity Copy the krarc.protocol file into $KDEDIR/share/services or the directory where the KIO slaves are placed in your Linux� distribution. diff --git a/INSTALL b/INSTALL index 3092c95..5b0cdf8 100644 --- a/INSTALL +++ b/INSTALL @@ -215,20 +215,20 @@ the Enter key. Currently, there are two module options: * krusader_kde2: the KDE2 branch, stable but it is basically v1.01 and there are no planned changes - * krusader_kde3: the KDE3 branch that we currently use + * krusader_trinity: the KDE3 branch that we currently use To check out Krusader from CVS: $ cvs -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader login $ cvs -z3 -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader -co krusader_kde3 +co krusader_trinity (note: updates from within the modules directory do not need the -d parameter) If you want to check out a specific version of Krusader from CVS (e.g. Krusader-1.60.0) : $ cvs -z3 -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader -co -rversion_1_60_0 krusader_kde3 +co -rversion_1_60_0 krusader_trinity If you want to check out a specific date of Krusader from CVS (e.g. Krusader- 2006-10-29) : $ cvs -z3 -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader -co -D2006-10-29 krusader_kde3 +co -D2006-10-29 krusader_trinity Mostly being Gentoo® users, we provide a Gentoo®_Live_Ebuild for all those who want to stay on the bleeding edge of file management and do not want to miss the advantages of portage. Please take a look at our Krusader's_Cutting_Edge @@ -238,10 +238,10 @@ Subversion Subversion is used for the Krusader 2.x series for KDE4. it is also possible to Browse_the_Subversion_Repository. To check out the latest Krusader 1.x for KDE 3 from SVN: (NOTE: at moment of -writing use CVS for krusader_kde3, since krusader_kde3 is developed in CVS and +writing use CVS for krusader_trinity, since krusader_trinity is developed in CVS and NOT in SVN, currently you will get an old version in SVN) $ svn co https://krusader.svn.sourceforge.net/svnroot/krusader/trunk/ -krusader_kde3 +krusader_trinity To check out the latest Krusader 2.x for KDE 4 from SVN: $ svn co https://krusader.svn.sourceforge.net/svnroot/krusader/trunk/ krusader_kde4 @@ -273,7 +273,7 @@ export KDEDIR=/usr export export KDEDIRS=/opt/krusader:/usr Install the build_dependencies for Krusader # apt-get build-dep krusader -Download the Krusader sourcecode, unpack and enter the krusader_kde3 directory. +Download the Krusader sourcecode, unpack and enter the krusader_trinity directory. The next command will create ./configure $ make -f Makefile.cvs NOTE: you might need to upgrade automake and/or autoconf, if an error message @@ -291,7 +291,7 @@ $ su -c "make install" /opt/bin/krusader runs the compiled Krusader version. SuSE Install the build_dependencies for Krusader -Download the Krusader sourcecode, unpack and enter the krusader_kde3 directory. +Download the Krusader sourcecode, unpack and enter the krusader_trinity directory. Now you can compile and install Krusader $ make -f Makefile.cvs $ ./configure --prefix=/opt/krusader --enable-debug=full @@ -305,7 +305,7 @@ krusader are usually better so that you don't overwrite files that are installed by your package managment system. Please don't use the /usr/local directory as it simply won't work. Install the build_dependencies for Krusader -Download the Krusader sourcecode, unpack and enter the krusader_kde3 directory. +Download the Krusader sourcecode, unpack and enter the krusader_trinity directory. Now you can compile and install Krusader $ make -f Makefile.cvs $ ./configure --prefix=/usr @@ -350,7 +350,7 @@ the FAQ. If the problem persists, use the help_request to ask for help. 7. Check the environment variables QTDIRand KDEDIR. Krusader's ./configure script needs to know where the Qt™ and KDE directories are. QTDIR: e.g. /usr/lib/qt3 or /usr/qt3 - KDEDIR: e.g. /usr or /opt/kde3 + KDEDIR: e.g. /usr or /opt/trinity Normally your distribution will set them for you, but experience has shown that some do not. You can easily check the values with the echo command. @@ -480,10 +480,10 @@ the FAQ. If the problem persists, use the help_request to ask for help. runs. If everything goes well, it will e.g. end with the following messages: foo - make[2]: Leaving directory `/home/source/krusader_kde3/tar' - make[2]: Entering directory `/home/source/krusader_kde3' - make[2]: Leaving directory `/home/source/krusader_kde3' - make[1]: Leaving directory `/home/source/krusader_kde3' + make[2]: Leaving directory `/home/source/krusader_trinity/tar' + make[2]: Entering directory `/home/source/krusader_trinity' + make[2]: Leaving directory `/home/source/krusader_trinity' + make[1]: Leaving directory `/home/source/krusader_trinity' bash$ If ./configure was successful and make failed for some reason, continue to read this page. If you can not find a solution to your problem, feel diff --git a/README b/README index 869bfe5..37f48c4 100644 --- a/README +++ b/README @@ -154,7 +154,7 @@ To checkout the Krusader KDE3 version from cvs: =============================================== $ cvs -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader login $ cvs -z3 -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader \ -co krusader_kde3 +co krusader_trinity (Note: updates from within the modules directory do not need the -d parameter) @@ -269,7 +269,7 @@ messages, we want to prevent this, of course. Use i18n_status and ViewCVS to see the live translation status of Krusader! http://krusader.sourceforge.net/i18n.php -http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/krusader/krusader_kde3/po/ +http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/krusader/krusader_trinity/po/ The latest news about the Krusader translations will be in the LATEST NEWS section of the "Krusader translation howto". diff --git a/acinclude.m4 b/acinclude.m4 index 663a690..377342b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -479,14 +479,14 @@ if test "$1" = "default"; then if test "$kde_qtver" = "2"; then kde_moduledir='\${libdir}/kde2' else - kde_moduledir='\${libdir}/kde3' + kde_moduledir='\${libdir}/trinity' fi fi if test -z "$kde_styledir"; then - kde_styledir='\${libdir}/kde3/plugins/styles' + kde_styledir='\${libdir}/trinity/plugins/styles' fi if test -z "$kde_widgetdir"; then - kde_widgetdir='\${libdir}/kde3/plugins/designer' + kde_widgetdir='\${libdir}/trinity/plugins/designer' fi if test -z "$xdg_appsdir"; then xdg_appsdir='\${datadir}/applications/kde' @@ -546,7 +546,7 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ - kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" + kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin" test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" if test -n "$KDEDIRS"; then kde_save_IFS=$IFS @@ -580,39 +580,39 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) - kde32ornewer=1 - kde33ornewer=1 + trinity2ornewer=1 + trinity3ornewer=1 if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then - kde32ornewer= - kde33ornewer= + trinity2ornewer= + trinity3ornewer= else if test "$kde_qtver" = "3"; then if test "$kde_qtsubver" -le 1; then - kde32ornewer= + trinity2ornewer= fi if test "$kde_qtsubver" -le 2; then - kde33ornewer= + trinity3ornewer= fi if test "$KDECONFIG" != "compiled"; then if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then - kde33ornewer= + trinity3ornewer= fi fi fi fi - if test -n "$kde32ornewer"; then + if test -n "$trinity2ornewer"; then KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi - if test -n "$kde33ornewer"; then + if test -n "$trinity3ornewer"; then KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) AC_SUBST(MAKEKDEWIDGETS) fi KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then - kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" + kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share" test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then @@ -623,7 +623,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi DCOP_DEPENDENCIES='$(DCOPIDL)' - if test -n "$kde32ornewer"; then + if test -n "$trinity2ornewer"; then KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)' DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)' AC_SUBST(KCONFIG_COMPILER) @@ -1793,7 +1793,7 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes" test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) @@ -1805,7 +1805,7 @@ 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}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" +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="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) @@ -1813,7 +1813,7 @@ ac_kde_libraries="$kde_libdir" kde_widgetdir=NO dnl this might be somewhere else -AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) +AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then AC_MSG_ERROR([ @@ -1821,14 +1821,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail. So, check this please and use another prefix!]) fi -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then +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]) fi if test -n "$kde_widgetdir"; then - kde_widgetdir="$kde_widgetdir/kde3/plugins/designer" + kde_widgetdir="$kde_widgetdir/trinity/plugins/designer" fi diff --git a/doc/en/faq.docbook b/doc/en/faq.docbook index 4051f9c..7a9ba25 100644 --- a/doc/en/faq.docbook +++ b/doc/en/faq.docbook @@ -383,7 +383,7 @@ directory. To solve the problem, just copy the krusaderui.rc file from the package - krusader_kde3/krusader/krusaderui.rc to + krusader_trinity/krusader/krusaderui.rc to $KDEDIR/share/apps/krusader/krusaderui.rc and @@ -930,7 +930,7 @@ kio_krarc.so, kio_krarc.la files into - $KDEDIR/lib/kde3 + $KDEDIR/lib/trinity Copy the krarc.protocol file into diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 146f1ba..b7bbb1a 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -83,7 +83,7 @@ http://groups.google.com/group/krusader-devel/browse_thread/thread/d102adec2edcf 'ChangeLog'> CVSNEWS'> -Documentation ChangeLog'> +Documentation ChangeLog'> i18n page'> requirements on &debian;'> @@ -107,7 +107,7 @@ http://groups.google.com/group/krusader-devel/browse_thread/thread/d102adec2edcf online bug list'> Patch Tracker'> -more translator credits'> +more translator credits'> Subversion'> diff --git a/doc/en/installation.docbook b/doc/en/installation.docbook index 4bd186b..f50888d 100644 --- a/doc/en/installation.docbook +++ b/doc/en/installation.docbook @@ -349,24 +349,24 @@ changes - krusader_kde3: the &kde;3 branch that we + krusader_trinity: the &kde;3 branch that we currently use To check out &krusader; from CVS: $ cvs - $ cvs + $ cvs (note: updates from within the modules directory do not need the -d parameter) If you want to check out a specific version of &krusader; from CVS (⪚ &krusader;-1.60.0) : - $ cvs + $ cvs If you want to check out a specific date of &krusader; from CVS (⪚ &krusader;-2006-10-29) : - $ cvs + $ cvs Mostly being &gentoo; users, we provide a &gentoo-life-ebuild-url; for all those who want to @@ -384,9 +384,9 @@ it is also possible to &browse-svn-repo-url;. To check out the latest &krusader; 1.x for - &kde; 3 from SVN: (NOTE: at moment of writing use CVS for krusader_kde3, since krusader_kde3 + &kde; 3 from SVN: (NOTE: at moment of writing use CVS for krusader_trinity, since krusader_trinity is developed in CVS and NOT in SVN, currently you will get an old version in SVN) - $ svn + $ svn To check out the latest &krusader; 2.x for &kde; 4 from SVN: $ svn @@ -443,7 +443,7 @@ Download the &krusader; sourcecode, unpack and -enter the krusader_kde3 directory. +enter the krusader_trinity directory. The next command will create ./configure @@ -480,7 +480,7 @@ It's recommended to use enable the full debug, so that you can possible problems SuSE Install the build dependencies for &krusader; Download the &krusader; sourcecode, unpack and -enter the krusader_kde3 directory. Now you can compile and install &krusader; +enter the krusader_trinity directory. Now you can compile and install &krusader; $ make -f $ ./configure @@ -499,7 +499,7 @@ enter the krusader_kde3 directory. Now you can compile and are installed by your package managment system. Please don't use the /usr/local directory as it simply won't work. Install the build dependencies for &krusader; -Download the &krusader; sourcecode, unpack and enter the krusader_kde3 directory. Now you can compile and install &krusader; +Download the &krusader; sourcecode, unpack and enter the krusader_trinity directory. Now you can compile and install &krusader; $ make -f $ ./configure @@ -611,7 +611,7 @@ Please don't use the /usr/local directory as it simply won' <path to your KDE installation> ⪚ /usr or - /opt/kde3 + /opt/trinity Normally your distribution will set them for you, but experience has shown that some do not. You can easily check the values with the @@ -845,10 +845,10 @@ Good - your configure finished. Start make now the following messages: foo -make[2]: Leaving directory `/home/source/krusader_kde3/tar' -make[2]: Entering directory `/home/source/krusader_kde3' -make[2]: Leaving directory `/home/source/krusader_kde3' -make[1]: Leaving directory `/home/source/krusader_kde3' +make[2]: Leaving directory `/home/source/krusader_trinity/tar' +make[2]: Entering directory `/home/source/krusader_trinity' +make[2]: Leaving directory `/home/source/krusader_trinity' +make[1]: Leaving directory `/home/source/krusader_trinity' bash$ diff --git a/doc/en/viewer-editor.docbook b/doc/en/viewer-editor.docbook index b9a845a..70bf28c 100644 --- a/doc/en/viewer-editor.docbook +++ b/doc/en/viewer-editor.docbook @@ -621,7 +621,7 @@ -