Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=d0c2485
The following commit has been merged in the master branch:
commit d0c2485c75ef4dcaa492990670f53377c2993295
Author: Adrien Grellier <adrien.grellier at laposte.net>
Date: Sat Oct 1 17:48:49 2011 +0200
split packages as upstream would like to
So the aim is to have:
- calligra-libs -> do not depend on marble or webkit
- calligra-reports-web-element -> optional, depends on webkit
- calligra-reports-map-element -> optional, depends on marble
- calligra-plugin-marble? -> optional, depends on marble
- kexi -> do not depends on marble or webkit
- kexi-web-form-widget -> optional, depends on webkit and kexi
- kexi-map-form-widget -> optional, depends on marble and kexi
---
debian/calligra-data.install | 1 -
debian/calligra-libs.install | 1 -
debian/calligra-reports-map-element.install | 2 +
debian/control | 39 +++++++++++++++++++++++++++
debian/kexi-map-form-widget.install | 2 +
debian/kexi-web-form-widget.install | 2 +
debian/kexi.install | 6 ++--
7 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/debian/calligra-data.install b/debian/calligra-data.install
index d4676ee..49f04ba 100644
--- a/debian/calligra-data.install
+++ b/debian/calligra-data.install
@@ -361,7 +361,6 @@ 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 d8578ff..e771074 100644
--- a/debian/calligra-libs.install
+++ b/debian/calligra-libs.install
@@ -17,7 +17,6 @@ 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
new file mode 100644
index 0000000..35bbff5
--- /dev/null
+++ b/debian/calligra-reports-map-element.install
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000..e69de29
diff --git a/debian/control b/debian/control
index ef16436..c58a51e 100644
--- a/debian/control
+++ b/debian/control
@@ -187,6 +187,45 @@ 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: kde
+Depends: ${misc:Depends}, ${shlibs:Depends}
+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: kde
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Map element for Calligra Reports
+ TODO: fill the description
+
+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
diff --git a/debian/kexi-map-form-widget.install b/debian/kexi-map-form-widget.install
new file mode 100644
index 0000000..e4a0b3c
--- /dev/null
+++ b/debian/kexi-map-form-widget.install
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000..d19dfa5
--- /dev/null
+++ b/debian/kexi-web-form-widget.install
@@ -0,0 +1,2 @@
+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 a00b955..95f9aad 100644
--- a/debian/kexi.install
+++ b/debian/kexi.install
@@ -12,9 +12,7 @@ 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
@@ -49,7 +47,9 @@ 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
+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/servicetypes/kexidb_driver.desktop
usr/share/kde4/servicetypes/kexihandler.desktop
usr/share/kde4/servicetypes/keximigration_driver.desktop
--
Calligra suite packaging