rev 10741 - kde-extras/basket/trunk/debian

Sune Vuorela pusling-guest at alioth.debian.org
Tue May 27 20:58:24 UTC 2008 

Author: pusling-guest
Date: 2008-05-27 20:58:23 +0000 (Tue, 27 May 2008)
New Revision: 10741

Added:
   kde-extras/basket/trunk/debian/basket-kontact-integration.install
   kde-extras/basket/trunk/debian/basket.install
Modified:
   kde-extras/basket/trunk/debian/changelog
   kde-extras/basket/trunk/debian/control
   kde-extras/basket/trunk/debian/rules
Log:
split basket kontact integration out of kontact

Added: kde-extras/basket/trunk/debian/basket-kontact-integration.install
===================================================================
--- kde-extras/basket/trunk/debian/basket-kontact-integration.install	                        (rev 0)
+++ kde-extras/basket/trunk/debian/basket-kontact-integration.install	2008-05-27 20:58:23 UTC (rev 10741)
@@ -0,0 +1,4 @@
+usr/share/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
+usr/share/services/kontact/basket.desktop
+usr/lib/kde3/libkontact_basket.la
+usr/lib/kde3/libkontact_basket.so

Added: kde-extras/basket/trunk/debian/basket.install
===================================================================
--- kde-extras/basket/trunk/debian/basket.install	                        (rev 0)
+++ kde-extras/basket/trunk/debian/basket.install	2008-05-27 20:58:23 UTC (rev 10741)
@@ -0,0 +1,134 @@
+usr/share/applications/kde/basket.desktop
+usr/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_excelent.png
+usr/share/apps/basket/icons/crystalsvg/16x16/actions/tag_for_later.png
+usr/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_good.png
+usr/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_high.png
+usr/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_050.png
+usr/share/apps/basket/icons/crystalsvg/16x16/actions/tag_important.png
+usr/share/apps/basket/icons/crystalsvg/16x16/actions/tag_checkbox_checked.png
+usr/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_025.png
+usr/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_bad.png
+usr/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_low.png
+usr/share/apps/basket/icons/crystalsvg/16x16/actions/tag_checkbox.png
+usr/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_medium.png
+usr/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_000.png
+usr/share/apps/basket/icons/crystalsvg/16x16/actions/tag_fun.png
+usr/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_075.png
+usr/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_100.png
+usr/share/apps/basket/backgrounds/green-curves.png
+usr/share/apps/basket/backgrounds/todo.png
+usr/share/apps/basket/backgrounds/previews/green-curves.png
+usr/share/apps/basket/backgrounds/previews/todo.png
+usr/share/apps/basket/backgrounds/previews/strings.png
+usr/share/apps/basket/backgrounds/previews/abstract.png
+usr/share/apps/basket/backgrounds/previews/pins.png
+usr/share/apps/basket/backgrounds/previews/painting.png
+usr/share/apps/basket/backgrounds/previews/basket-title.png
+usr/share/apps/basket/backgrounds/previews/working.png
+usr/share/apps/basket/backgrounds/previews/rounds-line.png
+usr/share/apps/basket/backgrounds/previews/alien-artifact.png
+usr/share/apps/basket/backgrounds/previews/light.png
+usr/share/apps/basket/backgrounds/previews/pens.png
+usr/share/apps/basket/backgrounds/previews/rainbow-balls.png
+usr/share/apps/basket/backgrounds/strings.png
+usr/share/apps/basket/backgrounds/abstract.png
+usr/share/apps/basket/backgrounds/pins.png
+usr/share/apps/basket/backgrounds/painting.png
+usr/share/apps/basket/backgrounds/basket-title.png
+usr/share/apps/basket/backgrounds/working.png
+usr/share/apps/basket/backgrounds/rounds-line.png
+usr/share/apps/basket/backgrounds/alien-artifact.png.config
+usr/share/apps/basket/backgrounds/alien-artifact.png
+usr/share/apps/basket/backgrounds/light.png
+usr/share/apps/basket/backgrounds/pens.png
+usr/share/apps/basket/backgrounds/rainbow-balls.png
+usr/share/apps/basket/images/tag_export_on_every_lines_help.png
+usr/share/apps/basket/images/tag_export_help.png
+usr/share/apps/basket/images/insertion_help.png
+usr/share/apps/basket/basket_part.rc
+usr/share/apps/basket/basketui.rc
+usr/share/apps/basket/welcome/Welcome_fr.baskets
+usr/share/apps/basket/welcome/Welcome_en_US.baskets
+usr/share/apps/basket/welcome/Welcome_nn.baskets
+usr/share/apps/basket/welcome/Welcome_de.baskets
+usr/share/apps/basket/welcome/Welcome_ru.baskets
+usr/share/apps/basket/welcome/Welcome_pt.baskets
+usr/share/apps/basket/welcome/Welcome_ja.baskets
+usr/share/apps/basket/welcome/Welcome_it.baskets
+usr/share/icons/crystalsvg/scalable/apps/basket.svg
+usr/share/icons/crystalsvg/22x22/apps/basket.png
+usr/share/icons/crystalsvg/22x22/mimetypes/baskett.png
+usr/share/icons/crystalsvg/22x22/mimetypes/baskets.png
+usr/share/icons/crystalsvg/32x32/apps/basket.png
+usr/share/icons/crystalsvg/32x32/mimetypes/baskett.png
+usr/share/icons/crystalsvg/32x32/mimetypes/baskets.png
+usr/share/icons/crystalsvg/64x64/apps/basket.png
+usr/share/icons/crystalsvg/64x64/mimetypes/baskett.png
+usr/share/icons/crystalsvg/64x64/mimetypes/baskets.png
+usr/share/icons/crystalsvg/128x128/apps/basket.png
+usr/share/icons/crystalsvg/128x128/mimetypes/baskett.png
+usr/share/icons/crystalsvg/128x128/mimetypes/baskets.png
+usr/share/icons/crystalsvg/16x16/apps/basket.png
+usr/share/icons/crystalsvg/16x16/mimetypes/baskett.png
+usr/share/icons/crystalsvg/16x16/mimetypes/baskets.png
+usr/share/icons/crystalsvg/16x16/actions/likeback_dislike.png
+usr/share/icons/crystalsvg/16x16/actions/tag_preference_excelent.png
+usr/share/icons/crystalsvg/16x16/actions/tag_for_later.png
+usr/share/icons/crystalsvg/16x16/actions/tag_preference_good.png
+usr/share/icons/crystalsvg/16x16/actions/tag_priority_high.png
+usr/share/icons/crystalsvg/16x16/actions/tag_progress_050.png
+usr/share/icons/crystalsvg/16x16/actions/tag_important.png
+usr/share/icons/crystalsvg/16x16/actions/tag_checkbox_checked.png
+usr/share/icons/crystalsvg/16x16/actions/tag_progress_025.png
+usr/share/icons/crystalsvg/16x16/actions/likeback_like.png
+usr/share/icons/crystalsvg/16x16/actions/tag_preference_bad.png
+usr/share/icons/crystalsvg/16x16/actions/tag_priority_low.png
+usr/share/icons/crystalsvg/16x16/actions/likeback_feature.png
+usr/share/icons/crystalsvg/16x16/actions/tag_checkbox.png
+usr/share/icons/crystalsvg/16x16/actions/tag_priority_medium.png
+usr/share/icons/crystalsvg/16x16/actions/likeback_bug.png
+usr/share/icons/crystalsvg/16x16/actions/tag_progress_000.png
+usr/share/icons/crystalsvg/16x16/actions/tag_fun.png
+usr/share/icons/crystalsvg/16x16/actions/tag_progress_075.png
+usr/share/icons/crystalsvg/16x16/actions/tag_progress_100.png
+usr/share/icons/crystalsvg/48x48/apps/basket.png
+usr/share/icons/crystalsvg/48x48/mimetypes/baskett.png
+usr/share/icons/crystalsvg/48x48/mimetypes/baskets.png
+usr/share/mimelnk/application/x-basket-template.desktop
+usr/share/mimelnk/application/x-basket-archive.desktop
+usr/share/services/basket_config_notes.desktop
+usr/share/services/basket_config_new_notes.desktop
+usr/share/services/basket_config_general.desktop
+usr/share/services/basketthumbcreator.desktop
+usr/share/services/basket_config_features.desktop
+usr/share/services/basket_config_notes_appearance.desktop
+usr/share/services/basket_part.desktop
+usr/share/services/basket_config_baskets.desktop
+usr/share/services/basket_config_apps.desktop
+usr/share/locale/es/LC_MESSAGES/basket.mo
+usr/share/locale/zh_CN/LC_MESSAGES/basket.mo
+usr/share/locale/pt/LC_MESSAGES/basket.mo
+usr/share/locale/pl_PL/LC_MESSAGES/basket.mo
+usr/share/locale/da/LC_MESSAGES/basket.mo
+usr/share/locale/zh_TW/LC_MESSAGES/basket.mo
+usr/share/locale/fr/LC_MESSAGES/basket.mo
+usr/share/locale/ru/LC_MESSAGES/basket.mo
+usr/share/locale/tr/LC_MESSAGES/basket.mo
+usr/share/locale/ja/LC_MESSAGES/basket.mo
+usr/share/locale/de/LC_MESSAGES/basket.mo
+usr/share/locale/cs/LC_MESSAGES/basket.mo
+usr/share/locale/nn/LC_MESSAGES/basket.mo
+usr/share/locale/it/LC_MESSAGES/basket.mo
+usr/share/locale/nl/LC_MESSAGES/basket.mo
+usr/share/config/magic/basket.magic
+usr/share/doc/kde/HTML/en/basket/index.cache.bz2
+usr/share/doc/kde/HTML/en/basket/index.docbook
+usr/bin/basket
+usr/lib/kde3/basketthumbcreator.la
+usr/lib/kde3/libbasketpart.so
+usr/lib/kde3/kcm_basket.la
+usr/lib/kde3/kcm_basket.so
+usr/lib/kde3/libbasketpart.la
+usr/lib/kde3/basketthumbcreator.so
+usr/lib/libbasketcommon.la
+usr/lib/libbasketcommon.so

Modified: kde-extras/basket/trunk/debian/changelog
===================================================================
--- kde-extras/basket/trunk/debian/changelog	2008-05-27 20:58:04 UTC (rev 10740)
+++ kde-extras/basket/trunk/debian/changelog	2008-05-27 20:58:23 UTC (rev 10741)
@@ -1,3 +1,10 @@
+basket (1.0.2-4) unstable; urgency=low
+
+  * Split kontact integration out to a separate package, so basket can be used
+    without kde3-kontact installed. Useful in a kde4 environment.
+
+ -- Sune Vuorela <debian at pusling.com>  Sun, 25 May 2008 21:08:36 +0200
+
 basket (1.0.2-3) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:

Modified: kde-extras/basket/trunk/debian/control
===================================================================
--- kde-extras/basket/trunk/debian/control	2008-05-27 20:58:04 UTC (rev 10740)
+++ kde-extras/basket/trunk/debian/control	2008-05-27 20:58:23 UTC (rev 10741)
@@ -4,11 +4,12 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>
 Build-Depends: debhelper (>= 5), autotools-dev, kdelibs4-dev (>= 4:3.5.6), kdepim-dev (>= 4:3.5.9-2), libgpgme11-dev, quilt (>= 0.40), autoconf, libtool, automake1.9
+Homepage: http://basket.kde.org/
 Standards-Version: 3.7.2
 
 Package: basket
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${kontact:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: a multi-purpose note-taking application for KDE
  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. 
@@ -18,3 +19,17 @@
  you want in one place, keep data on hand, take notes...
  .
   Homepage: http://basket.kde.org/
+
+Package: basket-kontact-integration
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${kontact:Depends}
+Description: a multi-purpose note-taking appliction, Kontact integration
+ 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-kde3 plugin
+ .

Modified: kde-extras/basket/trunk/debian/rules
===================================================================
--- kde-extras/basket/trunk/debian/rules	2008-05-27 20:58:04 UTC (rev 10740)
+++ kde-extras/basket/trunk/debian/rules	2008-05-27 20:58:23 UTC (rev 10741)
@@ -81,12 +81,12 @@
 	dh_installdirs
 
 	# Install into package-build-dir
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/basket
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	#incompatible compatible file
-	rm $(CURDIR)/debian/basket/usr/share/services/kontact/basket_v4.desktop
+	rm $(CURDIR)/debian/tmp/usr/share/services/kontact/basket_v4.desktop
 
-	mkdir -p $(CURDIR)/debian/basket/usr/share/applications/kde/
-	mv $(CURDIR)/debian/basket/usr/share/applnk/Utilities/basket.desktop $(CURDIR)/debian/basket/usr/share/applications/kde/
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/applications/kde/
+	mv $(CURDIR)/debian/tmp/usr/share/applnk/Utilities/basket.desktop $(CURDIR)/debian/tmp/usr/share/applications/kde/
 
 binary-indep: build install
 
@@ -97,7 +97,7 @@
 	dh_installchangelogs ChangeLog
 	dh_installdocs
 	dh_installexamples
-	dh_install
+	dh_install --sourcedir=debian/tmp
 	dh_installmenu
 #	dh_installlogrotate
 #	dh_installinfo
@@ -108,7 +108,7 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	echo kontact:Depends=kontact-plugin-abi-$(KONTACT_PLUGIN_ABI) >> debian/basket.substvars
+	echo kontact:Depends=kontact-plugin-abi-$(KONTACT_PLUGIN_ABI) >> debian/basket-kontact-integration.substvars
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

More information about the pkg-kde-commits mailing list