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

1 files changed, 64 insertions, 64 deletions

diff --git a/ubuntu/precise/tdenetwork/debian/tdenetwork-trinity-dev.install b/ubuntu/precise/tdenetwork/debian/tdenetwork-trinity-dev.install
index 4915aaa12..e1ce52d78 100644
--- a/ubuntu/precise/tdenetwork/debian/tdenetwork-trinity-dev.install
+++ b/ubuntu/precise/tdenetwork/debian/tdenetwork-trinity-dev.install
@@ -1,66 +1,66 @@
-debian/tmp/opt/trinity/include/tde/kopete/kabcpersistence.h
-debian/tmp/opt/trinity/include/tde/kopete/kopete_export.h
-debian/tmp/opt/trinity/include/tde/kopete/kopeteaccount.h
-debian/tmp/opt/trinity/include/tde/kopete/kopeteaccountmanager.h
-debian/tmp/opt/trinity/include/tde/kopete/kopeteaway.h
-debian/tmp/opt/trinity/include/tde/kopete/kopeteawayaction.h
-debian/tmp/opt/trinity/include/tde/kopete/kopeteawaydialog.h
-debian/tmp/opt/trinity/include/tde/kopete/kopeteblacklister.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetechatsession.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetechatsessionmanager.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetecommandhandler.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetecontact.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlist.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlistelement.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetecontactproperty.h
-debian/tmp/opt/trinity/include/tde/kopete/kopeteeventpresentation.h
-debian/tmp/opt/trinity/include/tde/kopete/kopeteglobal.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetegroup.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetemessage.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetemessageevent.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandler.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandlerchain.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetemetacontact.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetemimetypehandler.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetenotifydataobject.h
-debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatus.h
-debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatusmanager.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetepassword.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetepasswordedaccount.h
-debian/tmp/opt/trinity/include/tde/kopete/kopeteplugin.h
-debian/tmp/opt/trinity/include/tde/kopete/kopeteprotocol.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetesimplemessagehandler.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetetask.h
-debian/tmp/opt/trinity/include/tde/kopete/kopetetransfermanager.h
-debian/tmp/opt/trinity/include/tde/kopete/kopeteuiglobal.h
-debian/tmp/opt/trinity/include/tde/kopete/kopeteversion.h
-debian/tmp/opt/trinity/include/tde/kopete/managedconnectionaccount.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/accountselector.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/addcontactpage.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectordialog.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectorwidget.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/editaccountwidget.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/fileconfirmbase.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteawaydialogbase.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/kopetecontactaction.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/kopetefileconfirmdialog.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistview.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewitem.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewsearchline.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepassworddialog.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidget.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidgetbase.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/kopetestdaction.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteview.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteviewplugin.h
-debian/tmp/opt/trinity/include/tde/kopete/ui/userinfodialog.h
-debian/tmp/opt/trinity/include/tde/rss/article.h
-debian/tmp/opt/trinity/include/tde/rss/document.h
-debian/tmp/opt/trinity/include/tde/rss/global.h
-debian/tmp/opt/trinity/include/tde/rss/image.h
-debian/tmp/opt/trinity/include/tde/rss/librss.h
-debian/tmp/opt/trinity/include/tde/rss/loader.h
-debian/tmp/opt/trinity/include/tde/rss/textinput.h
+debian/tmp/opt/trinity/include/kopete/kabcpersistence.h
+debian/tmp/opt/trinity/include/kopete/kopete_export.h
+debian/tmp/opt/trinity/include/kopete/kopeteaccount.h
+debian/tmp/opt/trinity/include/kopete/kopeteaccountmanager.h
+debian/tmp/opt/trinity/include/kopete/kopeteaway.h
+debian/tmp/opt/trinity/include/kopete/kopeteawayaction.h
+debian/tmp/opt/trinity/include/kopete/kopeteawaydialog.h
+debian/tmp/opt/trinity/include/kopete/kopeteblacklister.h
+debian/tmp/opt/trinity/include/kopete/kopetechatsession.h
+debian/tmp/opt/trinity/include/kopete/kopetechatsessionmanager.h
+debian/tmp/opt/trinity/include/kopete/kopetecommandhandler.h
+debian/tmp/opt/trinity/include/kopete/kopetecontact.h
+debian/tmp/opt/trinity/include/kopete/kopetecontactlist.h
+debian/tmp/opt/trinity/include/kopete/kopetecontactlistelement.h
+debian/tmp/opt/trinity/include/kopete/kopetecontactproperty.h
+debian/tmp/opt/trinity/include/kopete/kopeteeventpresentation.h
+debian/tmp/opt/trinity/include/kopete/kopeteglobal.h
+debian/tmp/opt/trinity/include/kopete/kopetegroup.h
+debian/tmp/opt/trinity/include/kopete/kopetemessage.h
+debian/tmp/opt/trinity/include/kopete/kopetemessageevent.h
+debian/tmp/opt/trinity/include/kopete/kopetemessagehandler.h
+debian/tmp/opt/trinity/include/kopete/kopetemessagehandlerchain.h
+debian/tmp/opt/trinity/include/kopete/kopetemetacontact.h
+debian/tmp/opt/trinity/include/kopete/kopetemimetypehandler.h
+debian/tmp/opt/trinity/include/kopete/kopetenotifydataobject.h
+debian/tmp/opt/trinity/include/kopete/kopeteonlinestatus.h
+debian/tmp/opt/trinity/include/kopete/kopeteonlinestatusmanager.h
+debian/tmp/opt/trinity/include/kopete/kopetepassword.h
+debian/tmp/opt/trinity/include/kopete/kopetepasswordedaccount.h
+debian/tmp/opt/trinity/include/kopete/kopeteplugin.h
+debian/tmp/opt/trinity/include/kopete/kopeteprotocol.h
+debian/tmp/opt/trinity/include/kopete/kopetesimplemessagehandler.h
+debian/tmp/opt/trinity/include/kopete/kopetetask.h
+debian/tmp/opt/trinity/include/kopete/kopetetransfermanager.h
+debian/tmp/opt/trinity/include/kopete/kopeteuiglobal.h
+debian/tmp/opt/trinity/include/kopete/kopeteversion.h
+debian/tmp/opt/trinity/include/kopete/managedconnectionaccount.h
+debian/tmp/opt/trinity/include/kopete/ui/accountselector.h
+debian/tmp/opt/trinity/include/kopete/ui/addcontactpage.h
+debian/tmp/opt/trinity/include/kopete/ui/addressbookselectordialog.h
+debian/tmp/opt/trinity/include/kopete/ui/addressbookselectorwidget.h
+debian/tmp/opt/trinity/include/kopete/ui/editaccountwidget.h
+debian/tmp/opt/trinity/include/kopete/ui/fileconfirmbase.h
+debian/tmp/opt/trinity/include/kopete/ui/kopeteawaydialogbase.h
+debian/tmp/opt/trinity/include/kopete/ui/kopetecontactaction.h
+debian/tmp/opt/trinity/include/kopete/ui/kopetefileconfirmdialog.h
+debian/tmp/opt/trinity/include/kopete/ui/kopetelistview.h
+debian/tmp/opt/trinity/include/kopete/ui/kopetelistviewitem.h
+debian/tmp/opt/trinity/include/kopete/ui/kopetelistviewsearchline.h
+debian/tmp/opt/trinity/include/kopete/ui/kopetepassworddialog.h
+debian/tmp/opt/trinity/include/kopete/ui/kopetepasswordwidget.h
+debian/tmp/opt/trinity/include/kopete/ui/kopetepasswordwidgetbase.h
+debian/tmp/opt/trinity/include/kopete/ui/kopetestdaction.h
+debian/tmp/opt/trinity/include/kopete/ui/kopeteview.h
+debian/tmp/opt/trinity/include/kopete/ui/kopeteviewplugin.h
+debian/tmp/opt/trinity/include/kopete/ui/userinfodialog.h
+debian/tmp/opt/trinity/include/rss/article.h
+debian/tmp/opt/trinity/include/rss/document.h
+debian/tmp/opt/trinity/include/rss/global.h
+debian/tmp/opt/trinity/include/rss/image.h
+debian/tmp/opt/trinity/include/rss/librss.h
+debian/tmp/opt/trinity/include/rss/loader.h
+debian/tmp/opt/trinity/include/rss/textinput.h
 debian/tmp/opt/trinity/lib/libtdeinit_kdict.la
 debian/tmp/opt/trinity/lib/libtdeinit_ksirc.la
 debian/tmp/opt/trinity/lib/libkopete.la
@@ -73,4 +73,4 @@ debian/tmp/opt/trinity/lib/libkopete_videodevice.la
 debian/tmp/opt/trinity/lib/libkopete_videodevice.so
 debian/tmp/opt/trinity/lib/librss.la
 debian/tmp/opt/trinity/lib/librss.so
-debian/tmp/opt/trinity/include/tde/kopete/kopetepluginmanager.h
+debian/tmp/opt/trinity/include/kopete/kopetepluginmanager.h