Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

10 files changed, 26 insertions, 26 deletions

diff --git a/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.install
index 8c2903ede..6e84a12b1 100644
--- a/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.install
+++ b/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.install
@@ -1,4 +1,4 @@
 /opt/trinity/bin/indexlib-config
-/opt/trinity/include/tde/index
+/opt/trinity/include/index
 /opt/trinity/lib/libindex.la
 /opt/trinity/lib/libindex.so
diff --git a/ubuntu/maverick/tdepim/debian/libkcal2-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libkcal2-trinity-dev.install
index 75a5523ca..a36a88caa 100644
--- a/ubuntu/maverick/tdepim/debian/libkcal2-trinity-dev.install
+++ b/ubuntu/maverick/tdepim/debian/libkcal2-trinity-dev.install
@@ -1,5 +1,5 @@
-/opt/trinity/include/tde/libemailfunctions/idmapper.h
-/opt/trinity/include/tde/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/ubuntu/maverick/tdepim/debian/libkgantt0-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libkgantt0-trinity-dev.install
index 290f743b7..e042469fa 100644
--- a/ubuntu/maverick/tdepim/debian/libkgantt0-trinity-dev.install
+++ b/ubuntu/maverick/tdepim/debian/libkgantt0-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/tde/kgantt
+/opt/trinity/include/kgantt
 /opt/trinity/lib/libkgantt.la
 /opt/trinity/lib/libkgantt.so
diff --git a/ubuntu/maverick/tdepim/debian/libkleopatra1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libkleopatra1-trinity-dev.install
index 6015f5c08..6ac5db793 100644
--- a/ubuntu/maverick/tdepim/debian/libkleopatra1-trinity-dev.install
+++ b/ubuntu/maverick/tdepim/debian/libkleopatra1-trinity-dev.install
@@ -1,6 +1,6 @@
-/opt/trinity/include/tde/gpgme++
-/opt/trinity/include/tde/kleo
-/opt/trinity/include/tde/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/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install
index ed8bb8407..416036a0d 100644
--- a/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install
+++ b/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install
@@ -1,4 +1,4 @@
-/opt/trinity/include/tde/tdepim/exchangeaccount.h
-/opt/trinity/include/tde/tdepim/exchangeclient.h
+/opt/trinity/include/tdepim/exchangeaccount.h
+/opt/trinity/include/tdepim/exchangeclient.h
 /opt/trinity/lib/libkpimexchange.la
 /opt/trinity/lib/libkpimexchange.so
diff --git a/ubuntu/maverick/tdepim/debian/libksieve0-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libksieve0-trinity-dev.install
index 32aa3d12d..2f74cc12f 100644
--- a/ubuntu/maverick/tdepim/debian/libksieve0-trinity-dev.install
+++ b/ubuntu/maverick/tdepim/debian/libksieve0-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/tde/ksieve
+/opt/trinity/include/ksieve
 /opt/trinity/lib/libksieve.la
 /opt/trinity/lib/libksieve.so
diff --git a/ubuntu/maverick/tdepim/debian/libktnef1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libktnef1-trinity-dev.install
index 1cea927e9..03b67df5b 100644
--- a/ubuntu/maverick/tdepim/debian/libktnef1-trinity-dev.install
+++ b/ubuntu/maverick/tdepim/debian/libktnef1-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/tde/ktnef
+/opt/trinity/include/ktnef
 /opt/trinity/lib/libktnef.la
 /opt/trinity/lib/libktnef.so
diff --git a/ubuntu/maverick/tdepim/debian/libmimelib1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libmimelib1-trinity-dev.install
index 3a5428f6e..d843ad5b8 100644
--- a/ubuntu/maverick/tdepim/debian/libmimelib1-trinity-dev.install
+++ b/ubuntu/maverick/tdepim/debian/libmimelib1-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/tde/mimelib
+/opt/trinity/include/mimelib
 /opt/trinity/lib/libmimelib.la
 /opt/trinity/lib/libmimelib.so
diff --git a/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install
index 56ca2ebc8..c60c55a41 100644
--- a/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install
+++ b/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/tde/tdepimmacros.h
+/opt/trinity/include/tdepimmacros.h
 /opt/trinity/lib/libtdepim.la
 /opt/trinity/lib/libtdepim.so
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install b/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install
index b94111037..bec38f84a 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install
+++ b/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install
@@ -1,15 +1,15 @@
-/opt/trinity/include/tde/KNotesAppIface.h
-/opt/trinity/include/tde/KNotesIface.h
-/opt/trinity/include/tde/akregator
-/opt/trinity/include/tde/calendar
-/opt/trinity/include/tde/kabc
-/opt/trinity/include/tde/kaddressbook
-/opt/trinity/include/tde/kmail
-/opt/trinity/include/tde/kmailIface.h
-/opt/trinity/include/tde/kmailicalIface.h
-/opt/trinity/include/tde/kmailpartIface.h
-/opt/trinity/include/tde/kontact
-/opt/trinity/include/tde/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/tde/kpimprefs.h
+/opt/trinity/include/kpimprefs.h