Fix tdepim FTBFS on Debian and Ubuntu

(cherry picked from commit 32269ae7f0a7ec7a949951c5198609a2a5b02ac7)

10 files changed, 26 insertions, 26 deletions

diff --git a/debian/lenny/kdepim/debian/kdepim-trinity-dev.install b/debian/lenny/kdepim/debian/kdepim-trinity-dev.install
index 848758727..bec38f84a 100644
--- a/debian/lenny/kdepim/debian/kdepim-trinity-dev.install
+++ b/debian/lenny/kdepim/debian/kdepim-trinity-dev.install
@@ -1,15 +1,15 @@
-/opt/trinity/include/kde/KNotesAppIface.h
-/opt/trinity/include/kde/KNotesIface.h
-/opt/trinity/include/kde/akregator
-/opt/trinity/include/kde/calendar
-/opt/trinity/include/kde/kabc
-/opt/trinity/include/kde/kaddressbook
-/opt/trinity/include/kde/kmail
-/opt/trinity/include/kde/kmailIface.h
-/opt/trinity/include/kde/kmailicalIface.h
-/opt/trinity/include/kde/kmailpartIface.h
-/opt/trinity/include/kde/kontact
-/opt/trinity/include/kde/korganizer
+/opt/trinity/include/KNotesAppIface.h
+/opt/trinity/include/KNotesIface.h
+/opt/trinity/include/akregator
+/opt/trinity/include/calendar
+/opt/trinity/include/kabc
+/opt/trinity/include/kaddressbook
+/opt/trinity/include/kmail
+/opt/trinity/include/kmailIface.h
+/opt/trinity/include/kmailicalIface.h
+/opt/trinity/include/kmailpartIface.h
+/opt/trinity/include/kontact
+/opt/trinity/include/korganizer
 /opt/trinity/lib/libkabckolab.la
 /opt/trinity/lib/libkabckolab.so
 /opt/trinity/lib/libkabcscalix.la
@@ -81,4 +81,4 @@
 /opt/trinity/lib/libgwsoap.la
 /opt/trinity/lib/libgwsoap.so
 
-/opt/trinity/include/kde/kpimprefs.h
+/opt/trinity/include/kpimprefs.h
diff --git a/debian/lenny/kdepim/debian/libindex0-trinity-dev.install b/debian/lenny/kdepim/debian/libindex0-trinity-dev.install
index acbb26191..6e84a12b1 100644
--- a/debian/lenny/kdepim/debian/libindex0-trinity-dev.install
+++ b/debian/lenny/kdepim/debian/libindex0-trinity-dev.install
@@ -1,4 +1,4 @@
 /opt/trinity/bin/indexlib-config
-/opt/trinity/include/kde/index
+/opt/trinity/include/index
 /opt/trinity/lib/libindex.la
 /opt/trinity/lib/libindex.so
diff --git a/debian/lenny/kdepim/debian/libkcal2-trinity-dev.install b/debian/lenny/kdepim/debian/libkcal2-trinity-dev.install
index 7dcc98ca7..a36a88caa 100644
--- a/debian/lenny/kdepim/debian/libkcal2-trinity-dev.install
+++ b/debian/lenny/kdepim/debian/libkcal2-trinity-dev.install
@@ -1,5 +1,5 @@
-/opt/trinity/include/kde/libemailfunctions/idmapper.h
-/opt/trinity/include/kde/libkcal
+/opt/trinity/include/libemailfunctions/idmapper.h
+/opt/trinity/include/libkcal
 /opt/trinity/lib/libkcal.la
 /opt/trinity/lib/libkcal.so
 /opt/trinity/lib/libkcal_resourceremote.la
diff --git a/debian/lenny/kdepim/debian/libkdepim1-trinity-dev.install b/debian/lenny/kdepim/debian/libkdepim1-trinity-dev.install
index 7d4795918..236131ea6 100644
--- a/debian/lenny/kdepim/debian/libkdepim1-trinity-dev.install
+++ b/debian/lenny/kdepim/debian/libkdepim1-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/kdepimmacros.h
+/opt/trinity/include/kdepimmacros.h
 /opt/trinity/lib/libkdepim.la
 /opt/trinity/lib/libkdepim.so
diff --git a/debian/lenny/kdepim/debian/libkgantt0-trinity-dev.install b/debian/lenny/kdepim/debian/libkgantt0-trinity-dev.install
index c386be142..e042469fa 100644
--- a/debian/lenny/kdepim/debian/libkgantt0-trinity-dev.install
+++ b/debian/lenny/kdepim/debian/libkgantt0-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/kgantt
+/opt/trinity/include/kgantt
 /opt/trinity/lib/libkgantt.la
 /opt/trinity/lib/libkgantt.so
diff --git a/debian/lenny/kdepim/debian/libkleopatra1-trinity-dev.install b/debian/lenny/kdepim/debian/libkleopatra1-trinity-dev.install
index cab0f039e..6ac5db793 100644
--- a/debian/lenny/kdepim/debian/libkleopatra1-trinity-dev.install
+++ b/debian/lenny/kdepim/debian/libkleopatra1-trinity-dev.install
@@ -1,6 +1,6 @@
-/opt/trinity/include/kde/gpgme++
-/opt/trinity/include/kde/kleo
-/opt/trinity/include/kde/qgpgme
+/opt/trinity/include/gpgme++
+/opt/trinity/include/kleo
+/opt/trinity/include/qgpgme
 /opt/trinity/lib/libgpgme++.la
 /opt/trinity/lib/libgpgme++.so
 /opt/trinity/lib/libkleopatra.la
diff --git a/debian/lenny/kdepim/debian/libkpimexchange1-trinity-dev.install b/debian/lenny/kdepim/debian/libkpimexchange1-trinity-dev.install
index 61d765134..88536e532 100644
--- a/debian/lenny/kdepim/debian/libkpimexchange1-trinity-dev.install
+++ b/debian/lenny/kdepim/debian/libkpimexchange1-trinity-dev.install
@@ -1,4 +1,4 @@
-/opt/trinity/include/kde/kdepim/exchangeaccount.h
-/opt/trinity/include/kde/kdepim/exchangeclient.h
+/opt/trinity/include/kdepim/exchangeaccount.h
+/opt/trinity/include/kdepim/exchangeclient.h
 /opt/trinity/lib/libkpimexchange.la
 /opt/trinity/lib/libkpimexchange.so
diff --git a/debian/lenny/kdepim/debian/libksieve0-trinity-dev.install b/debian/lenny/kdepim/debian/libksieve0-trinity-dev.install
index 08cf59222..2f74cc12f 100644
--- a/debian/lenny/kdepim/debian/libksieve0-trinity-dev.install
+++ b/debian/lenny/kdepim/debian/libksieve0-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/ksieve
+/opt/trinity/include/ksieve
 /opt/trinity/lib/libksieve.la
 /opt/trinity/lib/libksieve.so
diff --git a/debian/lenny/kdepim/debian/libktnef1-trinity-dev.install b/debian/lenny/kdepim/debian/libktnef1-trinity-dev.install
index 5c74d9348..03b67df5b 100644
--- a/debian/lenny/kdepim/debian/libktnef1-trinity-dev.install
+++ b/debian/lenny/kdepim/debian/libktnef1-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/ktnef
+/opt/trinity/include/ktnef
 /opt/trinity/lib/libktnef.la
 /opt/trinity/lib/libktnef.so
diff --git a/debian/lenny/kdepim/debian/libmimelib1-trinity-dev.install b/debian/lenny/kdepim/debian/libmimelib1-trinity-dev.install
index c5092b6a9..d843ad5b8 100644
--- a/debian/lenny/kdepim/debian/libmimelib1-trinity-dev.install
+++ b/debian/lenny/kdepim/debian/libmimelib1-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/mimelib
+/opt/trinity/include/mimelib
 /opt/trinity/lib/libmimelib.la
 /opt/trinity/lib/libmimelib.so