From e044c5463329652f28565dfc7de24ef8b0edaa6f 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>
---
 .../app_templates/fortranhello/CMakeLists.txt      |   2 +-
 .../fortran/app_templates/fortranhello/Makefile.am |   2 +-
 .../app_templates/fortranhello/app.kdevelop        | 113 +++++++++++++++++++++
 .../app_templates/fortranhello/app.tdevelop        | 113 ---------------------
 .../fortranhello/fortranhello.kdevtemplate         |   4 +-
 5 files changed, 117 insertions(+), 117 deletions(-)
 create mode 100644 languages/fortran/app_templates/fortranhello/app.kdevelop
 delete mode 100644 languages/fortran/app_templates/fortranhello/app.tdevelop

(limited to 'languages/fortran')

diff --git a/languages/fortran/app_templates/fortranhello/CMakeLists.txt b/languages/fortran/app_templates/fortranhello/CMakeLists.txt
index 74709631..f0b40cf6 100644
--- a/languages/fortran/app_templates/fortranhello/CMakeLists.txt
+++ b/languages/fortran/app_templates/fortranhello/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( fortranhello.tar.gz ALL
   COMMAND tar zcf fortranhello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     main.f src-Makefile.am fortran-Makefile.am
     fortran-Makefile.cvs configure.in fortranhello.png
-    app.tdevelop
+    app.kdevelop
 )
 
 
diff --git a/languages/fortran/app_templates/fortranhello/Makefile.am b/languages/fortran/app_templates/fortranhello/Makefile.am
index 3bf32575..ba97453d 100644
--- a/languages/fortran/app_templates/fortranhello/Makefile.am
+++ b/languages/fortran/app_templates/fortranhello/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = main.f src-Makefile.am fortran-Makefile.am fortran-Makefile.cvs \
-	configure.in fortranhello.png app.tdevelop
+	configure.in fortranhello.png app.kdevelop
 templateName = fortranhello
 
 ### no need to change below:
diff --git a/languages/fortran/app_templates/fortranhello/app.kdevelop b/languages/fortran/app_templates/fortranhello/app.kdevelop
new file mode 100644
index 00000000..b4abc5ae
--- /dev/null
+++ b/languages/fortran/app_templates/fortranhello/app.kdevelop
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<kdevelop>
+ <general>
+  <author>%{AUTHOR}</author>
+  <email>%{EMAIL}</email>
+  <version>%{VERSION}</version>
+  <projectmanagement>KDevAutoProject</projectmanagement>
+  <primarylanguage>Fortran77</primarylanguage>
+  <keywords>
+   <keyword>Fortran</keyword>
+  </keywords>
+  <ignoreparts>
+   <part>KDevVisualBoyAdvance</part>
+   <part>KDevCTags</part>
+  </ignoreparts>
+ </general>
+ <kdevautoproject>
+  <general>
+   <activetarget>src/%{APPNAMELC}</activetarget>
+  </general>
+  <run>
+   <mainprogram>src/%{APPNAMELC}</mainprogram>
+   <terminal>true</terminal>
+  </run>
+    <makeenvvars>
+      <envvar value="1" name="WANT_AUTOCONF_2_5" />
+      <envvar value="1" name="WANT_AUTOMAKE_1_6" />
+    </makeenvvars>
+ </kdevautoproject>
+ <kdevfilecreate>
+   <useglobaltypes>
+     <type ext="F"/>
+     <type ext="fpp"/>
+     <type ext="f"/>
+     <type ext="for"/>
+   </useglobaltypes>
+ </kdevfilecreate>
+ <kdevfortransupport>
+    <ftnchek>
+      <division>false</division>
+      <extern>false</extern>
+      <declare>false</declare>
+      <pure>false</pure>
+      <argumentsall>false</argumentsall>
+      <commonall>false</commonall>
+      <truncationall>false</truncationall>
+      <usageall>false</usageall>
+      <f77all>false</f77all>
+      <portabilityall>false</portabilityall>
+      <argumentsonly></argumentsonly>
+      <commononly></commononly>
+      <truncationonly></truncationonly>
+      <usageonly></usageonly>
+      <f77only></f77only>
+      <portabilityonly></portabilityonly>
+    </ftnchek>
+ </kdevfortransupport>
+ <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>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>qt-kdev3</toc>
+      <toc>ruby</toc>
+      <toc>ruby_bugs</toc>
+      <toc>sdl</toc>
+      <toc>stl</toc>
+      <toc>w3c-svg</toc>
+      <toc>sw</toc>
+      <toc>w3c-uaag10</toc>
+      <toc>wxwidgets_bugs</toc>
+    </ignoretocs>
+    <ignoreqt_xml>
+      <toc>Guide to the Qt Translation Tools</toc>
+      <toc>Qt Assistant Manual</toc>
+      <toc>Qt Designer Manual</toc>
+      <toc>Qt Reference Documentation</toc>
+      <toc>qmake User Guide</toc>
+    </ignoreqt_xml>
+    <ignoredoxygen>
+      <toc>KDE Libraries (Doxygen)</toc>
+    </ignoredoxygen>
+ </kdevdoctreeview>
+  <kdevfileview>
+    <groups>
+      <group pattern="*.f;*.for;*.FOR" name="Preprocessed Fortran" />
+      <group pattern="*.F;*.fpp;*.FPP" name="Fortran77 source files" />
+    </groups>
+  </kdevfileview>
+</kdevelop>
diff --git a/languages/fortran/app_templates/fortranhello/app.tdevelop b/languages/fortran/app_templates/fortranhello/app.tdevelop
deleted file mode 100644
index f97fd76a..00000000
--- a/languages/fortran/app_templates/fortranhello/app.tdevelop
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0"?>
-<tdevelop>
- <general>
-  <author>%{AUTHOR}</author>
-  <email>%{EMAIL}</email>
-  <version>%{VERSION}</version>
-  <projectmanagement>KDevAutoProject</projectmanagement>
-  <primarylanguage>Fortran77</primarylanguage>
-  <keywords>
-   <keyword>Fortran</keyword>
-  </keywords>
-  <ignoreparts>
-   <part>KDevVisualBoyAdvance</part>
-   <part>KDevCTags</part>
-  </ignoreparts>
- </general>
- <kdevautoproject>
-  <general>
-   <activetarget>src/%{APPNAMELC}</activetarget>
-  </general>
-  <run>
-   <mainprogram>src/%{APPNAMELC}</mainprogram>
-   <terminal>true</terminal>
-  </run>
-    <makeenvvars>
-      <envvar value="1" name="WANT_AUTOCONF_2_5" />
-      <envvar value="1" name="WANT_AUTOMAKE_1_6" />
-    </makeenvvars>
- </kdevautoproject>
- <kdevfilecreate>
-   <useglobaltypes>
-     <type ext="F"/>
-     <type ext="fpp"/>
-     <type ext="f"/>
-     <type ext="for"/>
-   </useglobaltypes>
- </kdevfilecreate>
- <kdevfortransupport>
-    <ftnchek>
-      <division>false</division>
-      <extern>false</extern>
-      <declare>false</declare>
-      <pure>false</pure>
-      <argumentsall>false</argumentsall>
-      <commonall>false</commonall>
-      <truncationall>false</truncationall>
-      <usageall>false</usageall>
-      <f77all>false</f77all>
-      <portabilityall>false</portabilityall>
-      <argumentsonly></argumentsonly>
-      <commononly></commononly>
-      <truncationonly></truncationonly>
-      <usageonly></usageonly>
-      <f77only></f77only>
-      <portabilityonly></portabilityonly>
-    </ftnchek>
- </kdevfortransupport>
- <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>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>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>stl</toc>
-      <toc>w3c-svg</toc>
-      <toc>sw</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfileview>
-    <groups>
-      <group pattern="*.f;*.for;*.FOR" name="Preprocessed Fortran" />
-      <group pattern="*.F;*.fpp;*.FPP" name="Fortran77 source files" />
-    </groups>
-  </kdevfileview>
-</tdevelop>
diff --git a/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate b/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate
index e4c5cb33..117a0f50 100644
--- a/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate
+++ b/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate
@@ -76,8 +76,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
-- 
cgit v1.2.3