[SCM] Calligra suite packaging branch, master, updated. debian/2.9.11+dfsg-4-10-gae7feaa

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit de985222450393430975718924a5d4dcfa8355fe
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jul 2 12:49:51 2017 +0200

    drop old conflicts/replaces/breaks
---
 debian/changelog |  1 +
 debian/control   | 29 -----------------------------
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0bfb585..ff63348 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ calligra (1:2.9.11+dfsg1-1) UNRELEASED; urgency=medium
     - default-libmysqlclient-dev, freetds-dev, libpq-dev, libpqxx-dev,
       libxbase64-dev, postgresql-server-dev-all: used by kexi
     - libjpeg-dev: no more needed because of previous changes
+  * Drop all the koffice & pre-Jessie conflicts/replaces/breaks.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jun 2017 20:54:16 +0200
 
diff --git a/debian/control b/debian/control
index 1ce0181..931e51d 100644
--- a/debian/control
+++ b/debian/control
@@ -81,8 +81,6 @@ Depends: calligra-libs (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: pstoedit
-Breaks: calligra-data (<< 1:2.4.3-2), koffice-data (<< 1:2.4)
-Replaces: calligra-data (<< 1:2.4.3-2), koffice-data (<< 1:2.4)
 Homepage: http://www.calligra.org/karbon/
 Description: vector graphics application for the Calligra Suite
  Karbon is a vector drawing application with an user interface that is easy to
@@ -133,12 +131,6 @@ Description: web element for Calligra Reports
 Package: calligrasheets
 Architecture: any
 Section: math
-Replaces: calligra-data (<< 1:2.4.3-2),
-          koffice-data (<< 1:2.4),
-          kspread (<< 1:2.4)
-Breaks: calligra-data (<< 1:2.4.3-2),
-        koffice-data (<< 1:2.4),
-        kspread (<< 1:2.4)
 Depends: calligra-libs (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -153,8 +145,6 @@ Description: spreadsheet for the Calligra Suite
 
 Package: calligraplan
 Architecture: any
-Replaces: kplato (<< 1:2.4)
-Breaks: kplato (<< 1:2.4)
 Depends: calligra-libs (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -170,8 +160,6 @@ Description: integrated project management and planning tool
 Package: calligrawords
 Architecture: any
 Section: text
-Replaces: kword (<< 1:2.4)
-Breaks: kword (<< 1:2.4)
 Depends: calligra-libs (= ${binary:Version}),
          calligrawords-data (>= ${source:Version}),
          ${misc:Depends},
@@ -190,9 +178,6 @@ Package: calligrawords-data
 Architecture: all
 Section: text
 Depends: ${misc:Depends}
-Conflicts: koffice-data
-Breaks: calligra-data (<< 1:2.4.3-2)
-Replaces: calligra-data (<< 1:2.4.3-2), koffice-data
 Homepage: http://www.calligra.org/words/
 Description: data files for Words word processor
  This package contains architecture-independent data files for Words,
@@ -204,12 +189,6 @@ Description: data files for Words word processor
 
 Package: calligrastage
 Architecture: any
-Replaces: calligra-data (<< 1:2.4.3-2),
-          koffice-data (<< 1:2.4),
-          kpresenter (<< 1:2.4)
-Breaks: calligra-data (<< 1:2.4.3-2),
-        koffice-data (<< 1:2.4),
-        kpresenter (<< 1:2.4)
 Depends: calligra-libs (= ${binary:Version}),
          calligrastage-data (>=${source:Version}),
          ${misc:Depends},
@@ -235,8 +214,6 @@ Description: presentation program for the Calligra Suite
 Package: calligrastage-data
 Architecture: all
 Depends: ${misc:Depends}
-Breaks: calligrastage (<< 1:2.6.3-1~)
-Replaces: calligrastage (<< 1:2.6.3-1~)
 Description: data files for Calligra Stage
  This package contains architecture-independent data files for Stage,
  the presentation program shipped with the Calligra Suite.
@@ -299,9 +276,6 @@ Description: Tablet version of Calligra
 Package: calligra-libs
 Section: libs
 Architecture: any
-Replaces: kexi (<< 1:2.6.1), kformula, koffice-libs
-Conflicts: kformula, koffice-libs
-Breaks: kexi (<< 1:2.6.1)
 Depends: calligra-data (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -328,9 +302,6 @@ Package: calligra-data
 Section: libs
 Architecture: all
 Depends: ${misc:Depends}
-Replaces: kexi (<< 1:2.6.1), kformula, koffice-data
-Conflicts: kformula, koffice-data
-Breaks: kexi (<< 1:2.6.1)
 Suggests: khelpcenter
 Description: common shared data for the Calligra Suite
  This package provides the architecture-independent data that is shared

-- 
Calligra suite packaging