From 4a399d165e8f7bb42f28908a061ddfd1b88e7737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Fri, 3 Aug 2012 17:28:03 +0200
Subject: [PATCH] Adaptation for Trinity

---
 acinclude.m4            | 20 ++++++++++----------
 configure               | 28 ++++++++++++++--------------
 da/doc/index.docbook    |  2 +-
 de/doc/index.docbook    |  2 +-
 es/doc/index.docbook    |  2 +-
 et/doc/index.docbook    |  2 +-
 fr/doc/index.docbook    |  2 +-
 it/doc/index.docbook    |  2 +-
 nl/doc/index.docbook    |  2 +-
 pl/doc/index.docbook    |  2 +-
 pt/doc/index.docbook    |  2 +-
 pt_BR/doc/index.docbook |  2 +-
 ru/doc/index.docbook    |  2 +-
 sv/doc/index.docbook    |  2 +-
 uk/doc/index.docbook    |  2 +-
 15 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 6b26319..f29f77c 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
@@ -612,7 +612,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         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
@@ -1817,7 +1817,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)
@@ -1829,7 +1829,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)
@@ -1837,7 +1837,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([
@@ -1845,14 +1845,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/configure b/configure
index a432793..823c78a 100755
--- a/configure
+++ b/configure
@@ -2854,7 +2854,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
-    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
@@ -31443,7 +31443,7 @@ fi
 
 if test -z ""; 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"
 
@@ -31473,7 +31473,7 @@ So, check this please and use another prefix!" >&2;}
    { (exit 1); exit 1; }; }
 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"
 
@@ -31498,7 +31498,7 @@ kde_widgetdir=NO
 kde_widgetdir=NO
 for i in $kde_libdirs;
 do
-  for j in "kde3/plugins/designer/kdewidgets.la";
+  for j in "trinity/plugins/designer/kdewidgets.la";
   do
     echo "configure: 31503: $i/$j" >&5
     if test -r "$i/$j"; then
@@ -31520,7 +31520,7 @@ So, check this please and use another prefix!" >&2;}
    { (exit 1); exit 1; }; }
 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
 { { echo "$as_me:$LINENO: error:
 I can't find the designer plugins. These are required and should have been installed
 by kdelibs" >&5
@@ -31531,7 +31531,7 @@ by kdelibs" >&2;}
 fi
 
 if test -n "$kde_widgetdir"; then
-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
+    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
 fi
 
 
@@ -31774,14 +31774,14 @@ if test "$ac_use_path_checking" = "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'
@@ -32076,14 +32076,14 @@ if test "$ac_use_path_checking" = "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'
@@ -32359,7 +32359,7 @@ _ACEOF
     fi
 
 
-    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
@@ -33011,7 +33011,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
 
 
         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"
 
 KDE_XSL_STYLESHEET=NO
diff --git a/da/doc/index.docbook b/da/doc/index.docbook
index 1ed30c6..cd7aa10 100644
--- a/da/doc/index.docbook
+++ b/da/doc/index.docbook
@@ -156,7 +156,7 @@
 > og tilføj <filename class="directory"
 >$<envar
 >KDEDIR</envar
->/lib/kde3/plugins</filename
+>/lib/trinity/plugins</filename
 > i søgestien for plugin (erstat $<envar
 >KDEDIR</envar
 > med KDE's basismappe). </para>
diff --git a/de/doc/index.docbook b/de/doc/index.docbook
index 27cffd5..bcc0ac1 100644
--- a/de/doc/index.docbook
+++ b/de/doc/index.docbook
@@ -156,7 +156,7 @@
 > und fügen Sie <filename class="directory"
 >$<envar
 >KDEDIRS</envar
->/lib/kde3/plugins</filename
+>/lib/trinity/plugins</filename
 > zu dem Suchpfad für Bibliotheken hinzu (ersetzen Sie $<envar
 >KDEDIRS</envar
 > durch Ihren Basisordner von &kde;). </para>
diff --git a/es/doc/index.docbook b/es/doc/index.docbook
index 1ad4c13..c406bc7 100644
--- a/es/doc/index.docbook
+++ b/es/doc/index.docbook
@@ -184,7 +184,7 @@
 > y añada <filename class="directory"
 >$<envar
 >KDEDIR</envar
->/lib/kde3/plugins</filename
+>/lib/trinity/plugins</filename
 > a la ruta de búsqueda de extensiones (reemplace $<envar
 >KDEDIR</envar
 > con su directorio base de kde). </para>
diff --git a/et/doc/index.docbook b/et/doc/index.docbook
index 6dadb33..e96aef9 100644
--- a/et/doc/index.docbook
+++ b/et/doc/index.docbook
@@ -156,7 +156,7 @@
 > ja lisa <filename class="directory"
 >$<envar
 >KDEDIR</envar
->/lib/kde3/plugins</filename
+>/lib/trinity/plugins</filename
 > plugina otsinguteele (asenda $<envar
 >KDEDIR</envar
 > oma KDE baaskataloogiga). </para>
diff --git a/fr/doc/index.docbook b/fr/doc/index.docbook
index 17f81b9..a68aa61 100644
--- a/fr/doc/index.docbook
+++ b/fr/doc/index.docbook
@@ -139,7 +139,7 @@
 > et ajoutez <filename class="directory"
 >$<envar
 >KDEDIR</envar
->/lib/kde3/module externes</filename
+>/lib/trinity/module externes</filename
 >_au_chemin_du_module_externe (remplacez $<envar
 >KDEDIR</envar
 > par le dossier racine de kde). </para>
diff --git a/it/doc/index.docbook b/it/doc/index.docbook
index 9cc3880..907b1c0 100644
--- a/it/doc/index.docbook
+++ b/it/doc/index.docbook
@@ -170,7 +170,7 @@ Traduzione dell'interfaccia grafica</contrib
 > ed aggiungi <filename class="directory"
 >$<envar
 >KDEDIR</envar
->/lib/kde3/plugins</filename
+>/lib/trinity/plugins</filename
 > al percorso di ricerca dei plugin (rimpiazza $<envar
 >KDEDIR</envar
 > con la tua cartella base di kde). </para>
diff --git a/nl/doc/index.docbook b/nl/doc/index.docbook
index 9f83c31..830e6a7 100644
--- a/nl/doc/index.docbook
+++ b/nl/doc/index.docbook
@@ -156,7 +156,7 @@
 > op en voeg <filename class="directory"
 >$<envar
 >KDEDIR</envar
->/lib/kde3/plugins</filename
+>/lib/trinity/plugins</filename
 > toen aan tabblad Library Paths (vervang $<envar
 >KDEDIR</envar
 > door de basismap van uw &kde;-installatie). </para>
diff --git a/pl/doc/index.docbook b/pl/doc/index.docbook
index 6424224..9088f42 100644
--- a/pl/doc/index.docbook
+++ b/pl/doc/index.docbook
@@ -155,7 +155,7 @@
 > i dodaj <filename class="directory"
 >$<envar
 >KDEDIR</envar
->/lib/kde3/plugins</filename
+>/lib/trinity/plugins</filename
 > do ścieżki wyszukiwania wtyczek(the plugin search path) (zamień $<envar
 >KDEDIR</envar
 > na ścieżkę do Twojego KDE). </para>
diff --git a/pt/doc/index.docbook b/pt/doc/index.docbook
index 274a01e..3b10ecc 100644
--- a/pt/doc/index.docbook
+++ b/pt/doc/index.docbook
@@ -157,7 +157,7 @@
 > e adicione <filename class="directory"
 >$<envar
 >KDEDIR</envar
->/lib/kde3/plugins</filename
+>/lib/trinity/plugins</filename
 > às localizações de procura de 'plugins' (substitua $<envar
 >KDEDIR</envar
 > pela sua directoria base do KDE). </para>
diff --git a/pt_BR/doc/index.docbook b/pt_BR/doc/index.docbook
index b358552..0fde47e 100644
--- a/pt_BR/doc/index.docbook
+++ b/pt_BR/doc/index.docbook
@@ -153,7 +153,7 @@
 > e adicione <filename class="directory"
 >$<envar
 >KDEDIR</envar
->/lib/kde3/plugins</filename
+>/lib/trinity/plugins</filename
 > ao caminho de busca de plugin (substitua $<envar
 >KDEDIR</envar
 > com seu diretório base do kde). </para>
diff --git a/ru/doc/index.docbook b/ru/doc/index.docbook
index 5f0f71c..db68d95 100644
--- a/ru/doc/index.docbook
+++ b/ru/doc/index.docbook
@@ -167,7 +167,7 @@
 > и добавьте <filename class="directory"
 >$<envar
 >KDEDIR</envar
->/lib/kde3/plugins</filename
+>/lib/trinity/plugins</filename
 > в список поиска (замените $<envar
 >KDEDIR</envar
 > установочным каталогом). </para>
diff --git a/sv/doc/index.docbook b/sv/doc/index.docbook
index 89e3715..f0c15df 100644
--- a/sv/doc/index.docbook
+++ b/sv/doc/index.docbook
@@ -156,7 +156,7 @@
 > och lägg till <filename class="directory"
 >$<envar
 >KDEDIR</envar
->/lib/kde3/plugins</filename
+>/lib/trinity/plugins</filename
 > i sökvägen för instickskomponenter (ersätt $<envar
 >KDEDIR</envar
 > med KDE:s baskatalog). </para>
diff --git a/uk/doc/index.docbook b/uk/doc/index.docbook
index 89648e9..0581524 100644
--- a/uk/doc/index.docbook
+++ b/uk/doc/index.docbook
@@ -200,7 +200,7 @@
 > і додайте <filename class="directory"
 >$<envar
 >KDEDIR</envar
->/lib/kde3/plugins</filename
+>/lib/trinity/plugins</filename
 > у список пошуку втулків (замініть $<envar
 >KDEDIR</envar
 > на вашу базову теку kde). </para>