From 8b9c0d28fe084e8c7912a55f29052052edcfdd6e Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Wed, 17 Jun 2015 15:33:10 +0900
Subject: Revert to .kdevelop files with <kdevelop> entity name for project
 files. This resolves bug 2308.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit e044c5463329652f28565dfc7de24ef8b0edaa6f)
---
 languages/ruby/app_templates/kxt/CMakeLists.txt    |  2 +-
 languages/ruby/app_templates/kxt/Makefile.am       |  2 +-
 languages/ruby/app_templates/kxt/app.kdevelop      | 90 ++++++++++++++++++++++
 languages/ruby/app_templates/kxt/app.tdevelop      | 90 ----------------------
 .../ruby/app_templates/kxt/kxtruby.kdevtemplate    |  4 +-
 5 files changed, 94 insertions(+), 94 deletions(-)
 create mode 100644 languages/ruby/app_templates/kxt/app.kdevelop
 delete mode 100644 languages/ruby/app_templates/kxt/app.tdevelop

(limited to 'languages/ruby/app_templates/kxt')

diff --git a/languages/ruby/app_templates/kxt/CMakeLists.txt b/languages/ruby/app_templates/kxt/CMakeLists.txt
index 539cfdb6..2543047d 100644
--- a/languages/ruby/app_templates/kxt/CMakeLists.txt
+++ b/languages/ruby/app_templates/kxt/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( kxtruby.tar.gz ALL
   COMMAND tar zcf kxtruby.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     app.rb main.rb prefs.rb app.cpp appview.rb appview_base.ui
-    prefs-base.ui appui.rc app.desktop kxtruby.png app.tdevelop
+    prefs-base.ui appui.rc app.desktop kxtruby.png app.kdevelop
     app-Makefile.am app-configure.in.in app.kcfg settings.kcfgc
     src-Makefile.am subdirs README
 )
diff --git a/languages/ruby/app_templates/kxt/Makefile.am b/languages/ruby/app_templates/kxt/Makefile.am
index 2ea8cf5b..b642b88b 100644
--- a/languages/ruby/app_templates/kxt/Makefile.am
+++ b/languages/ruby/app_templates/kxt/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = app.rb main.rb prefs.rb app.cpp appview.rb appview_base.ui prefs-base.ui \
-			appui.rc app.desktop kxtruby.png app.tdevelop \
+			appui.rc app.desktop kxtruby.png app.kdevelop \
 			app-Makefile.am app-configure.in.in \
 			app.kcfg settings.kcfgc src-Makefile.am subdirs README
 
diff --git a/languages/ruby/app_templates/kxt/app.kdevelop b/languages/ruby/app_templates/kxt/app.kdevelop
new file mode 100644
index 00000000..3a1efdd9
--- /dev/null
+++ b/languages/ruby/app_templates/kxt/app.kdevelop
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<kdevelop>
+	<general>
+		<author>%{AUTHOR}</author>
+		<email>%{EMAIL}</email>
+		<version>%{VERSION}</version>
+		<projectmanagement>KDevAutoProject</projectmanagement>
+		<primarylanguage>Ruby</primarylanguage>
+		<keywords>
+			<keyword>Ruby</keyword>
+			<keyword>Qt</keyword>
+			<keyword>KDE</keyword>
+		</keywords>
+		<ignoreparts>
+			<part>KDevDoxygen</part>
+			<part>KDevdistpart</part>
+			<part>KDevVisualBoyAdvance</part>
+			<part>KDevDebugger</part>
+		</ignoreparts>
+	</general>
+	<kdevautoproject>
+		<general>
+			<activedir/>
+		</general>
+		<run>
+			<mainprogram>src/%{APPNAMELC}</mainprogram>
+		</run>
+	</kdevautoproject>
+	<kdevfileview>
+		<tree>
+			<hidenonprojectfiles>false</hidenonprojectfiles>
+			<hidepatterns>CVS,.svn</hidepatterns>
+		</tree>
+		<groups>
+			<group pattern="*.rb" name="Ruby files" />
+			<group pattern="*.ui" name="QT Designer files" />
+		</groups>
+	</kdevfileview>											 
+	<kdevdoctreeview>
+		<ignoretocs>
+			<toc>ada</toc>
+			<toc>ada_bugs_gcc</toc>
+			<toc>bash</toc>
+			<toc>bash_bugs</toc>
+			<toc>c++_bugs_gcc</toc>
+			<toc>clanlib</toc>
+			<toc>w3c-dom-level2-html</toc>
+			<toc>fortran_bugs_gcc</toc>
+			<toc>gnome1</toc>
+			<toc>gnustep</toc>
+			<toc>gtk</toc>
+			<toc>gtk_bugs</toc>
+			<toc>haskell</toc>
+			<toc>haskell_bugs_ghc</toc>
+			<toc>java_bugs_gcc</toc>
+			<toc>java_bugs_sun</toc>
+			<toc>kde2book</toc>
+			<toc>libc</toc>
+			<toc>libstdc++</toc>
+			<toc>opengl</toc>
+			<toc>pascal_bugs_fp</toc>
+			<toc>php</toc>
+			<toc>php_bugs</toc>
+			<toc>perl</toc>
+			<toc>perl_bugs</toc>
+			<toc>python</toc>
+			<toc>python_bugs</toc>
+			<toc>sdl</toc>
+			<toc>stl</toc>
+			<toc>w3c-svg</toc>
+			<toc>sw</toc>
+			<toc>w3c-uaag10</toc>
+			<toc>wxwindows_bugs</toc>
+		</ignoretocs>
+	</kdevdoctreeview>
+	<kdevfilecreate>
+		<useglobaltypes>
+			<type ext="rb"/>
+			<type ext="ui"/>
+		</useglobaltypes>
+	</kdevfilecreate>
+	<kdevrubysupport>
+		<run>
+			<interpreter>ruby</interpreter>
+			<terminal>false</terminal>
+			<charactercoding>3</charactercoding>
+			<mainprogram>src/main.rb</mainprogram>
+		</run>
+	</kdevrubysupport>
+</kdevelop>
diff --git a/languages/ruby/app_templates/kxt/app.tdevelop b/languages/ruby/app_templates/kxt/app.tdevelop
deleted file mode 100644
index 5c57b8fb..00000000
--- a/languages/ruby/app_templates/kxt/app.tdevelop
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<tdevelop>
-	<general>
-		<author>%{AUTHOR}</author>
-		<email>%{EMAIL}</email>
-		<version>%{VERSION}</version>
-		<projectmanagement>KDevAutoProject</projectmanagement>
-		<primarylanguage>Ruby</primarylanguage>
-		<keywords>
-			<keyword>Ruby</keyword>
-			<keyword>Qt</keyword>
-			<keyword>KDE</keyword>
-		</keywords>
-		<ignoreparts>
-			<part>KDevDoxygen</part>
-			<part>KDevdistpart</part>
-			<part>KDevVisualBoyAdvance</part>
-			<part>KDevDebugger</part>
-		</ignoreparts>
-	</general>
-	<kdevautoproject>
-		<general>
-			<activedir/>
-		</general>
-		<run>
-			<mainprogram>src/%{APPNAMELC}</mainprogram>
-		</run>
-	</kdevautoproject>
-	<kdevfileview>
-		<tree>
-			<hidenonprojectfiles>false</hidenonprojectfiles>
-			<hidepatterns>CVS,.svn</hidepatterns>
-		</tree>
-		<groups>
-			<group pattern="*.rb" name="Ruby files" />
-			<group pattern="*.ui" name="QT Designer files" />
-		</groups>
-	</kdevfileview>											 
-	<kdevdoctreeview>
-		<ignoretocs>
-			<toc>ada</toc>
-			<toc>ada_bugs_gcc</toc>
-			<toc>bash</toc>
-			<toc>bash_bugs</toc>
-			<toc>c++_bugs_gcc</toc>
-			<toc>clanlib</toc>
-			<toc>w3c-dom-level2-html</toc>
-			<toc>fortran_bugs_gcc</toc>
-			<toc>gnome1</toc>
-			<toc>gnustep</toc>
-			<toc>gtk</toc>
-			<toc>gtk_bugs</toc>
-			<toc>haskell</toc>
-			<toc>haskell_bugs_ghc</toc>
-			<toc>java_bugs_gcc</toc>
-			<toc>java_bugs_sun</toc>
-			<toc>kde2book</toc>
-			<toc>libc</toc>
-			<toc>libstdc++</toc>
-			<toc>opengl</toc>
-			<toc>pascal_bugs_fp</toc>
-			<toc>php</toc>
-			<toc>php_bugs</toc>
-			<toc>perl</toc>
-			<toc>perl_bugs</toc>
-			<toc>python</toc>
-			<toc>python_bugs</toc>
-			<toc>sdl</toc>
-			<toc>stl</toc>
-			<toc>w3c-svg</toc>
-			<toc>sw</toc>
-			<toc>w3c-uaag10</toc>
-			<toc>wxwindows_bugs</toc>
-		</ignoretocs>
-	</kdevdoctreeview>
-	<kdevfilecreate>
-		<useglobaltypes>
-			<type ext="rb"/>
-			<type ext="ui"/>
-		</useglobaltypes>
-	</kdevfilecreate>
-	<kdevrubysupport>
-		<run>
-			<interpreter>ruby</interpreter>
-			<terminal>false</terminal>
-			<charactercoding>3</charactercoding>
-			<mainprogram>src/main.rb</mainprogram>
-		</run>
-	</kdevrubysupport>
-</tdevelop>
diff --git a/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate b/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate
index e4756e1d..59201db8 100644
--- a/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate
+++ b/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate
@@ -100,8 +100,8 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
-- 
cgit v1.2.1