Revert to .kdevelop files with <kdevelop> entity name for project files.
This resolves bug 2308.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
(cherry picked from commit 2b3d2e3585b9643514cde077538087ed23b72dc9)

diff --git a/debian/lenny/tdevelop/debian/man/kdevprj2kdevelop.man b/debian/lenny/tdevelop/debian/man/kdevprj2kdevelop.man
new file mode 100644
index 0000000..c3e3950
--- /dev/null
+++ b/debian/lenny/tdevelop/debian/man/kdevprj2kdevelop.man
@@ -0,0 +1,14 @@
+.TH KDEVPRJ2KDEVELOP 1
+.SH NAME
+kdevprj2kdevelop \- KDevelop 2.x project converter
+.SH SYNOPSIS
+.B kdevprj2kdevelop
+.I file
+.SH DESCRIPTION
+.B kdevprj2kdevelop
+is a tool for converting KDevelop 2.x projects (*.kdevprj) to the
+format used by TDevelop 3.x (*.tdevelop).
+.SH PROGRAM OPTIONS
+.TP
+.B file
+KDevelop 2.x project to convert.
diff --git a/debian/lenny/tdevelop/debian/man/kdevprj2tdevelop.man b/debian/lenny/tdevelop/debian/man/kdevprj2tdevelop.man
deleted file mode 100644
index 14ff40a..0000000
--- a/debian/lenny/tdevelop/debian/man/kdevprj2tdevelop.man
+++ /dev/null
@@ -1,14 +0,0 @@
-.TH KDEVPRJ2KDEVELOP 1
-.SH NAME
-kdevprj2tdevelop \- KDevelop 2.x project converter
-.SH SYNOPSIS
-.B kdevprj2tdevelop
-.I file
-.SH DESCRIPTION
-.B kdevprj2tdevelop
-is a tool for converting KDevelop 2.x projects (*.kdevprj) to the
-format used by TDevelop 3.x (*.tdevelop).
-.SH PROGRAM OPTIONS
-.TP
-.B file
-KDevelop 2.x project to convert.
diff --git a/debian/lenny/tdevelop/debian/tdevelop-trinity.install b/debian/lenny/tdevelop/debian/tdevelop-trinity.install
index c5d9633..bf34980 100644
--- a/debian/lenny/tdevelop/debian/tdevelop-trinity.install
+++ b/debian/lenny/tdevelop/debian/tdevelop-trinity.install
@@ -3,7 +3,7 @@
 debian/tmp/opt/trinity/bin/tdevelop-htdig
 debian/tmp/opt/trinity/bin/kdevprofileeditor
 debian/tmp/opt/trinity/bin/kdevassistant
-debian/tmp/opt/trinity/bin/kdevprj2tdevelop
+debian/tmp/opt/trinity/bin/kdevprj2kdevelop
 debian/tmp/opt/trinity/bin/tdevelop
 debian/tmp/opt/trinity/lib/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
 debian/tmp/opt/trinity/share/services
diff --git a/debian/lenny/tdevelop/debian/tdevelop-trinity.manpages b/debian/lenny/tdevelop/debian/tdevelop-trinity.manpages
index e3fa643..11c3831 100644
--- a/debian/lenny/tdevelop/debian/tdevelop-trinity.manpages
+++ b/debian/lenny/tdevelop/debian/tdevelop-trinity.manpages
@@ -1,5 +1,5 @@
 debian/man/out/tdevelop.1
 debian/man/out/kdevassistant.1
-debian/man/out/kdevprj2tdevelop.1
+debian/man/out/kdevprj2kdevelop.1
 debian/man/out/kdevprofileeditor.1
 debian/man/out/tdevelop-htdig.1
diff --git a/debian/squeeze/tdevelop/debian/man/kdevprj2kdevelop.man b/debian/squeeze/tdevelop/debian/man/kdevprj2kdevelop.man
new file mode 100644
index 0000000..c3e3950
--- /dev/null
+++ b/debian/squeeze/tdevelop/debian/man/kdevprj2kdevelop.man
@@ -0,0 +1,14 @@
+.TH KDEVPRJ2KDEVELOP 1
+.SH NAME
+kdevprj2kdevelop \- KDevelop 2.x project converter
+.SH SYNOPSIS
+.B kdevprj2kdevelop
+.I file
+.SH DESCRIPTION
+.B kdevprj2kdevelop
+is a tool for converting KDevelop 2.x projects (*.kdevprj) to the
+format used by TDevelop 3.x (*.tdevelop).
+.SH PROGRAM OPTIONS
+.TP
+.B file
+KDevelop 2.x project to convert.
diff --git a/debian/squeeze/tdevelop/debian/man/kdevprj2tdevelop.man b/debian/squeeze/tdevelop/debian/man/kdevprj2tdevelop.man
deleted file mode 100644
index 14ff40a..0000000
--- a/debian/squeeze/tdevelop/debian/man/kdevprj2tdevelop.man
+++ /dev/null
@@ -1,14 +0,0 @@
-.TH KDEVPRJ2KDEVELOP 1
-.SH NAME
-kdevprj2tdevelop \- KDevelop 2.x project converter
-.SH SYNOPSIS
-.B kdevprj2tdevelop
-.I file
-.SH DESCRIPTION
-.B kdevprj2tdevelop
-is a tool for converting KDevelop 2.x projects (*.kdevprj) to the
-format used by TDevelop 3.x (*.tdevelop).
-.SH PROGRAM OPTIONS
-.TP
-.B file
-KDevelop 2.x project to convert.
diff --git a/debian/squeeze/tdevelop/debian/tdevelop-trinity.install b/debian/squeeze/tdevelop/debian/tdevelop-trinity.install
index c5d9633..bf34980 100644
--- a/debian/squeeze/tdevelop/debian/tdevelop-trinity.install
+++ b/debian/squeeze/tdevelop/debian/tdevelop-trinity.install
@@ -3,7 +3,7 @@
 debian/tmp/opt/trinity/bin/tdevelop-htdig
 debian/tmp/opt/trinity/bin/kdevprofileeditor
 debian/tmp/opt/trinity/bin/kdevassistant
-debian/tmp/opt/trinity/bin/kdevprj2tdevelop
+debian/tmp/opt/trinity/bin/kdevprj2kdevelop
 debian/tmp/opt/trinity/bin/tdevelop
 debian/tmp/opt/trinity/lib/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
 debian/tmp/opt/trinity/share/services
diff --git a/debian/squeeze/tdevelop/debian/tdevelop-trinity.manpages b/debian/squeeze/tdevelop/debian/tdevelop-trinity.manpages
index e3fa643..11c3831 100644
--- a/debian/squeeze/tdevelop/debian/tdevelop-trinity.manpages
+++ b/debian/squeeze/tdevelop/debian/tdevelop-trinity.manpages
@@ -1,5 +1,5 @@
 debian/man/out/tdevelop.1
 debian/man/out/kdevassistant.1
-debian/man/out/kdevprj2tdevelop.1
+debian/man/out/kdevprj2kdevelop.1
 debian/man/out/kdevprofileeditor.1
 debian/man/out/tdevelop-htdig.1
diff --git a/ubuntu/maverick/tdevelop/debian/man/kdevprj2kdevelop.man b/ubuntu/maverick/tdevelop/debian/man/kdevprj2kdevelop.man
new file mode 100644
index 0000000..c3e3950
--- /dev/null
+++ b/ubuntu/maverick/tdevelop/debian/man/kdevprj2kdevelop.man
@@ -0,0 +1,14 @@
+.TH KDEVPRJ2KDEVELOP 1
+.SH NAME
+kdevprj2kdevelop \- KDevelop 2.x project converter
+.SH SYNOPSIS
+.B kdevprj2kdevelop
+.I file
+.SH DESCRIPTION
+.B kdevprj2kdevelop
+is a tool for converting KDevelop 2.x projects (*.kdevprj) to the
+format used by TDevelop 3.x (*.tdevelop).
+.SH PROGRAM OPTIONS
+.TP
+.B file
+KDevelop 2.x project to convert.
diff --git a/ubuntu/maverick/tdevelop/debian/man/kdevprj2tdevelop.man b/ubuntu/maverick/tdevelop/debian/man/kdevprj2tdevelop.man
deleted file mode 100644
index 14ff40a..0000000
--- a/ubuntu/maverick/tdevelop/debian/man/kdevprj2tdevelop.man
+++ /dev/null
@@ -1,14 +0,0 @@
-.TH KDEVPRJ2KDEVELOP 1
-.SH NAME
-kdevprj2tdevelop \- KDevelop 2.x project converter
-.SH SYNOPSIS
-.B kdevprj2tdevelop
-.I file
-.SH DESCRIPTION
-.B kdevprj2tdevelop
-is a tool for converting KDevelop 2.x projects (*.kdevprj) to the
-format used by TDevelop 3.x (*.tdevelop).
-.SH PROGRAM OPTIONS
-.TP
-.B file
-KDevelop 2.x project to convert.
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install
index c5d9633..bf34980 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install
@@ -3,7 +3,7 @@
 debian/tmp/opt/trinity/bin/tdevelop-htdig
 debian/tmp/opt/trinity/bin/kdevprofileeditor
 debian/tmp/opt/trinity/bin/kdevassistant
-debian/tmp/opt/trinity/bin/kdevprj2tdevelop
+debian/tmp/opt/trinity/bin/kdevprj2kdevelop
 debian/tmp/opt/trinity/bin/tdevelop
 debian/tmp/opt/trinity/lib/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
 debian/tmp/opt/trinity/share/services
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages
index e3fa643..11c3831 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages
@@ -1,5 +1,5 @@
 debian/man/out/tdevelop.1
 debian/man/out/kdevassistant.1
-debian/man/out/kdevprj2tdevelop.1
+debian/man/out/kdevprj2kdevelop.1
 debian/man/out/kdevprofileeditor.1
 debian/man/out/tdevelop-htdig.1