Split basket kontact integration into separate package

12 files changed, 466 insertions, 7 deletions

diff --git a/debian/lenny/applications/basket/debian/basket-kontact-integration-trinity.install b/debian/lenny/applications/basket/debian/basket-kontact-integration-trinity.install
new file mode 100644
index 000000000..846f111d3
--- /dev/null
+++ b/debian/lenny/applications/basket/debian/basket-kontact-integration-trinity.install
@@ -0,0 +1,4 @@
+opt/trinity/share/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
+opt/trinity/share/services/kontact/basket.desktop
+opt/trinity/lib/trinity/libkontact_basket.la
+opt/trinity/lib/trinity/libkontact_basket.so
diff --git a/debian/lenny/applications/basket/debian/basket-trinity.install b/debian/lenny/applications/basket/debian/basket-trinity.install
new file mode 100644
index 000000000..2b7a2867b
--- /dev/null
+++ b/debian/lenny/applications/basket/debian/basket-trinity.install
@@ -0,0 +1,134 @@
+opt/trinity/share/applications/kde/basket.desktop
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_excelent.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_for_later.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_good.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_high.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_050.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_important.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_checkbox_checked.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_025.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_bad.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_low.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_checkbox.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_medium.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_000.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_fun.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_075.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_100.png
+opt/trinity/share/apps/basket/backgrounds/green-curves.png
+opt/trinity/share/apps/basket/backgrounds/todo.png
+opt/trinity/share/apps/basket/backgrounds/previews/green-curves.png
+opt/trinity/share/apps/basket/backgrounds/previews/todo.png
+opt/trinity/share/apps/basket/backgrounds/previews/strings.png
+opt/trinity/share/apps/basket/backgrounds/previews/abstract.png
+opt/trinity/share/apps/basket/backgrounds/previews/pins.png
+opt/trinity/share/apps/basket/backgrounds/previews/painting.png
+opt/trinity/share/apps/basket/backgrounds/previews/basket-title.png
+opt/trinity/share/apps/basket/backgrounds/previews/working.png
+opt/trinity/share/apps/basket/backgrounds/previews/rounds-line.png
+opt/trinity/share/apps/basket/backgrounds/previews/alien-artifact.png
+opt/trinity/share/apps/basket/backgrounds/previews/light.png
+opt/trinity/share/apps/basket/backgrounds/previews/pens.png
+opt/trinity/share/apps/basket/backgrounds/previews/rainbow-balls.png
+opt/trinity/share/apps/basket/backgrounds/strings.png
+opt/trinity/share/apps/basket/backgrounds/abstract.png
+opt/trinity/share/apps/basket/backgrounds/pins.png
+opt/trinity/share/apps/basket/backgrounds/painting.png
+opt/trinity/share/apps/basket/backgrounds/basket-title.png
+opt/trinity/share/apps/basket/backgrounds/working.png
+opt/trinity/share/apps/basket/backgrounds/rounds-line.png
+opt/trinity/share/apps/basket/backgrounds/alien-artifact.png.config
+opt/trinity/share/apps/basket/backgrounds/alien-artifact.png
+opt/trinity/share/apps/basket/backgrounds/light.png
+opt/trinity/share/apps/basket/backgrounds/pens.png
+opt/trinity/share/apps/basket/backgrounds/rainbow-balls.png
+opt/trinity/share/apps/basket/images/tag_export_on_every_lines_help.png
+opt/trinity/share/apps/basket/images/tag_export_help.png
+opt/trinity/share/apps/basket/images/insertion_help.png
+opt/trinity/share/apps/basket/basket_part.rc
+opt/trinity/share/apps/basket/basketui.rc
+opt/trinity/share/apps/basket/welcome/Welcome_fr.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_en_US.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_nn.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_de.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_ru.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_pt.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_ja.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_it.baskets
+opt/trinity/share/icons/crystalsvg/scalable/apps/basket.svg
+opt/trinity/share/icons/crystalsvg/22x22/apps/basket.png
+opt/trinity/share/icons/crystalsvg/22x22/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/22x22/mimetypes/baskets.png
+opt/trinity/share/icons/crystalsvg/32x32/apps/basket.png
+opt/trinity/share/icons/crystalsvg/32x32/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/32x32/mimetypes/baskets.png
+opt/trinity/share/icons/crystalsvg/64x64/apps/basket.png
+opt/trinity/share/icons/crystalsvg/64x64/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/64x64/mimetypes/baskets.png
+opt/trinity/share/icons/crystalsvg/128x128/apps/basket.png
+opt/trinity/share/icons/crystalsvg/128x128/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/128x128/mimetypes/baskets.png
+opt/trinity/share/icons/crystalsvg/16x16/apps/basket.png
+opt/trinity/share/icons/crystalsvg/16x16/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/16x16/mimetypes/baskets.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/likeback_dislike.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_preference_excelent.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_for_later.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_preference_good.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_priority_high.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_050.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_important.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_checkbox_checked.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_025.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/likeback_like.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_preference_bad.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_priority_low.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/likeback_feature.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_checkbox.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_priority_medium.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/likeback_bug.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_000.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_fun.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_075.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_100.png
+opt/trinity/share/icons/crystalsvg/48x48/apps/basket.png
+opt/trinity/share/icons/crystalsvg/48x48/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/48x48/mimetypes/baskets.png
+opt/trinity/share/mimelnk/application/x-basket-template.desktop
+opt/trinity/share/mimelnk/application/x-basket-archive.desktop
+opt/trinity/share/services/basket_config_notes.desktop
+opt/trinity/share/services/basket_config_new_notes.desktop
+opt/trinity/share/services/basket_config_general.desktop
+opt/trinity/share/services/basketthumbcreator.desktop
+opt/trinity/share/services/basket_config_features.desktop
+opt/trinity/share/services/basket_config_notes_appearance.desktop
+opt/trinity/share/services/basket_part.desktop
+opt/trinity/share/services/basket_config_baskets.desktop
+opt/trinity/share/services/basket_config_apps.desktop
+opt/trinity/share/locale/es/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/zh_CN/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/pt/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/pl_PL/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/da/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/zh_TW/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/fr/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/ru/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/tr/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/ja/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/de/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/cs/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/nn/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/it/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/nl/LC_MESSAGES/basket.mo
+opt/trinity/share/config/magic/basket.magic
+opt/trinity/share/doc/kde/HTML/en/basket/index.cache.bz2
+opt/trinity/share/doc/kde/HTML/en/basket/index.docbook
+opt/trinity/bin/basket
+opt/trinity/lib/trinity/basketthumbcreator.la
+opt/trinity/lib/trinity/libbasketpart.so
+opt/trinity/lib/trinity/kcm_basket.la
+opt/trinity/lib/trinity/kcm_basket.so
+opt/trinity/lib/trinity/libbasketpart.la
+opt/trinity/lib/trinity/basketthumbcreator.so
+opt/trinity/lib/libbasketcommon.la
+opt/trinity/lib/libbasketcommon.so
diff --git a/debian/lenny/applications/basket/debian/control b/debian/lenny/applications/basket/debian/control
index 14d1f17c3..b26fb7e1d 100644
--- a/debian/lenny/applications/basket/debian/control
+++ b/debian/lenny/applications/basket/debian/control
@@ -10,6 +10,7 @@ Standards-Version: 3.8.4
 Package: basket-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: basket-kontact-integration-trinity
 Description: a multi-purpose note-taking application for KDE [Trinity]
  This application provides as many baskets (drawers) as you wish; Several
  kinds of objects (texts, URLs, images,...) can be drag-n-drop'd into it. 
@@ -19,3 +20,17 @@ Description: a multi-purpose note-taking application for KDE [Trinity]
  you want in one place, keep data on hand, take notes...
  .
   Homepage: http://basket.kde.org/
+
+Package: basket-kontact-integration-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: a multi-purpose note-taking appliction, Kontact integration [Trinity]
+ This application provides as many baskets (drawers) as you wish; Several
+ kinds of objects (texts, URLs, images,...) can be drag-n-drop'd into it.
+ .
+ Objects can be edited, copied, dragged... So, they can be arranged
+ according to users' taste. Moreover, Basket allows you to keep all objects
+ you want in one place, keep data on hand, take notes...
+ .
+ This package contains the kontact-trinity plugin
+ .
diff --git a/debian/lenny/applications/basket/debian/rules b/debian/lenny/applications/basket/debian/rules
index d7a1f413b..5af81349e 100755
--- a/debian/lenny/applications/basket/debian/rules
+++ b/debian/lenny/applications/basket/debian/rules
@@ -74,7 +74,7 @@ install: build
 	dh_installdirs
 
 	# Install into package-build-dir
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/basket-trinity
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 #	mkdir -p $(CURDIR)/debian/basket-trinity/opt/trinity/share/applications/kde/
 #	mv $(CURDIR)/debian/basket-trinity/opt/trinity/share/applnk/Utilities/basket.desktop $(CURDIR)/debian/basket-trinity/opt/trinity/share/applications/kde/
@@ -87,7 +87,7 @@ binary-arch: build install
 	dh_installchangelogs ChangeLog
 	dh_installdocs
 	dh_installexamples
-	dh_install
+	dh_install --sourcedir=debian/tmp
 	dh_installmenu
 #	dh_installlogrotate
 #	dh_installinfo
diff --git a/debian/squeeze/applications/basket/debian/basket-kontact-integration-trinity.install b/debian/squeeze/applications/basket/debian/basket-kontact-integration-trinity.install
new file mode 100644
index 000000000..846f111d3
--- /dev/null
+++ b/debian/squeeze/applications/basket/debian/basket-kontact-integration-trinity.install
@@ -0,0 +1,4 @@
+opt/trinity/share/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
+opt/trinity/share/services/kontact/basket.desktop
+opt/trinity/lib/trinity/libkontact_basket.la
+opt/trinity/lib/trinity/libkontact_basket.so
diff --git a/debian/squeeze/applications/basket/debian/basket-trinity.install b/debian/squeeze/applications/basket/debian/basket-trinity.install
new file mode 100644
index 000000000..2b7a2867b
--- /dev/null
+++ b/debian/squeeze/applications/basket/debian/basket-trinity.install
@@ -0,0 +1,134 @@
+opt/trinity/share/applications/kde/basket.desktop
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_excelent.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_for_later.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_good.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_high.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_050.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_important.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_checkbox_checked.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_025.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_bad.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_low.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_checkbox.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_medium.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_000.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_fun.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_075.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_100.png
+opt/trinity/share/apps/basket/backgrounds/green-curves.png
+opt/trinity/share/apps/basket/backgrounds/todo.png
+opt/trinity/share/apps/basket/backgrounds/previews/green-curves.png
+opt/trinity/share/apps/basket/backgrounds/previews/todo.png
+opt/trinity/share/apps/basket/backgrounds/previews/strings.png
+opt/trinity/share/apps/basket/backgrounds/previews/abstract.png
+opt/trinity/share/apps/basket/backgrounds/previews/pins.png
+opt/trinity/share/apps/basket/backgrounds/previews/painting.png
+opt/trinity/share/apps/basket/backgrounds/previews/basket-title.png
+opt/trinity/share/apps/basket/backgrounds/previews/working.png
+opt/trinity/share/apps/basket/backgrounds/previews/rounds-line.png
+opt/trinity/share/apps/basket/backgrounds/previews/alien-artifact.png
+opt/trinity/share/apps/basket/backgrounds/previews/light.png
+opt/trinity/share/apps/basket/backgrounds/previews/pens.png
+opt/trinity/share/apps/basket/backgrounds/previews/rainbow-balls.png
+opt/trinity/share/apps/basket/backgrounds/strings.png
+opt/trinity/share/apps/basket/backgrounds/abstract.png
+opt/trinity/share/apps/basket/backgrounds/pins.png
+opt/trinity/share/apps/basket/backgrounds/painting.png
+opt/trinity/share/apps/basket/backgrounds/basket-title.png
+opt/trinity/share/apps/basket/backgrounds/working.png
+opt/trinity/share/apps/basket/backgrounds/rounds-line.png
+opt/trinity/share/apps/basket/backgrounds/alien-artifact.png.config
+opt/trinity/share/apps/basket/backgrounds/alien-artifact.png
+opt/trinity/share/apps/basket/backgrounds/light.png
+opt/trinity/share/apps/basket/backgrounds/pens.png
+opt/trinity/share/apps/basket/backgrounds/rainbow-balls.png
+opt/trinity/share/apps/basket/images/tag_export_on_every_lines_help.png
+opt/trinity/share/apps/basket/images/tag_export_help.png
+opt/trinity/share/apps/basket/images/insertion_help.png
+opt/trinity/share/apps/basket/basket_part.rc
+opt/trinity/share/apps/basket/basketui.rc
+opt/trinity/share/apps/basket/welcome/Welcome_fr.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_en_US.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_nn.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_de.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_ru.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_pt.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_ja.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_it.baskets
+opt/trinity/share/icons/crystalsvg/scalable/apps/basket.svg
+opt/trinity/share/icons/crystalsvg/22x22/apps/basket.png
+opt/trinity/share/icons/crystalsvg/22x22/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/22x22/mimetypes/baskets.png
+opt/trinity/share/icons/crystalsvg/32x32/apps/basket.png
+opt/trinity/share/icons/crystalsvg/32x32/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/32x32/mimetypes/baskets.png
+opt/trinity/share/icons/crystalsvg/64x64/apps/basket.png
+opt/trinity/share/icons/crystalsvg/64x64/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/64x64/mimetypes/baskets.png
+opt/trinity/share/icons/crystalsvg/128x128/apps/basket.png
+opt/trinity/share/icons/crystalsvg/128x128/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/128x128/mimetypes/baskets.png
+opt/trinity/share/icons/crystalsvg/16x16/apps/basket.png
+opt/trinity/share/icons/crystalsvg/16x16/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/16x16/mimetypes/baskets.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/likeback_dislike.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_preference_excelent.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_for_later.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_preference_good.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_priority_high.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_050.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_important.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_checkbox_checked.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_025.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/likeback_like.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_preference_bad.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_priority_low.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/likeback_feature.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_checkbox.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_priority_medium.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/likeback_bug.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_000.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_fun.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_075.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_100.png
+opt/trinity/share/icons/crystalsvg/48x48/apps/basket.png
+opt/trinity/share/icons/crystalsvg/48x48/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/48x48/mimetypes/baskets.png
+opt/trinity/share/mimelnk/application/x-basket-template.desktop
+opt/trinity/share/mimelnk/application/x-basket-archive.desktop
+opt/trinity/share/services/basket_config_notes.desktop
+opt/trinity/share/services/basket_config_new_notes.desktop
+opt/trinity/share/services/basket_config_general.desktop
+opt/trinity/share/services/basketthumbcreator.desktop
+opt/trinity/share/services/basket_config_features.desktop
+opt/trinity/share/services/basket_config_notes_appearance.desktop
+opt/trinity/share/services/basket_part.desktop
+opt/trinity/share/services/basket_config_baskets.desktop
+opt/trinity/share/services/basket_config_apps.desktop
+opt/trinity/share/locale/es/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/zh_CN/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/pt/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/pl_PL/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/da/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/zh_TW/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/fr/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/ru/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/tr/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/ja/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/de/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/cs/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/nn/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/it/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/nl/LC_MESSAGES/basket.mo
+opt/trinity/share/config/magic/basket.magic
+opt/trinity/share/doc/kde/HTML/en/basket/index.cache.bz2
+opt/trinity/share/doc/kde/HTML/en/basket/index.docbook
+opt/trinity/bin/basket
+opt/trinity/lib/trinity/basketthumbcreator.la
+opt/trinity/lib/trinity/libbasketpart.so
+opt/trinity/lib/trinity/kcm_basket.la
+opt/trinity/lib/trinity/kcm_basket.so
+opt/trinity/lib/trinity/libbasketpart.la
+opt/trinity/lib/trinity/basketthumbcreator.so
+opt/trinity/lib/libbasketcommon.la
+opt/trinity/lib/libbasketcommon.so
diff --git a/debian/squeeze/applications/basket/debian/control b/debian/squeeze/applications/basket/debian/control
index 14d1f17c3..b26fb7e1d 100644
--- a/debian/squeeze/applications/basket/debian/control
+++ b/debian/squeeze/applications/basket/debian/control
@@ -10,6 +10,7 @@ Standards-Version: 3.8.4
 Package: basket-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: basket-kontact-integration-trinity
 Description: a multi-purpose note-taking application for KDE [Trinity]
  This application provides as many baskets (drawers) as you wish; Several
  kinds of objects (texts, URLs, images,...) can be drag-n-drop'd into it. 
@@ -19,3 +20,17 @@ Description: a multi-purpose note-taking application for KDE [Trinity]
  you want in one place, keep data on hand, take notes...
  .
   Homepage: http://basket.kde.org/
+
+Package: basket-kontact-integration-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: a multi-purpose note-taking appliction, Kontact integration [Trinity]
+ This application provides as many baskets (drawers) as you wish; Several
+ kinds of objects (texts, URLs, images,...) can be drag-n-drop'd into it.
+ .
+ Objects can be edited, copied, dragged... So, they can be arranged
+ according to users' taste. Moreover, Basket allows you to keep all objects
+ you want in one place, keep data on hand, take notes...
+ .
+ This package contains the kontact-trinity plugin
+ .
diff --git a/debian/squeeze/applications/basket/debian/rules b/debian/squeeze/applications/basket/debian/rules
index d7a1f413b..5af81349e 100755
--- a/debian/squeeze/applications/basket/debian/rules
+++ b/debian/squeeze/applications/basket/debian/rules
@@ -74,7 +74,7 @@ install: build
 	dh_installdirs
 
 	# Install into package-build-dir
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/basket-trinity
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 #	mkdir -p $(CURDIR)/debian/basket-trinity/opt/trinity/share/applications/kde/
 #	mv $(CURDIR)/debian/basket-trinity/opt/trinity/share/applnk/Utilities/basket.desktop $(CURDIR)/debian/basket-trinity/opt/trinity/share/applications/kde/
@@ -87,7 +87,7 @@ binary-arch: build install
 	dh_installchangelogs ChangeLog
 	dh_installdocs
 	dh_installexamples
-	dh_install
+	dh_install --sourcedir=debian/tmp
 	dh_installmenu
 #	dh_installlogrotate
 #	dh_installinfo
diff --git a/ubuntu/maverick/applications/basket/debian/basket-kontact-integration-trinity.install b/ubuntu/maverick/applications/basket/debian/basket-kontact-integration-trinity.install
new file mode 100644
index 000000000..846f111d3
--- /dev/null
+++ b/ubuntu/maverick/applications/basket/debian/basket-kontact-integration-trinity.install
@@ -0,0 +1,4 @@
+opt/trinity/share/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
+opt/trinity/share/services/kontact/basket.desktop
+opt/trinity/lib/trinity/libkontact_basket.la
+opt/trinity/lib/trinity/libkontact_basket.so
diff --git a/ubuntu/maverick/applications/basket/debian/basket-trinity.install b/ubuntu/maverick/applications/basket/debian/basket-trinity.install
new file mode 100644
index 000000000..2b7a2867b
--- /dev/null
+++ b/ubuntu/maverick/applications/basket/debian/basket-trinity.install
@@ -0,0 +1,134 @@
+opt/trinity/share/applications/kde/basket.desktop
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_excelent.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_for_later.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_good.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_high.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_050.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_important.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_checkbox_checked.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_025.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_bad.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_low.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_checkbox.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_medium.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_000.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_fun.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_075.png
+opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_100.png
+opt/trinity/share/apps/basket/backgrounds/green-curves.png
+opt/trinity/share/apps/basket/backgrounds/todo.png
+opt/trinity/share/apps/basket/backgrounds/previews/green-curves.png
+opt/trinity/share/apps/basket/backgrounds/previews/todo.png
+opt/trinity/share/apps/basket/backgrounds/previews/strings.png
+opt/trinity/share/apps/basket/backgrounds/previews/abstract.png
+opt/trinity/share/apps/basket/backgrounds/previews/pins.png
+opt/trinity/share/apps/basket/backgrounds/previews/painting.png
+opt/trinity/share/apps/basket/backgrounds/previews/basket-title.png
+opt/trinity/share/apps/basket/backgrounds/previews/working.png
+opt/trinity/share/apps/basket/backgrounds/previews/rounds-line.png
+opt/trinity/share/apps/basket/backgrounds/previews/alien-artifact.png
+opt/trinity/share/apps/basket/backgrounds/previews/light.png
+opt/trinity/share/apps/basket/backgrounds/previews/pens.png
+opt/trinity/share/apps/basket/backgrounds/previews/rainbow-balls.png
+opt/trinity/share/apps/basket/backgrounds/strings.png
+opt/trinity/share/apps/basket/backgrounds/abstract.png
+opt/trinity/share/apps/basket/backgrounds/pins.png
+opt/trinity/share/apps/basket/backgrounds/painting.png
+opt/trinity/share/apps/basket/backgrounds/basket-title.png
+opt/trinity/share/apps/basket/backgrounds/working.png
+opt/trinity/share/apps/basket/backgrounds/rounds-line.png
+opt/trinity/share/apps/basket/backgrounds/alien-artifact.png.config
+opt/trinity/share/apps/basket/backgrounds/alien-artifact.png
+opt/trinity/share/apps/basket/backgrounds/light.png
+opt/trinity/share/apps/basket/backgrounds/pens.png
+opt/trinity/share/apps/basket/backgrounds/rainbow-balls.png
+opt/trinity/share/apps/basket/images/tag_export_on_every_lines_help.png
+opt/trinity/share/apps/basket/images/tag_export_help.png
+opt/trinity/share/apps/basket/images/insertion_help.png
+opt/trinity/share/apps/basket/basket_part.rc
+opt/trinity/share/apps/basket/basketui.rc
+opt/trinity/share/apps/basket/welcome/Welcome_fr.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_en_US.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_nn.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_de.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_ru.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_pt.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_ja.baskets
+opt/trinity/share/apps/basket/welcome/Welcome_it.baskets
+opt/trinity/share/icons/crystalsvg/scalable/apps/basket.svg
+opt/trinity/share/icons/crystalsvg/22x22/apps/basket.png
+opt/trinity/share/icons/crystalsvg/22x22/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/22x22/mimetypes/baskets.png
+opt/trinity/share/icons/crystalsvg/32x32/apps/basket.png
+opt/trinity/share/icons/crystalsvg/32x32/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/32x32/mimetypes/baskets.png
+opt/trinity/share/icons/crystalsvg/64x64/apps/basket.png
+opt/trinity/share/icons/crystalsvg/64x64/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/64x64/mimetypes/baskets.png
+opt/trinity/share/icons/crystalsvg/128x128/apps/basket.png
+opt/trinity/share/icons/crystalsvg/128x128/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/128x128/mimetypes/baskets.png
+opt/trinity/share/icons/crystalsvg/16x16/apps/basket.png
+opt/trinity/share/icons/crystalsvg/16x16/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/16x16/mimetypes/baskets.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/likeback_dislike.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_preference_excelent.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_for_later.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_preference_good.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_priority_high.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_050.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_important.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_checkbox_checked.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_025.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/likeback_like.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_preference_bad.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_priority_low.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/likeback_feature.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_checkbox.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_priority_medium.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/likeback_bug.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_000.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_fun.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_075.png
+opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_100.png
+opt/trinity/share/icons/crystalsvg/48x48/apps/basket.png
+opt/trinity/share/icons/crystalsvg/48x48/mimetypes/baskett.png
+opt/trinity/share/icons/crystalsvg/48x48/mimetypes/baskets.png
+opt/trinity/share/mimelnk/application/x-basket-template.desktop
+opt/trinity/share/mimelnk/application/x-basket-archive.desktop
+opt/trinity/share/services/basket_config_notes.desktop
+opt/trinity/share/services/basket_config_new_notes.desktop
+opt/trinity/share/services/basket_config_general.desktop
+opt/trinity/share/services/basketthumbcreator.desktop
+opt/trinity/share/services/basket_config_features.desktop
+opt/trinity/share/services/basket_config_notes_appearance.desktop
+opt/trinity/share/services/basket_part.desktop
+opt/trinity/share/services/basket_config_baskets.desktop
+opt/trinity/share/services/basket_config_apps.desktop
+opt/trinity/share/locale/es/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/zh_CN/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/pt/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/pl_PL/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/da/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/zh_TW/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/fr/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/ru/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/tr/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/ja/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/de/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/cs/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/nn/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/it/LC_MESSAGES/basket.mo
+opt/trinity/share/locale/nl/LC_MESSAGES/basket.mo
+opt/trinity/share/config/magic/basket.magic
+opt/trinity/share/doc/kde/HTML/en/basket/index.cache.bz2
+opt/trinity/share/doc/kde/HTML/en/basket/index.docbook
+opt/trinity/bin/basket
+opt/trinity/lib/trinity/basketthumbcreator.la
+opt/trinity/lib/trinity/libbasketpart.so
+opt/trinity/lib/trinity/kcm_basket.la
+opt/trinity/lib/trinity/kcm_basket.so
+opt/trinity/lib/trinity/libbasketpart.la
+opt/trinity/lib/trinity/basketthumbcreator.so
+opt/trinity/lib/libbasketcommon.la
+opt/trinity/lib/libbasketcommon.so
diff --git a/ubuntu/maverick/applications/basket/debian/control b/ubuntu/maverick/applications/basket/debian/control
index 3ea4fde0c..edb7dc733 100644
--- a/ubuntu/maverick/applications/basket/debian/control
+++ b/ubuntu/maverick/applications/basket/debian/control
@@ -10,9 +10,10 @@ Standards-Version: 3.8.4
 Package: basket-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: basket-kontact-integration-trinity
 Replaces: basket-kde3 (<< 4:3.5.13)
 Breaks: basket-kde3 (<< 4:3.5.13)
-Description: a multi-purpose note-taking application for KDE [Trinity]
+Description: a multi-purpose note-taking application for TDE [Trinity]
  This application provides as many baskets (drawers) as you wish; Several
  kinds of objects (texts, URLs, images,...) can be drag-n-drop'd into it. 
  .
@@ -21,3 +22,17 @@ Description: a multi-purpose note-taking application for KDE [Trinity]
  you want in one place, keep data on hand, take notes...
  .
   Homepage: http://basket.kde.org/
+
+Package: basket-kontact-integration-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: a multi-purpose note-taking appliction, Kontact integration [Trinity]
+ This application provides as many baskets (drawers) as you wish; Several
+ kinds of objects (texts, URLs, images,...) can be drag-n-drop'd into it.
+ .
+ Objects can be edited, copied, dragged... So, they can be arranged
+ according to users' taste. Moreover, Basket allows you to keep all objects
+ you want in one place, keep data on hand, take notes...
+ .
+ This package contains the kontact-trinity plugin
+ .
diff --git a/ubuntu/maverick/applications/basket/debian/rules b/ubuntu/maverick/applications/basket/debian/rules
index d7a1f413b..5af81349e 100755
--- a/ubuntu/maverick/applications/basket/debian/rules
+++ b/ubuntu/maverick/applications/basket/debian/rules
@@ -74,7 +74,7 @@ install: build
 	dh_installdirs
 
 	# Install into package-build-dir
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/basket-trinity
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 #	mkdir -p $(CURDIR)/debian/basket-trinity/opt/trinity/share/applications/kde/
 #	mv $(CURDIR)/debian/basket-trinity/opt/trinity/share/applnk/Utilities/basket.desktop $(CURDIR)/debian/basket-trinity/opt/trinity/share/applications/kde/
@@ -87,7 +87,7 @@ binary-arch: build install
 	dh_installchangelogs ChangeLog
 	dh_installdocs
 	dh_installexamples
-	dh_install
+	dh_install --sourcedir=debian/tmp
 	dh_installmenu
 #	dh_installlogrotate
 #	dh_installinfo