[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=1666b53

The following commit has been merged in the tip branch:
commit 1666b5385fd487f1188cac0737ca899e0e2f3749
Author: Pino Toscano <pino at debian.org>
Date:   Thu Apr 12 16:25:44 2012 +0200

    comment out calligra-map-shape
    
    this shape has been disabled upstream, as it is "not ready for prime time" yet
    (and move the two icons of it to the right package)
---
 debian/calligra-data.install      |    2 --
 debian/calligra-map-shape.install |    2 ++
 debian/control                    |   16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/calligra-data.install b/debian/calligra-data.install
index c78db60..86aebc4 100644
--- a/debian/calligra-data.install
+++ b/debian/calligra-data.install
@@ -79,7 +79,6 @@ usr/share/kde4/apps/calligra/icons/hicolor/16x16/actions/line.png
 usr/share/kde4/apps/calligra/icons/hicolor/16x16/actions/linewidth.png
 usr/share/kde4/apps/calligra/icons/hicolor/16x16/actions/lsub.png
 usr/share/kde4/apps/calligra/icons/hicolor/16x16/actions/lsup.png
-usr/share/kde4/apps/calligra/icons/hicolor/16x16/actions/map_shape.png
 usr/share/kde4/apps/calligra/icons/hicolor/16x16/actions/matrix.png
 usr/share/kde4/apps/calligra/icons/hicolor/16x16/actions/multiline.png
 usr/share/kde4/apps/calligra/icons/hicolor/16x16/actions/onetwomatrix.png
@@ -179,7 +178,6 @@ usr/share/kde4/apps/calligra/icons/hicolor/22x22/actions/line.png
 usr/share/kde4/apps/calligra/icons/hicolor/22x22/actions/lower.png
 usr/share/kde4/apps/calligra/icons/hicolor/22x22/actions/lsub.png
 usr/share/kde4/apps/calligra/icons/hicolor/22x22/actions/lsup.png
-usr/share/kde4/apps/calligra/icons/hicolor/22x22/actions/map_shape.png
 usr/share/kde4/apps/calligra/icons/hicolor/22x22/actions/matrix.png
 usr/share/kde4/apps/calligra/icons/hicolor/22x22/actions/multiline.png
 usr/share/kde4/apps/calligra/icons/hicolor/22x22/actions/music-cross.png
diff --git a/debian/calligra-map-shape.install b/debian/calligra-map-shape.install
index b2f23ee..1e9f193 100644
--- a/debian/calligra-map-shape.install
+++ b/debian/calligra-map-shape.install
@@ -1,2 +1,4 @@
 usr/lib/kde4/mapshape.so
+usr/share/kde4/apps/calligra/icons/hicolor/16x16/actions/map_shape.png
+usr/share/kde4/apps/calligra/icons/hicolor/22x22/actions/map_shape.png
 usr/share/kde4/services/mapshape.desktop
diff --git a/debian/control b/debian/control
index 17f4064..bf48d2f 100644
--- a/debian/control
+++ b/debian/control
@@ -529,14 +529,14 @@ 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-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

-- 
Calligra suite packaging