[SCM] Calligra suite packaging. branch, master, updated. 02ac37904fd2b47a30c49aa3387b8e59f0e21bf1

[Adrien Grellier]

The following commit has been merged in the master branch:
commit e459df5ae24a7b4abd7dfa3e7e2e7354a98928fb
Author: Adrien Grellier <adrien.grellier at laposte.net>
Date:   Wed Sep 21 22:39:34 2011 +0200

    revert add the optional packages suggest in README.PACKAGERS
    
    --HG--
    extra : rebase_source : 9997e9251818e51d8b07a145ad4bec18a19f293f
---
 debian/calligra-data.install                |    1 +
 debian/calligra-libs.install                |    1 +
 debian/calligra-reports-map-element.install |    2 -
 debian/control                              |   36 ---------------------------
 debian/kexi-map-form-widget.install         |    2 -
 debian/kexi-web-form-widget.install         |    2 -
 debian/kexi.install                         |    6 ++--
 7 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/debian/calligra-data.install b/debian/calligra-data.install
index 49f04ba..d4676ee 100644
--- a/debian/calligra-data.install
+++ b/debian/calligra-data.install
@@ -361,6 +361,7 @@ usr/share/kde4/services/kolcmsengine.desktop
 usr/share/kde4/services/kopabackgroundtool.desktop
 usr/share/kde4/services/koreport_barcodeplugin.desktop
 usr/share/kde4/services/koreport_chartplugin.desktop
+usr/share/kde4/services/koreport_mapsplugin.desktop
 usr/share/kde4/services/kounavail.desktop
 usr/share/kde4/services/musicshape.desktop
 usr/share/kde4/services/pathshapes.desktop
diff --git a/debian/calligra-libs.install b/debian/calligra-libs.install
index e771074..d8578ff 100644
--- a/debian/calligra-libs.install
+++ b/debian/calligra-libs.install
@@ -17,6 +17,7 @@ usr/lib/kde4/kolcmsengine.so
 usr/lib/kde4/kopabackgroundtool.so
 usr/lib/kde4/koreport_barcodeplugin.so
 usr/lib/kde4/koreport_chartplugin.so
+usr/lib/kde4/koreport_mapsplugin.so
 usr/lib/kde4/kounavailpart.so
 usr/lib/kde4/musicshape.so
 usr/lib/kde4/pathshapes.so
diff --git a/debian/calligra-reports-map-element.install b/debian/calligra-reports-map-element.install
deleted file mode 100644
index 35bbff5..0000000
--- a/debian/calligra-reports-map-element.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/kde4/koreport_mapsplugin.so
-usr/share/kde4/services/koreport_mapsplugin.desktop
diff --git a/debian/calligra-reports-web-element.install b/debian/calligra-reports-web-element.install
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/control b/debian/control
index ac55e56..0293f4a 100644
--- a/debian/control
+++ b/debian/control
@@ -187,42 +187,6 @@ Description: Sybase support for kexi
  .
  This package is part of the Calligra Office Suite.
 
-Package: kexi-web-form-widget
-Architecture: any
-Section: database
-Depends: ${misc:Depends}, ${shlibs:Depends}, kexi (>= ${source:Version})
-Breaks: kexi (<< 1:2.3.70)
-Replaces: kexi (<< 1:2.3.70)
-Description: Kexi web form widget
- TODO: fill the description
-
-Package: calligra-reports-web-element
-Architecture: any
-Section: database
-Depends: ${misc:Depends}, ${shlibs:Depends}, kexi (>= ${source:Version})
-Breaks: kexi (<< 1:2.3.70)
-Replaces: kexi (<< 1:2.3.70)
-Description: Web element for Calligra Reports
- TODO: fill the description
-
-Package: kexi-map-form-widget
-Architecture: any
-Section: database
-Depends: ${misc:Depends}, ${shlibs:Depends}, kexi (>= ${source:Version})
-Breaks: kexi (<< 1:2.3.70)
-Replaces: kexi (<< 1:2.3.70)
-Description: Kexi map form widget
- TODO: fill the description
-
-Package: calligra-reports-map-element
-Architecture: any
-Section: database
-Depends: ${misc:Depends}, ${shlibs:Depends}, kexi (>= ${source:Version})
-Breaks: kexi (<< 1:2.3.70)
-Replaces: kexi (<< 1:2.3.70)
-Description: Map element for Calligra Reports
- TODO: fill the description
-
 Package: krita
 Architecture: any
 Section: graphics
diff --git a/debian/kexi-map-form-widget.install b/debian/kexi-map-form-widget.install
deleted file mode 100644
index e4a0b3c..0000000
--- a/debian/kexi-map-form-widget.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/kde4/kformdesigner_mapbrowser.so
-usr/share/kde4/services/kformdesigner/kformdesigner_mapbrowser.desktop
diff --git a/debian/kexi-web-form-widget.install b/debian/kexi-web-form-widget.install
deleted file mode 100644
index d19dfa5..0000000
--- a/debian/kexi-web-form-widget.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/kde4/kformdesigner_webbrowser.so
-usr/share/kde4/services/kformdesigner/kformdesigner_webbrowser.desktop
diff --git a/debian/kexi.install b/debian/kexi.install
index 95f9aad..a00b955 100644
--- a/debian/kexi.install
+++ b/debian/kexi.install
@@ -12,7 +12,9 @@ usr/lib/kde4/keximigrate_txt.so
 usr/lib/kde4/kexirelationdesignshape.so
 usr/lib/kde4/kformdesigner_containers.so
 usr/lib/kde4/kformdesigner_kexidbwidgets.so
+usr/lib/kde4/kformdesigner_mapbrowser.so
 usr/lib/kde4/kformdesigner_stdwidgets.so
+usr/lib/kde4/kformdesigner_webbrowser.so
 usr/lib/kde4/krossmodulekexidb.so
 usr/lib/libkexicore.so.8
 usr/lib/libkexicore.so.8.0.0
@@ -47,9 +49,7 @@ usr/share/kde4/services/kexidb_sqlite3driver.desktop
 usr/share/kde4/services/keximigrate_mdb.desktop
 usr/share/kde4/services/keximigrate_txt.desktop
 usr/share/kde4/services/kexirelationdesignshape.desktop
-usr/share/kde4/services/kformdesigner/kformdesigner_containers.desktop
-usr/share/kde4/services/kformdesigner/kformdesigner_kexidbfactory.desktop
-usr/share/kde4/services/kformdesigner/kformdesigner_stdwidgets.desktop
+usr/share/kde4/services/kformdesigner
 usr/share/kde4/servicetypes/kexidb_driver.desktop
 usr/share/kde4/servicetypes/kexihandler.desktop
 usr/share/kde4/servicetypes/keximigration_driver.desktop

-- 
Calligra suite packaging.