[SCM] Calligra suite packaging. branch, tip, updated. 23bb7771f692c79686d6a0459b8f9215c4ac2679

[Adrien Grellier]

The following commit has been merged in the tip branch:
commit 23bb7771f692c79686d6a0459b8f9215c4ac2679
Author: Adrien Grellier <adrien.grellier at laposte.net>
Date:   Sun Nov 6 17:42:06 2011 +0100

    put the marble shape into a separate package
    
    It avoid calligra-libs to depend on marble
---
 debian/calligra-data.install      |    1 -
 debian/calligra-libs.install      |    1 -
 debian/calligra-map-shape.install |    2 ++
 debian/control                    |   10 ++++++++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/calligra-data.install b/debian/calligra-data.install
index c15bee6..cbae39c 100644
--- a/debian/calligra-data.install
+++ b/debian/calligra-data.install
@@ -367,7 +367,6 @@ usr/share/kde4/services/kopabackgroundtool.desktop
 usr/share/kde4/services/koreport_barcodeplugin.desktop
 usr/share/kde4/services/koreport_chartplugin.desktop
 usr/share/kde4/services/kounavail.desktop
-usr/share/kde4/services/mapshape.desktop
 usr/share/kde4/services/musicshape.desktop
 usr/share/kde4/services/pathshapes.desktop
 usr/share/kde4/services/pictureshape.desktop
diff --git a/debian/calligra-libs.install b/debian/calligra-libs.install
index 9a97fda..758b1d8 100644
--- a/debian/calligra-libs.install
+++ b/debian/calligra-libs.install
@@ -18,7 +18,6 @@ usr/lib/kde4/kopabackgroundtool.so
 usr/lib/kde4/koreport_barcodeplugin.so
 usr/lib/kde4/koreport_chartplugin.so
 usr/lib/kde4/kounavailpart.so
-usr/lib/kde4/mapshape.so
 usr/lib/kde4/musicshape.so
 usr/lib/kde4/pathshapes.so
 usr/lib/kde4/pictureshape.so
diff --git a/debian/calligra-map-shape.install b/debian/calligra-map-shape.install
new file mode 100644
index 0000000..b2f23ee
--- /dev/null
+++ b/debian/calligra-map-shape.install
@@ -0,0 +1,2 @@
+usr/lib/kde4/mapshape.so
+usr/share/kde4/services/mapshape.desktop
diff --git a/debian/control b/debian/control
index b1e038b..0962454 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,7 @@ Depends: ${misc:Depends}, karbon (>= ${source:Version}), calligraflow (>= ${sour
  calligrawords (>= ${source:Version}), kthesaurus (>= ${source:Version}),
  kexi (>= ${source:Version}) 
 Suggests: create-resources
+Recommends: calligra-map-shape (>= ${source:Version})
 Homepage: http://www.calligra-suite.org
 Description: integrated work applications suite
  Calligra Suite is a set of applications written to help you to accomplish
@@ -477,6 +478,15 @@ Description: Okular backend for ODP documents
  .
  This package is part of the Calligra Office Suite.
 
+Package: calligra-map-shape
+Section: libs
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: map shape plugin for the Calligra Office Suite
+ This package provides the map shape, based on the marble libraries.
+ .
+ This package is part of the Calligra Office Suite.
+
 Package: calligra-dev
 Architecture: any
 Section: devel

-- 
Calligra suite packaging.