Convert remaining references to kde3 (e.g. in paths) to trinity

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmyfirewall@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
13 years ago · 1a285676d2
parent 51237d500f
commit 1a285676d2
8 changed files with 43 additions and 43 deletions
--- 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 /opt/kde3/include/kde /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 /opt/trinity/include/kde /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


--- a/check_svn_build.sh
+++ b/check_svn_build.sh
@ -43,7 +43,7 @@ BUILDDIR="../check_svn_build_buildDir"
 MAKE="unsermake"
 MAKE_ARGS="-j3"
 CONFIG_OPTIONS="--prefix=/usr --enable-debug=no "
-SVNURL="https://svn.kde.org/home/kde/branches/extragear/kde3/network/kmyfirewall/"
+SVNURL="https://svn.kde.org/home/kde/branches/extragear/trinity/network/kmyfirewall/"
 ADMIN="../../kde-common/admin/"

 echo "Usage: check_svn_config.sh"
--- a/config.log
+++ b/config.log
@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by configure, which was
 generated by GNU Autoconf 2.61.  Invocation command line was

-  $ ./configure --host=x86_64-linux-gnu --build=x86_64-linux-gnu --disable-debug --prefix=/usr --sysconfdir=/etc --includedir=/usr/include/kde --infodir=/usr/share/info --mandir=/usr/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+  $ ./configure --host=x86_64-linux-gnu --build=x86_64-linux-gnu --disable-debug --prefix=/usr --sysconfdir=/etc --includedir=/usr/include/kde --infodir=/usr/share/info --mandir=/usr/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde

 ## --------- ##
 ## Platform. ##
@ -27,10 +27,10 @@ uname -v = #53-Ubuntu SMP Tue Dec 8 04:02:15 UTC 2009
 /usr/bin/oslevel       = unknown
 /bin/universe          = unknown

-PATH: /opt/kde3/bin
-PATH: /opt/kde3/bin
-PATH: /opt/kde3/games
-PATH: /opt/kde3/bin
+PATH: /opt/trinity/bin
+PATH: /opt/trinity/bin
+PATH: /opt/trinity/games
+PATH: /opt/trinity/bin
 PATH: /home/eldarion/bin
 PATH: /usr/local/sbin
 PATH: /usr/local/bin
@ -298,7 +298,7 @@ infodir='/usr/share/info'
 install_sh=''
 kde_appsdir=''
 kde_bindir=''
-kde_confdir='/etc/kde3'
+kde_confdir='/etc/trinity'
 kde_datadir=''
 kde_htmldir='/usr/share/doc/kde/HTML'
 kde_icondir=''
@ -327,7 +327,7 @@ mandir='/usr/share/man'
 mkdir_p=''
 oldincludedir='/usr/include'
 pdfdir='${docdir}'
-prefix='/opt/kde3'
+prefix='/opt/trinity'
 program_transform_name='s,x,x,'
 psdir='${docdir}'
 qt_includes=''
--- a/4
+++ b/4
@ -1,12 +1,12 @@
 #!/bin/bash

-export kde_confdir="/etc/kde3"
+export kde_confdir="/etc/trinity"
 export kde_prefix="/usr"
 export kde_bindir="$kde_prefix/bin"
 export kde_includedir="$kde_prefix/include/kde"
 export kde_libdir="$kde_prefix/lib"
 export kde_cgidir="$kde_prefix/lib/cgi-bin"
-export kde_moduledir="$kde_prefix/lib/kde3"
+export kde_moduledir="$kde_prefix/lib/trinity"
 export kde_appsdir="$kde_prefix/share/applnk"
 export kde_datadir="$kde_prefix/share/apps"
 export kde_htmldir="$kde_prefix/share/doc/kde/HTML"
--- a/doc/Makefile
+++ b/doc/Makefile
@ -264,7 +264,7 @@ infodir = ${datarootdir}/info
 install_sh = /home/animal/devel/KDE-SVN/kmyfirewall-1.1.0/admin/install-sh
 kde_appsdir = /usr/share/applnk
 kde_bindir = /usr/bin
-kde_confdir = /etc/kde3
+kde_confdir = /etc/trinity
 kde_datadir = /usr/share/apps
 kde_htmldir = /usr/share/doc/kde/HTML
 kde_icondir = /usr/share/icons
@ -275,15 +275,15 @@ kde_libs_htmldir = /usr/share/doc/kde/HTML
 kde_libs_prefix = /usr
 kde_locale = /usr/share/locale
 kde_mimedir = /usr/share/mimelnk
-kde_moduledir = /usr/lib/kde3
+kde_moduledir = /usr/lib/trinity
 kde_qtver = 3
 kde_servicesdir = /usr/share/services
 kde_servicetypesdir = /usr/share/servicetypes
 kde_sounddir = /usr/share/sounds
-kde_styledir = ${libdir}/kde3/plugins/styles
+kde_styledir = ${libdir}/trinity/plugins/styles
 kde_templatesdir = /usr/share/templates
 kde_wallpaperdir = /usr/share/wallpapers
-kde_widgetdir = /usr/lib/kde3/plugins/designer
+kde_widgetdir = /usr/lib/trinity/plugins/designer
 kdeinitdir = $(kde_moduledir)
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
--- a/doc/kmyfirewall/Makefile
+++ b/doc/kmyfirewall/Makefile
@ -248,7 +248,7 @@ infodir = ${datarootdir}/info
 install_sh = /home/animal/devel/KDE-SVN/kmyfirewall-1.1.0/admin/install-sh
 kde_appsdir = /usr/share/applnk
 kde_bindir = /usr/bin
-kde_confdir = /etc/kde3
+kde_confdir = /etc/trinity
 kde_datadir = /usr/share/apps
 kde_htmldir = /usr/share/doc/kde/HTML
 kde_icondir = /usr/share/icons
@ -259,15 +259,15 @@ kde_libs_htmldir = /usr/share/doc/kde/HTML
 kde_libs_prefix = /usr
 kde_locale = /usr/share/locale
 kde_mimedir = /usr/share/mimelnk
-kde_moduledir = /usr/lib/kde3
+kde_moduledir = /usr/lib/trinity
 kde_qtver = 3
 kde_servicesdir = /usr/share/services
 kde_servicetypesdir = /usr/share/servicetypes
 kde_sounddir = /usr/share/sounds
-kde_styledir = ${libdir}/kde3/plugins/styles
+kde_styledir = ${libdir}/trinity/plugins/styles
 kde_templatesdir = /usr/share/templates
 kde_wallpaperdir = /usr/share/wallpapers
-kde_widgetdir = /usr/lib/kde3/plugins/designer
+kde_widgetdir = /usr/lib/trinity/plugins/designer
 kdeinitdir = $(kde_moduledir)
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
--- a/2
+++ b/2
@ -6,7 +6,7 @@ export kde_bindir="$kde_prefix/bin"
 export kde_includedir="$kde_prefix/include/kde"
 export kde_libdir="$kde_prefix/lib"
 export kde_cgidir="$kde_prefix/lib/cgi-bin"
-export kde_moduledir="$kde_prefix/lib/kde3"
+export kde_moduledir="$kde_prefix/lib/trinity"
 export kde_appsdir="$kde_prefix/share/applnk"
 export kde_datadir="$kde_prefix/share/apps"
 export kde_htmldir="$kde_prefix/share/doc/HTML"
--- a/kmyfirewall/installer/openbsd/Makefile
+++ b/kmyfirewall/installer/openbsd/Makefile
@ -301,7 +301,7 @@ infodir = /usr/share/info
 install_sh = /home/agi/debian/kmyfirewall/kmyfirewall-1.1.1/admin/install-sh
 kde_appsdir = ${datadir}/applnk
 kde_bindir = ${exec_prefix}/bin
-kde_confdir = /etc/kde3
+kde_confdir = /etc/trinity
 kde_datadir = ${datadir}/apps
 kde_htmldir = /usr/share/doc/kde/HTML
 kde_icondir = ${datadir}/icons
@ -312,15 +312,15 @@ kde_libs_htmldir = /usr/share/doc/kde/HTML
 kde_libs_prefix = /usr
 kde_locale = ${datadir}/locale
 kde_mimedir = ${datadir}/mimelnk
-kde_moduledir = ${libdir}/kde3
+kde_moduledir = ${libdir}/trinity
 kde_qtver = 3
 kde_servicesdir = ${datadir}/services
 kde_servicetypesdir = ${datadir}/servicetypes
 kde_sounddir = ${datadir}/sounds
-kde_styledir = ${libdir}/kde3/plugins/styles
+kde_styledir = ${libdir}/trinity/plugins/styles
 kde_templatesdir = ${datadir}/templates
 kde_wallpaperdir = ${datadir}/wallpapers
-kde_widgetdir = /usr/lib/kde3/plugins/designer
+kde_widgetdir = /usr/lib/trinity/plugins/designer
 kdeinitdir = $(kde_moduledir)
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec