[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-92-gd158bc6

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit eb7083120310fa178bee09c26a627436c261052e
Author: Pino Toscano <pino at debian.org>
Date:   Sun Sep 11 18:59:57 2016 +0200

    drop kexi-map-form-widget and calligra-reports-map-element
    
    they depend on marble, which is not available for qt4 anymore
---
 debian/calligra-reports-map-element.install |  3 ---
 debian/changelog                            |  2 ++
 debian/control                              | 31 -----------------------------
 debian/kexi-map-form-widget.install         |  2 --
 4 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/debian/calligra-reports-map-element.install b/debian/calligra-reports-map-element.install
deleted file mode 100644
index 5f8e750..0000000
--- a/debian/calligra-reports-map-element.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/kde4/koreport_mapsplugin.so
-usr/share/kde4/apps/calligra/icons/hicolor/*/actions/report_map_element.png
-usr/share/kde4/services/calligra/koreport_mapsplugin.desktop
diff --git a/debian/changelog b/debian/changelog
index ed017b8..cde7baa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -84,6 +84,8 @@ calligra (1:2.9.11+dfsg-1) UNRELEASED; urgency=low
       (Closes: #826808)
     - libkactivities-dev: the kde4 version is not useful anymore
     - libmarble-dev: it is Qt5 only now
+      - drop kexi-map-form-widget and calligra-reports-map-element, since they
+        are no more built
     - nepomuk-core-dev: Nepomuk was phased out and removed already
   * Replace the libmysqlclient-dev with default-libmysqlclient-dev, so the
     default MySql implementation in Debian is used.
diff --git a/debian/control b/debian/control
index b359b20..a5f92d9 100644
--- a/debian/control
+++ b/debian/control
@@ -268,23 +268,6 @@ Description: web form widget for Kexi
  .
  This package is part of the Calligra Suite.
 
-Package: kexi-map-form-widget
-Architecture: any
-Section: database
-Depends: kexi (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Breaks: kexi (<< 1:2.3.70)
-Replaces: kexi (<< 1:2.3.70)
-Description: map form widget for Kexi
- Kexi is an integrated data management application. It can be used for
- creating database schemas, inserting data, performing queries, and
- processing data. Forms can be created to provide a custom interface to
- your data. All database objects - tables, queries and forms - are stored
- in the database, making it easy to share data and design.
- .
- This package provides a map widget for Kexi using the Marble library.
- .
- This package is part of the Calligra Suite.
-
 Package: calligra-reports-web-element
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -298,20 +281,6 @@ Description: web element for Calligra Reports
  .
  This package is part of the Calligra Suite.
 
-Package: calligra-reports-map-element
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: map element for Calligra Reports
- Calligra Suite is a set of applications written to help you to accomplish
- your work. It includes office applications such as a word processor,
- a spreadsheet, a presentation program, a database application, etc., and
- raster and vector graphics tools.
- .
- This package provides a map element for Calligra Reports, based on the
- Marble library.
- .
- This package is part of the Calligra Suite.
-
 Package: calligrasheets
 Architecture: any
 Section: math
diff --git a/debian/kexi-map-form-widget.install b/debian/kexi-map-form-widget.install
deleted file mode 100644
index b3f5de1..0000000
--- a/debian/kexi-map-form-widget.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/kde4/kformdesigner_mapbrowser.so
-usr/share/kde4/services/calligra/kformdesigner_mapbrowser.desktop

-- 
Calligra suite packaging