Automatically update admin submodule and copy sustem libtool files before first build

Fix FTBFS in many TDE sample projects
Place TDE sample projects in a TDE category instead of a KDE category

9 files changed, 66 insertions, 66 deletions

diff --git a/languages/cpp/app_templates/kscons_kmdi/INSTALL b/languages/cpp/app_templates/kscons_kmdi/INSTALL
index d73ac7db..e61a3acc 100644
--- a/languages/cpp/app_templates/kscons_kmdi/INSTALL
+++ b/languages/cpp/app_templates/kscons_kmdi/INSTALL
@@ -1,7 +1,7 @@
 REQUIREMENTS
 ------------
 
-* KDE headers & libraries for tdelibs
+* TDE headers & libraries for tdelibs
 * A Python interpreter for the compilation
 
 scons v0.96.1 or newer is recommended, but it's not required since a
diff --git a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART b/languages/cpp/app_templates/kscons_kmdi/QUICKSTART
index b6411d09..a5fbba33 100644
--- a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART
+++ b/languages/cpp/app_templates/kscons_kmdi/QUICKSTART
@@ -144,7 +144,7 @@ A medium-sized project containing several targets, libraries and data
 files can be converted very quickly.
 Also, remember that SConscript files are actually python scripts ..
 you can use whatever python feature you want in them, ie: "for" loops,
-this is how the kde helpers work (KDEprogram, KDEshlib ..).
+this is how the kde helpers work (TDEprogram, TDEshlib ..).
 
 If you are stuck, you can also have a look at more complicated 
 bksys-based projects like kdissert or kshaderdesigner
diff --git a/languages/cpp/app_templates/kscons_kmdi/README b/languages/cpp/app_templates/kscons_kmdi/README
index 578feccd..a8de4e35 100644
--- a/languages/cpp/app_templates/kscons_kmdi/README
+++ b/languages/cpp/app_templates/kscons_kmdi/README
@@ -31,7 +31,7 @@ for starting with this application template.
       make uninstall -> scons -c install
       make dist      -> scons dist
 
-* To build apps, use KDEprogram, KDEshlib, etc.
+* To build apps, use TDEprogram, TDEshlib, etc.
   these functions are documented at the bottom of kde.py
   More information can be found in the QUICKSTART 
 
@@ -101,7 +101,7 @@ refer to the file po/SConscript and po/messages.sh
  http://public.kde.planetmirror.com/pub/kde/devel/gettext-kde/
 2. Install that gettext in ~/bin/
 3. cd ~/yourproject, export PATH=~/bin:$PATH, export
-TDEDIR=/where_your_KDE3_is
+TDEDIR=/where_your_TDE3_is
 4. make -f admin/Makefile.common package-messages
 5. make package-messages
 6. Translate the po files (not the pot!!) with kbabel or xemacs
diff --git a/languages/cpp/app_templates/kscons_kmdi/SConscript-doc b/languages/cpp/app_templates/kscons_kmdi/SConscript-doc
index 6769a359..0c3e07e7 100644
--- a/languages/cpp/app_templates/kscons_kmdi/SConscript-doc
+++ b/languages/cpp/app_templates/kscons_kmdi/SConscript-doc
@@ -13,7 +13,7 @@ myenv=env.Copy()
 ## The following looks complicated but it is not
 ## We first define a function to install all files as documentation
 ## The documentation is of course lying in subfolders from here
-## * normal files are installed under KDEDOC/destination
+## * normal files are installed under TDEDOC/destination
 ## * meinproc files are not installed, but processed into a single 
 ##   index.cache.bz2 which is installed afterwards
 
@@ -36,7 +36,7 @@ i_am_a_documentation_writer = 0
 def processfolder(folder, lang, destination=""):
 	# folder is the folder to process
 	# lang is the language
-	# destination is the subdirectory in KDEDOC
+	# destination is the subdirectory in TDEDOC
 	
 	docfiles = glob.glob(folder+"/???*.*") # file files that are at least 4 chars wide :)
 
@@ -68,7 +68,7 @@ def processfolder(folder, lang, destination=""):
 			docbook_list.append( file )
 			continue
 
-		myenv.KDEinstall('KDEDOC', lang+'/'+destination, file)
+		myenv.TDEinstall('TDEDOC', lang+'/'+destination, file)
 
 	# Now process the index.docbook files ..
 	if len(docbook_list) == 0:
@@ -80,7 +80,7 @@ def processfolder(folder, lang, destination=""):
 		for file in docbook_list:
 			myenv.Depends( folder+'index.cache.bz2', file )
 	myenv.Meinproc( folder+'/index.cache.bz2', folder+'/index.docbook' )
-	myenv.KDEinstall( 'KDEDOC', lang+'/'+destination, folder+'/index.cache.bz2' )
+	myenv.TDEinstall( 'TDEDOC', lang+'/'+destination, folder+'/index.cache.bz2' )
 
 ###################################################################
 # TELL WHICH FOLDERS TO PROCESS
diff --git a/languages/cpp/app_templates/kscons_kmdi/SConscript-src b/languages/cpp/app_templates/kscons_kmdi/SConscript-src
index 1b3ad2d3..c1f9742d 100644
--- a/languages/cpp/app_templates/kscons_kmdi/SConscript-src
+++ b/languages/cpp/app_templates/kscons_kmdi/SConscript-src
@@ -20,41 +20,41 @@ settings.kcfgc
 prefs.ui
 """
 # Now that we have our list of sources we can build the program
-myenv.KDEprogram( '%{APPNAMELC}', %{APPNAMELC}_sources ) # main program
-myenv.KDEaddpaths_includes( './ ../' ) # additional paths
-myenv.KDEaddlibs( 'qt-mt tdecore kio kparts kmdi' ) # additional libraries
+myenv.TDEprogram( '%{APPNAMELC}', %{APPNAMELC}_sources ) # main program
+myenv.TDEaddpaths_includes( './ ../' ) # additional paths
+myenv.TDEaddlibs( 'qt-mt tdecore kio kparts kmdi' ) # additional libraries
 
 ## Next, the kpart library
-## using KDEshlib, the .so and .la are installed automatically when needed
+## using TDEshlib, the .so and .la are installed automatically when needed
 
 myenv2=env.Copy()
 %{APPNAMELC}part_sources = '%{APPNAMELC}_part.cpp'
-myenv2.KDEshlib( 'lib%{APPNAMELC}part', %{APPNAMELC}part_sources)
-myenv2.KDEaddpaths_includes( './ #/' ) # the '#' means the top-level directory
-myenv2.KDEaddlibs( 'qt-mt kio tdecore tdeprint kparts' )
-# myenv2.KDEaddflags_link( '-DQT_THREAD_SUPPORT' )
+myenv2.TDEshlib( 'lib%{APPNAMELC}part', %{APPNAMELC}part_sources)
+myenv2.TDEaddpaths_includes( './ #/' ) # the '#' means the top-level directory
+myenv2.TDEaddlibs( 'qt-mt kio tdecore tdeprint kparts' )
+# myenv2.TDEaddflags_link( '-DQT_THREAD_SUPPORT' )
 
 #############################
 ## Data files to install
 
-## NOTE: KDEinstall( resource_type, subdir, list of files )
+## NOTE: TDEinstall( resource_type, subdir, list of files )
 
 ## the .kcfg file
-myenv.KDEinstall( 'KDEKCFG', '', '%{APPNAMELC}.kcfg' )
+myenv.TDEinstall( 'TDEKCFG', '', '%{APPNAMELC}.kcfg' )
 
 ## the program .desktop file
-myenv.KDEinstall( 'KDEMENU', '/Utilities', '%{APPNAMELC}.desktop' )
+myenv.TDEinstall( 'TDEMENU', '/Utilities', '%{APPNAMELC}.desktop' )
 
 ## the rc file - named *_shell.rc instead of *ui.rc for kpart apps
-myenv.KDEinstall( 'KDEDATA', '/%{APPNAMELC}', '%{APPNAMELC}_shell.rc' )
+myenv.TDEinstall( 'TDEDATA', '/%{APPNAMELC}', '%{APPNAMELC}_shell.rc' )
 
-## this servicetype desktop file goes in KDEXDG whether the other one goes in KDEMENU
-myenv.KDEinstall( 'KDEXDG', '', '%{APPNAMELC}_part.desktop' )
+## this servicetype desktop file goes in TDEXDG whether the other one goes in TDEMENU
+myenv.TDEinstall( 'TDEXDG', '', '%{APPNAMELC}_part.desktop' )
 
 ## the kpart resource file
-myenv.KDEinstall( 'KDEDATA', '/%{APPNAMELC}part', '%{APPNAMELC}_part.rc' )
+myenv.TDEinstall( 'TDEDATA', '/%{APPNAMELC}part', '%{APPNAMELC}_part.rc' )
 
 ## Installing icons is easy (hi-16-app-%{APPNAMELC}.png, hi-22-app-%{APPNAMELC}.png)
-#myenv.KDEicon()
+#myenv.TDEicon()
 
 ## do not forget that this is a python script so even loops are allowed... :)
diff --git a/languages/cpp/app_templates/kscons_kmdi/SConstruct b/languages/cpp/app_templates/kscons_kmdi/SConstruct
index b82de4e1..3954247c 100644
--- a/languages/cpp/app_templates/kscons_kmdi/SConstruct
+++ b/languages/cpp/app_templates/kscons_kmdi/SConstruct
@@ -20,8 +20,8 @@ The variables are saved automatically after the first run (look at cache/kde.cac
 env = Environment( tools=['default', 'generic', 'kde'], toolpath=['./', './admin'])
 #env = Environment( tools=['default', 'generic', 'kde', 'othertool'], toolpath=['./', './admin'])
 
-env.KDEuse("environ rpath")
-#env.KDEuse("environ rpath lang_qt thread nohelp")
+env.TDEuse("environ rpath")
+#env.TDEuse("environ rpath lang_qt thread nohelp")
 
 ###################################################################
 # SCRIPTS FOR BUILDING THE TARGETS
@@ -34,7 +34,7 @@ doc
 env.subdirs(dirs)
 
 ## Process the translations in the po/ directory
-env.KDElang('po/', '%{APPNAMELC}')
+env.TDElang('po/', '%{APPNAMELC}')
 
 ###################################################################
 # CONVENIENCE FUNCTIONS TO EMULATE 'make dist' and 'make distclean'
diff --git a/languages/cpp/app_templates/kscons_kmdi/app.tdevelop b/languages/cpp/app_templates/kscons_kmdi/app.tdevelop
index 25ed5653..317a4cbc 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app.tdevelop
+++ b/languages/cpp/app_templates/kscons_kmdi/app.tdevelop
@@ -4,13 +4,13 @@
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
     <version>%{VERSION}</version>
-    <projectmanagement>KDevKDEAutoProject</projectmanagement>
+    <projectmanagement>KDevTDEAutoProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <keywords>
       <keyword>C++</keyword>
       <keyword>Code</keyword>
       <keyword>Qt</keyword>
-      <keyword>KDE</keyword>
+      <keyword>TDE</keyword>
     </keywords>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
diff --git a/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate b/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate
index affc89d6..8f8fb599 100644
--- a/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate
+++ b/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate
@@ -1,4 +1,4 @@
-# KDE Config File
+# TDE Config File
 [General]
 Name=Scons-based KMDI application
 Name[ca]=Aplicació per a KMDI basada en Scons
@@ -21,7 +21,7 @@ Name[nl]=Scons gebaseerde KMDI-toepassing
 Name[pl]=Program KMDI wykorzystujący Scons
 Name[pt]=Aplicação KMDI usando Scons
 Name[pt_BR]=Aplicação KMDI usando Scons
-Name[ru]=Многооконное приложение KDE на базе Scons
+Name[ru]=Многооконное приложение TDE на базе Scons
 Name[sk]=KMDI aplikácia založená na Scons
 Name[sr]=KMDI програм на основу Scons-а
 Name[sr@Latn]=KMDI program na osnovu Scons-a
@@ -29,11 +29,11 @@ Name[sv]=Scons-baserat KMDI-program
 Name[tr]=Scons tabanlı KMDI uygulaması
 Name[zh_CN]=基于 Scons 的 KMDI 应用程序
 Name[zh_TW]=Scons 為基礎的 KMDI 應用程式
-Category=C++/KDE
+Category=C++/TDE
 Icon=kscons_kmdi.png
 Comment=Generates a complex KMDI application. Scons scripts are provided for compiling and installing the application.
 Comment[ca]=Genera una complexa aplicació per a KMDI. Els scripts en Scons són proveïts per a compilar i instal·lar l'aplicació.
-Comment[da]=Genererer et komplekst KDE-program. Der sørges for scons-scripter til at kompilere og installere programmet.
+Comment[da]=Genererer et komplekst TDE-program. Der sørges for scons-scripter til at kompilere og installere programmet.
 Comment[de]=Erstellt eine aufwändige KMDI-Anwendung. Scons-Skripte zum Kompilieren und Installieren der Anwendung werden zur Verfügung gestellt.
 Comment[el]=Δημιουργεί μια πολύπλοκη εφαρμογή KMDI. Προσφέρονται σενάρια Scons για τη μεταγλώττιση και εγκατάσταση της εφαρμογής.
 Comment[es]=Genera una aplicación KMDI compleja. Se proporcionan guiones en Scons para compilar e instalar la aplicación.
@@ -50,7 +50,7 @@ Comment[nl]=Genereert een complexe KMDI-applicatie. Scons-scripts worden gebruik
 Comment[pl]=Generuje złożony program z powłoką KMDI. Do kompilacji i instalacji wykorzystywany jest skrypt Scons.
 Comment[pt]=Gera uma aplicação complexa com KMDI. Os ficheiros do Scons são fornecidos para compilar e instalar a aplicação.
 Comment[pt_BR]=Gera uma aplicação complexa com KMDI. Os ficheiros do Scons são fornecidos para compilar e instalar a aplicação.
-Comment[ru]=Создание полноценного многооконного приложения KDE. Для сборки и установки этого приложения будут использованы скрипты Scons.
+Comment[ru]=Создание полноценного многооконного приложения TDE. Для сборки и установки этого приложения будут использованы скрипты Scons.
 Comment[sk]=Vygeneruje komplexnú KMDI aplikáciu. K dispozícii je Scons skriptna kompiláciu a inštaláciu aplikácie.
 Comment[sr]=Прави сложени KMDI програм. Дате су Scons скрипте за превођење и инсталирање програма.
 Comment[sr@Latn]=Pravi složeni KMDI program. Date su Scons skripte za prevođenje i instaliranje programa.
@@ -240,32 +240,32 @@ Dest=%{dest}/src/%{APPNAMELC}_part.rc
 
 [MSG]
 Type=message
-Comment=A KDE application with scons scripts was created in %{dest}
-Comment[ca]=Una aplicació per al KDE amb scripts en Scons ha estat creada e n %{dest}
-Comment[da]=Et KDE program med scons-scripter blev oprette i %{dest}
-Comment[de]=Eine KDE-Anwendung mit Scons-Skripten wurde in %{dest} erstellt.
-Comment[el]=Μια εφαρμογή KDE με σενάρια scons δημιουργήθηκε στο %{dest}
-Comment[es]=Una aplicación para KDE con guiones de Scons ha sido creada en %{dest}
-Comment[et]=KDE rakendus Sconsi skriptidega loodi asukohta %{dest}
-Comment[eu]=Scons script-dun KDE aplikazio bat sortu da hemen: %{dest}
-Comment[fa]=یک کاربرد KDE با دست‌نوشته‌های scons در %{dest} ایجاد شد
-Comment[fr]=Une application KDE comprenant des scripts Scons a été créée dans %{dest}
-Comment[ga]=Cruthaíodh feidhmchlár KDE le scripteanna scons i %{dest}
-Comment[gl]=Creouse unha aplicación KDE con scripts scons en %{dest}
-Comment[hu]=Létrejött egy Scons-szkripteket használó KDE-alapú alkalmazás itt: %{dest}
-Comment[it]=È stata creata un'applicazione KDE con gli script scons in %{dest}
-Comment[ja]=Scons スクリプトを使った KDE アプリケーションを %{dest} に作成しました
-Comment[nds]=In %{dest} wöör en KDE-Programm mit scons-Skripten opstellt
+Comment=A TDE application with scons scripts was created in %{dest}
+Comment[ca]=Una aplicació per al TDE amb scripts en Scons ha estat creada e n %{dest}
+Comment[da]=Et TDE program med scons-scripter blev oprette i %{dest}
+Comment[de]=Eine TDE-Anwendung mit Scons-Skripten wurde in %{dest} erstellt.
+Comment[el]=Μια εφαρμογή TDE με σενάρια scons δημιουργήθηκε στο %{dest}
+Comment[es]=Una aplicación para TDE con guiones de Scons ha sido creada en %{dest}
+Comment[et]=TDE rakendus Sconsi skriptidega loodi asukohta %{dest}
+Comment[eu]=Scons script-dun TDE aplikazio bat sortu da hemen: %{dest}
+Comment[fa]=یک کاربرد TDE با دست‌نوشته‌های scons در %{dest} ایجاد شد
+Comment[fr]=Une application TDE comprenant des scripts Scons a été créée dans %{dest}
+Comment[ga]=Cruthaíodh feidhmchlár TDE le scripteanna scons i %{dest}
+Comment[gl]=Creouse unha aplicación TDE con scripts scons en %{dest}
+Comment[hu]=Létrejött egy Scons-szkripteket használó TDE-alapú alkalmazás itt: %{dest}
+Comment[it]=È stata creata un'applicazione TDE con gli script scons in %{dest}
+Comment[ja]=Scons スクリプトを使った TDE アプリケーションを %{dest} に作成しました
+Comment[nds]=In %{dest} wöör en TDE-Programm mit scons-Skripten opstellt
 Comment[ne]=स्कोन स्क्रिप्टसँग केडीई अनुप्रयोग %{dest} मा सिर्जना गरियो
-Comment[nl]=Een KDE applicatie inclusief Scons-scripts is aangemaakt in %{dest}
-Comment[pl]=Program KDE ze skryptami scons utworzony w %{dest}
-Comment[pt]=Foi criada uma aplicação do KDE com ficheiros do 'scons' em %{dest}
-Comment[pt_BR]=Foi criada uma aplicação do KDE com ficheiros do 'scons' em %{dest}
-Comment[ru]=Приложение KDE со скриптами Scons создано в %{dest}
-Comment[sk]=KDE aplikácia so scons skriptom bola vytvorená v %{dest}
-Comment[sr]=KDE програм са scons скриптама направљен је у %{dest}
-Comment[sr@Latn]=KDE program sa scons skriptama napravljen je u %{dest}
-Comment[sv]=Ett KDE-program med Scons-skript skapades i %{dest}
-Comment[tr]=Scons betikleri olan bir KDE uygulaması %{dest} içinde yaratıldı.
-Comment[zh_CN]=在 %{dest} 中创建了带 scons 脚本的 KDE 应用程序
-Comment[zh_TW]=一個內含 scons 文稿的 KDE 應用程式已建立於 %{dest}
+Comment[nl]=Een TDE applicatie inclusief Scons-scripts is aangemaakt in %{dest}
+Comment[pl]=Program TDE ze skryptami scons utworzony w %{dest}
+Comment[pt]=Foi criada uma aplicação do TDE com ficheiros do 'scons' em %{dest}
+Comment[pt_BR]=Foi criada uma aplicação do TDE com ficheiros do 'scons' em %{dest}
+Comment[ru]=Приложение TDE со скриптами Scons создано в %{dest}
+Comment[sk]=TDE aplikácia so scons skriptom bola vytvorená v %{dest}
+Comment[sr]=TDE програм са scons скриптама направљен је у %{dest}
+Comment[sr@Latn]=TDE program sa scons skriptama napravljen je u %{dest}
+Comment[sv]=Ett TDE-program med Scons-skript skapades i %{dest}
+Comment[tr]=Scons betikleri olan bir TDE uygulaması %{dest} içinde yaratıldı.
+Comment[zh_CN]=在 %{dest} 中创建了带 scons 脚本的 TDE 应用程序
+Comment[zh_TW]=一個內含 scons 文稿的 TDE 應用程式已建立於 %{dest}
diff --git a/languages/cpp/app_templates/kscons_kmdi/messages.sh b/languages/cpp/app_templates/kscons_kmdi/messages.sh
index 34870bc1..a0ce678a 100755
--- a/languages/cpp/app_templates/kscons_kmdi/messages.sh
+++ b/languages/cpp/app_templates/kscons_kmdi/messages.sh
@@ -19,12 +19,12 @@ TIPSDIR=$SRCDIR # tipsdir is the directory containing the tips
 
 TDEDIR=`tde-config --prefix`
 EXTRACTRC=extractrc
-KDEPOT=`tde-config --prefix`/include/kde.pot
-XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $KDEPOT "
+TDEPOT=`tde-config --prefix`/include/kde.pot
+XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $TDEPOT "
 
 ## check that kde.pot is available
-if ! test -e $KDEPOT; then
-	echo "$KDEPOT does not exist, there is something wrong with your installation!"
+if ! test -e $TDEPOT; then
+	echo "$TDEPOT does not exist, there is something wrong with your installation!"
 	XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale "
 fi