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

(limited to 'languages/java/app_templates/kappjava')

diff --git a/languages/java/app_templates/kappjava/CMakeLists.txt b/languages/java/app_templates/kappjava/CMakeLists.txt
index 042872fd..3b4abe1e 100644
--- a/languages/java/app_templates/kappjava/CMakeLists.txt
+++ b/languages/java/app_templates/kappjava/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( kappjava.tar.gz ALL
   COMMAND tar zcf kappjava.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     app.java pref.java appview.java app_client.java appui.rc
-    src-Makefile.am kappjava.png app.tdevelop subdirs
+    src-Makefile.am kappjava.png app.kdevelop subdirs
 )
 
 
diff --git a/languages/java/app_templates/kappjava/Makefile.am b/languages/java/app_templates/kappjava/Makefile.am
index edbd4468..4cda2ef7 100644
--- a/languages/java/app_templates/kappjava/Makefile.am
+++ b/languages/java/app_templates/kappjava/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = app.java pref.java appview.java  app_client.java appui.rc \
-	src-Makefile.am kappjava.png app.tdevelop subdirs
+	src-Makefile.am kappjava.png app.kdevelop subdirs
 templateName = kappjava
 
 ### no need to change below:
diff --git a/languages/java/app_templates/kappjava/app.kdevelop b/languages/java/app_templates/kappjava/app.kdevelop
new file mode 100644
index 00000000..078f5c1a
--- /dev/null
+++ b/languages/java/app_templates/kappjava/app.kdevelop
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<kdevelop>
+ <general>
+  <author>%{AUTHOR}</author>
+  <email>%{EMAIL}</email>
+  <version>%{VERSION}</version>
+  <projectmanagement>KDevAutoProject</projectmanagement>
+  <primarylanguage>Java</primarylanguage>
+  <keywords>
+   <keyword>Java</keyword>
+   <keyword>Code</keyword>
+   <keyword>Qt</keyword>
+   <keyword>KDE</keyword>
+  </keywords>
+ </general>
+ <kdevautoproject>
+  <general>
+   <activetarget>src/java</activetarget>
+  </general>
+  <run>
+   <mainprogram>src/%{APPNAMELC}</mainprogram>
+  </run>
+ </kdevautoproject>
+ <kdevfileview>
+  <groups>
+   <group pattern="*.java" name="Sources" />
+   <group pattern="*.ui" name="User Interface" />
+   <group pattern="*.png" name="Icons" />
+   <group pattern="*.po;*.ts" name="Translations" />
+   <group pattern="*" name="Others" />
+  </groups>
+ </kdevfileview>
+ <kdevdebugger>
+  <general>
+  </general>
+ </kdevdebugger>
+ <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>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>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="java"/>
+    </useglobaltypes>
+  </kdevfilecreate>
+</kdevelop>
diff --git a/languages/java/app_templates/kappjava/app.tdevelop b/languages/java/app_templates/kappjava/app.tdevelop
deleted file mode 100644
index 7ee74558..00000000
--- a/languages/java/app_templates/kappjava/app.tdevelop
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<tdevelop>
- <general>
-  <author>%{AUTHOR}</author>
-  <email>%{EMAIL}</email>
-  <version>%{VERSION}</version>
-  <projectmanagement>KDevAutoProject</projectmanagement>
-  <primarylanguage>Java</primarylanguage>
-  <keywords>
-   <keyword>Java</keyword>
-   <keyword>Code</keyword>
-   <keyword>Qt</keyword>
-   <keyword>KDE</keyword>
-  </keywords>
- </general>
- <kdevautoproject>
-  <general>
-   <activetarget>src/java</activetarget>
-  </general>
-  <run>
-   <mainprogram>src/%{APPNAMELC}</mainprogram>
-  </run>
- </kdevautoproject>
- <kdevfileview>
-  <groups>
-   <group pattern="*.java" name="Sources" />
-   <group pattern="*.ui" name="User Interface" />
-   <group pattern="*.png" name="Icons" />
-   <group pattern="*.po;*.ts" name="Translations" />
-   <group pattern="*" name="Others" />
-  </groups>
- </kdevfileview>
- <kdevdebugger>
-  <general>
-  </general>
- </kdevdebugger>
- <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>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>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="java"/>
-    </useglobaltypes>
-  </kdevfilecreate>
-</tdevelop>
diff --git a/languages/java/app_templates/kappjava/kappjava.kdevtemplate b/languages/java/app_templates/kappjava/kappjava.kdevtemplate
index 92cf4710..9f444195 100644
--- a/languages/java/app_templates/kappjava/kappjava.kdevtemplate
+++ b/languages/java/app_templates/kappjava/kappjava.kdevtemplate
@@ -78,8 +78,8 @@ File=%{tdevelop}/template-common/dockbook.kdevtemplate
 [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.3