[SCM] Calligra suite packaging branch, tip, updated. debian/2.4.3-2-368-g6843e2f

[Adrien Grellier]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=6b098c2

The following commit has been merged in the tip branch:
commit 6b098c2531b548ffa8f1fd2f3c767392ba33928a
Merge: 7452a7317a4bb077a60e2cab2d45e4b527191df0 f9b86c35e2c0358132df707fd1a760c463b32f28
Author: Adrien Grellier <adrien.grellier at laposte.net>
Date:   Fri Oct 7 19:44:45 2011 +0200

    merge with previous changes

 debian/changelog |    3 ---
 debian/control   |    7 -------
 2 files changed, 0 insertions(+), 10 deletions(-)

diff --cc debian/control
index 78a33b2,76ed055..b42039b
--- a/debian/control
+++ b/debian/control
@@@ -246,16 -240,7 +246,9 @@@ Description: Map element for Calligra R
   raster and vectorial graphics tools.
   .
   This package provides a map element for Calligra Reports, based on libmarblewidget11.
 + .
 + This package is part of the Calligra Office Suite.
  
- Package: calligra-plugin-marble
- Architecture: any
- Section: kde
- Depends: ${misc:Depends}, ${shlibs:Depends},
- Description: Marble integration in Calligra
-  TODO: fill the description
- 
  Package: krita
  Architecture: any
  Section: graphics

-- 
Calligra suite packaging