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)
---
 .../pascal/app_templates/fpcgtk/CMakeLists.txt     |  2 +-
 languages/pascal/app_templates/fpcgtk/Makefile.am  |  2 +-
 languages/pascal/app_templates/fpcgtk/app.kdevelop | 86 ++++++++++++++++++++++
 languages/pascal/app_templates/fpcgtk/app.tdevelop | 86 ----------------------
 .../app_templates/fpcgtk/fpcgtk.kdevtemplate       |  4 +-
 5 files changed, 90 insertions(+), 90 deletions(-)
 create mode 100644 languages/pascal/app_templates/fpcgtk/app.kdevelop
 delete mode 100644 languages/pascal/app_templates/fpcgtk/app.tdevelop

(limited to 'languages/pascal/app_templates/fpcgtk')

diff --git a/languages/pascal/app_templates/fpcgtk/CMakeLists.txt b/languages/pascal/app_templates/fpcgtk/CMakeLists.txt
index eb16e978..8a154204 100644
--- a/languages/pascal/app_templates/fpcgtk/CMakeLists.txt
+++ b/languages/pascal/app_templates/fpcgtk/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( fpcgtk.tar.gz ALL
   COMMAND tar zcf fpcgtk.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    main.pp app.tdevelop
+    main.pp app.kdevelop
 )
 
 
diff --git a/languages/pascal/app_templates/fpcgtk/Makefile.am b/languages/pascal/app_templates/fpcgtk/Makefile.am
index 5c4c116f..252cbf27 100644
--- a/languages/pascal/app_templates/fpcgtk/Makefile.am
+++ b/languages/pascal/app_templates/fpcgtk/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.pp app.tdevelop
+dataFiles = main.pp app.kdevelop
 templateName = fpcgtk
 
 ### no need to change below:
diff --git a/languages/pascal/app_templates/fpcgtk/app.kdevelop b/languages/pascal/app_templates/fpcgtk/app.kdevelop
new file mode 100644
index 00000000..995d340b
--- /dev/null
+++ b/languages/pascal/app_templates/fpcgtk/app.kdevelop
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<kdevelop>
+ <general>
+  <author>%{AUTHOR}</author>
+  <email>%{EMAIL}</email>
+  <version>%{VERSION}</version>
+  <projectmanagement>KDevPascalProject</projectmanagement>
+  <primarylanguage>Pascal</primarylanguage>
+  <keywords>
+   <keyword>Pascal</keyword>
+   <keyword>Code</keyword>
+  </keywords>
+ </general>
+ <kdevpascalproject>
+  <general>
+    <useconfiguration>default</useconfiguration>
+  </general>
+  <configurations>
+   <default>
+    <mainsource>src/%{APPNAMELC}.pp</mainsource>
+    <compiler>kdevfpcoptions</compiler>
+    <compileroptions>-vr</compileroptions>
+    <compilerexec>fpc</compilerexec>
+   </default>
+  </configurations>
+  <run>
+   <terminal>false</terminal>
+  </run>
+ </kdevpascalproject>
+ <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>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>
+ <kdevfilecreate>
+  <useglobaltypes>
+   <type ext="pp"/>
+   <type ext="pas"/>
+   <type ext="dpr"/>
+  </useglobaltypes>
+ </kdevfilecreate>
+</kdevelop>
diff --git a/languages/pascal/app_templates/fpcgtk/app.tdevelop b/languages/pascal/app_templates/fpcgtk/app.tdevelop
deleted file mode 100644
index e7b3a147..00000000
--- a/languages/pascal/app_templates/fpcgtk/app.tdevelop
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<tdevelop>
- <general>
-  <author>%{AUTHOR}</author>
-  <email>%{EMAIL}</email>
-  <version>%{VERSION}</version>
-  <projectmanagement>KDevPascalProject</projectmanagement>
-  <primarylanguage>Pascal</primarylanguage>
-  <keywords>
-   <keyword>Pascal</keyword>
-   <keyword>Code</keyword>
-  </keywords>
- </general>
- <kdevpascalproject>
-  <general>
-    <useconfiguration>default</useconfiguration>
-  </general>
-  <configurations>
-   <default>
-    <mainsource>src/%{APPNAMELC}.pp</mainsource>
-    <compiler>kdevfpcoptions</compiler>
-    <compileroptions>-vr</compileroptions>
-    <compilerexec>fpc</compilerexec>
-   </default>
-  </configurations>
-  <run>
-   <terminal>false</terminal>
-  </run>
- </kdevpascalproject>
- <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>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>
- <kdevfilecreate>
-  <useglobaltypes>
-   <type ext="pp"/>
-   <type ext="pas"/>
-   <type ext="dpr"/>
-  </useglobaltypes>
- </kdevfilecreate>
-</tdevelop>
diff --git a/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate b/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate
index 45bb7eea..42e2be9d 100644
--- a/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate
+++ b/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate
@@ -69,8 +69,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
 
 [MkDir1]
 Type=mkdir
-- 
cgit v1.2.1