[SCM] Calligra suite packaging branch, master, updated. debian/3.0.1+dfsg-2-23-g9a37b24

Pino Toscano pino at moszumanska.debian.org
Tue Feb 6 20:20:59 UTC 2018 

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

The following commit has been merged in the master branch:
commit 81ca53dd3783a93e8027e9ba02c344d0c04d3434
Author: Pino Toscano <pino at debian.org>
Date:   Tue Feb 6 20:00:42 2018 +0100

    move translations from l10n pkgs to apps
---
 debian/calligra-data.install            |  23 ++
 debian/calligra-l10n-bs.install         |   1 -
 debian/calligra-l10n-ca.install         |   1 -
 debian/calligra-l10n-cavalencia.install |   1 -
 debian/calligra-l10n-cs.install         |   1 -
 debian/calligra-l10n-da.install         |   1 -
 debian/calligra-l10n-de.install         |   1 -
 debian/calligra-l10n-el.install         |   1 -
 debian/calligra-l10n-engb.install       |   1 -
 debian/calligra-l10n-es.install         |   1 -
 debian/calligra-l10n-et.install         |   1 -
 debian/calligra-l10n-fi.install         |   1 -
 debian/calligra-l10n-fr.install         |   1 -
 debian/calligra-l10n-gl.install         |   1 -
 debian/calligra-l10n-hu.install         |   1 -
 debian/calligra-l10n-it.install         |   1 -
 debian/calligra-l10n-ja.install         |   1 -
 debian/calligra-l10n-kk.install         |   1 -
 debian/calligra-l10n-nb.install         |   1 -
 debian/calligra-l10n-nl.install         |   1 -
 debian/calligra-l10n-pl.install         |   1 -
 debian/calligra-l10n-pt.install         |   1 -
 debian/calligra-l10n-ptbr.install       |   1 -
 debian/calligra-l10n-ru.install         |   1 -
 debian/calligra-l10n-sk.install         |   1 -
 debian/calligra-l10n-sv.install         |   1 -
 debian/calligra-l10n-tr.install         |   1 -
 debian/calligra-l10n-uk.install         |   1 -
 debian/calligra-l10n-zhcn.install       |   1 -
 debian/calligra-l10n-zhtw.install       |   1 -
 debian/calligrasheets.install           |   5 +
 debian/calligrastage-data.install       |   1 +
 debian/calligrawords-data.install       |   2 +
 debian/changelog                        |   5 +
 debian/control                          | 477 +++++++++++++-------------------
 debian/karbon.install                   |   3 +
 debian/okular-backend-odp.install       |   1 +
 debian/okular-backend-odt.install       |   1 +
 debian/rules                            |  26 +-
 debian/source/lintian-overrides         |   2 +
 40 files changed, 243 insertions(+), 332 deletions(-)

diff --git a/debian/calligra-data.install b/debian/calligra-data.install
index 489436e..9e4ca62 100644
--- a/debian/calligra-data.install
+++ b/debian/calligra-data.install
@@ -4,5 +4,28 @@ usr/share/calligra/
 usr/share/calligra_shape_music/
 usr/share/doc/HTML/en/calligra
 usr/share/kservices5/calligradocinfopropspage.desktop
+usr/share/locale/*/LC_MESSAGES/calligra-defaulttools.mo
+usr/share/locale/*/LC_MESSAGES/calligra-dockers.mo
+usr/share/locale/*/LC_MESSAGES/calligra-opener.mo
+usr/share/locale/*/LC_MESSAGES/calligra.mo
+usr/share/locale/*/LC_MESSAGES/calligra_shape_artistictext.mo
+usr/share/locale/*/LC_MESSAGES/calligra_shape_chart.mo
+usr/share/locale/*/LC_MESSAGES/calligra_shape_formula.mo
+usr/share/locale/*/LC_MESSAGES/calligra_shape_music.mo
+usr/share/locale/*/LC_MESSAGES/calligra_shape_paths.mo
+usr/share/locale/*/LC_MESSAGES/calligra_shape_picture.mo
+usr/share/locale/*/LC_MESSAGES/calligra_shape_plugin.mo
+usr/share/locale/*/LC_MESSAGES/calligra_shape_text.mo
+usr/share/locale/*/LC_MESSAGES/calligra_shape_threed.mo
+usr/share/locale/*/LC_MESSAGES/calligra_shape_vector.mo
+usr/share/locale/*/LC_MESSAGES/calligra_shape_video.mo
+usr/share/locale/*/LC_MESSAGES/calligra_textediting_autocorrect.mo
+usr/share/locale/*/LC_MESSAGES/calligra_textediting_changecase.mo
+usr/share/locale/*/LC_MESSAGES/calligra_textediting_spellcheck.mo
+usr/share/locale/*/LC_MESSAGES/calligra_textediting_thesaurus.mo
+usr/share/locale/*/LC_MESSAGES/calligra_textinlineobject_variables.mo
+usr/share/locale/*/LC_MESSAGES/calligrafilters.mo
+usr/share/locale/*/LC_MESSAGES/kocolorspaces.mo
+usr/share/locale/*/LC_MESSAGES/koconverter.mo
 usr/share/mime/packages/calligra_svm.xml
 usr/share/mime/packages/wiki-format.xml
diff --git a/debian/calligra-l10n-bs.install b/debian/calligra-l10n-bs.install
deleted file mode 100644
index 40cdacf..0000000
--- a/debian/calligra-l10n-bs.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/bs
diff --git a/debian/calligra-l10n-ca.install b/debian/calligra-l10n-ca.install
deleted file mode 100644
index 8e0132b..0000000
--- a/debian/calligra-l10n-ca.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/ca
diff --git a/debian/calligra-l10n-cavalencia.install b/debian/calligra-l10n-cavalencia.install
deleted file mode 100644
index 891001d..0000000
--- a/debian/calligra-l10n-cavalencia.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/ca at valencia
diff --git a/debian/calligra-l10n-cs.install b/debian/calligra-l10n-cs.install
deleted file mode 100644
index 98a01e0..0000000
--- a/debian/calligra-l10n-cs.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/cs
diff --git a/debian/calligra-l10n-da.install b/debian/calligra-l10n-da.install
deleted file mode 100644
index aad2fd4..0000000
--- a/debian/calligra-l10n-da.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/da
diff --git a/debian/calligra-l10n-de.install b/debian/calligra-l10n-de.install
deleted file mode 100644
index c10a9c8..0000000
--- a/debian/calligra-l10n-de.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/de
diff --git a/debian/calligra-l10n-el.install b/debian/calligra-l10n-el.install
deleted file mode 100644
index f172dfa..0000000
--- a/debian/calligra-l10n-el.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/el
diff --git a/debian/calligra-l10n-engb.install b/debian/calligra-l10n-engb.install
deleted file mode 100644
index 5c06a2d..0000000
--- a/debian/calligra-l10n-engb.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/en_GB
diff --git a/debian/calligra-l10n-es.install b/debian/calligra-l10n-es.install
deleted file mode 100644
index b4635b5..0000000
--- a/debian/calligra-l10n-es.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/es
diff --git a/debian/calligra-l10n-et.install b/debian/calligra-l10n-et.install
deleted file mode 100644
index 7026817..0000000
--- a/debian/calligra-l10n-et.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/et
diff --git a/debian/calligra-l10n-fi.install b/debian/calligra-l10n-fi.install
deleted file mode 100644
index 388ed30..0000000
--- a/debian/calligra-l10n-fi.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/fi
diff --git a/debian/calligra-l10n-fr.install b/debian/calligra-l10n-fr.install
deleted file mode 100644
index c6fd1fd..0000000
--- a/debian/calligra-l10n-fr.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/fr
diff --git a/debian/calligra-l10n-gl.install b/debian/calligra-l10n-gl.install
deleted file mode 100644
index 00da461..0000000
--- a/debian/calligra-l10n-gl.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/gl
diff --git a/debian/calligra-l10n-hu.install b/debian/calligra-l10n-hu.install
deleted file mode 100644
index 925b434..0000000
--- a/debian/calligra-l10n-hu.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/hu
diff --git a/debian/calligra-l10n-it.install b/debian/calligra-l10n-it.install
deleted file mode 100644
index 5595b93..0000000
--- a/debian/calligra-l10n-it.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/it
diff --git a/debian/calligra-l10n-ja.install b/debian/calligra-l10n-ja.install
deleted file mode 100644
index b572700..0000000
--- a/debian/calligra-l10n-ja.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/ja
diff --git a/debian/calligra-l10n-kk.install b/debian/calligra-l10n-kk.install
deleted file mode 100644
index d5d9187..0000000
--- a/debian/calligra-l10n-kk.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/kk
diff --git a/debian/calligra-l10n-nb.install b/debian/calligra-l10n-nb.install
deleted file mode 100644
index 132b4e2..0000000
--- a/debian/calligra-l10n-nb.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/nb
diff --git a/debian/calligra-l10n-nl.install b/debian/calligra-l10n-nl.install
deleted file mode 100644
index ac4df57..0000000
--- a/debian/calligra-l10n-nl.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/nl
diff --git a/debian/calligra-l10n-pl.install b/debian/calligra-l10n-pl.install
deleted file mode 100644
index 9ade6d6..0000000
--- a/debian/calligra-l10n-pl.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/pl
diff --git a/debian/calligra-l10n-pt.install b/debian/calligra-l10n-pt.install
deleted file mode 100644
index b9e9b75..0000000
--- a/debian/calligra-l10n-pt.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/pt
diff --git a/debian/calligra-l10n-ptbr.install b/debian/calligra-l10n-ptbr.install
deleted file mode 100644
index 4c9fe04..0000000
--- a/debian/calligra-l10n-ptbr.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/pt_BR
diff --git a/debian/calligra-l10n-ru.install b/debian/calligra-l10n-ru.install
deleted file mode 100644
index bd14bec..0000000
--- a/debian/calligra-l10n-ru.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/ru
diff --git a/debian/calligra-l10n-sk.install b/debian/calligra-l10n-sk.install
deleted file mode 100644
index 3db8cd5..0000000
--- a/debian/calligra-l10n-sk.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/sk
diff --git a/debian/calligra-l10n-sv.install b/debian/calligra-l10n-sv.install
deleted file mode 100644
index 6a9b53d..0000000
--- a/debian/calligra-l10n-sv.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/sv
diff --git a/debian/calligra-l10n-tr.install b/debian/calligra-l10n-tr.install
deleted file mode 100644
index 0ed7b2d..0000000
--- a/debian/calligra-l10n-tr.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/tr
diff --git a/debian/calligra-l10n-uk.install b/debian/calligra-l10n-uk.install
deleted file mode 100644
index 776f858..0000000
--- a/debian/calligra-l10n-uk.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/uk
diff --git a/debian/calligra-l10n-zhcn.install b/debian/calligra-l10n-zhcn.install
deleted file mode 100644
index c27352f..0000000
--- a/debian/calligra-l10n-zhcn.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/zh_CN
diff --git a/debian/calligra-l10n-zhtw.install b/debian/calligra-l10n-zhtw.install
deleted file mode 100644
index 7f472c7..0000000
--- a/debian/calligra-l10n-zhtw.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/zh_TW
diff --git a/debian/calligrasheets.install b/debian/calligrasheets.install
index a939405..6dc6cb8 100644
--- a/debian/calligrasheets.install
+++ b/debian/calligrasheets.install
@@ -47,6 +47,11 @@ usr/share/kservices5/sheets_ods_thumbnail.desktop
 usr/share/kservices5/sheets_xlsx_thumbnail.desktop
 usr/share/kxmlgui5/calligrasheets/calligrasheets.rc
 usr/share/kxmlgui5/calligrasheets/calligrasheets_readonly.rc
+usr/share/locale/*/LC_MESSAGES/calligra_shape_spreadsheet.mo
+usr/share/locale/*/LC_MESSAGES/calligrasheets.mo
+usr/share/locale/*/LC_MESSAGES/calligrasheets_calendar.mo
+usr/share/locale/*/LC_MESSAGES/calligrasheets_solver.mo
+usr/share/locale/*/LC_MESSAGES/krossmodulesheets.mo
 usr/share/metainfo/org.kde.calligrasheets.appdata.xml
 usr/share/templates/.source/SpreadSheet.ods
 usr/share/templates/SpreadSheet.desktop
diff --git a/debian/calligrastage-data.install b/debian/calligrastage-data.install
index 3d2ff71..9866836 100644
--- a/debian/calligrastage-data.install
+++ b/debian/calligrastage-data.install
@@ -11,5 +11,6 @@ usr/share/kservices5/stage_powerpoint_thumbnail.desktop
 usr/share/kservices5/stage_pptx_thumbnail.desktop
 usr/share/kxmlgui5/calligrastage/calligrastage.rc
 usr/share/kxmlgui5/calligrastage/calligrastage_readonly.rc
+usr/share/locale/*/LC_MESSAGES/calligrastage.mo
 usr/share/templates/.source/Presentation.odp
 usr/share/templates/Presentation.desktop
diff --git a/debian/calligrawords-data.install b/debian/calligrawords-data.install
index a768efd..43a9cf0 100644
--- a/debian/calligrawords-data.install
+++ b/debian/calligrawords-data.install
@@ -4,5 +4,7 @@ usr/share/icons/hicolor/*/apps/calligrawords.png
 usr/share/icons/hicolor/scalable/apps/calligrawords.svgz
 usr/share/kxmlgui5/calligrawords/calligrawords.rc
 usr/share/kxmlgui5/calligrawords/calligrawords_readonly.rc
+usr/share/locale/*/LC_MESSAGES/calligrawords.mo
+usr/share/locale/*/LC_MESSAGES/krossmodulewords.mo
 usr/share/templates/.source/TextDocument.odt
 usr/share/templates/TextDocument.desktop
diff --git a/debian/changelog b/debian/changelog
index 2f761c9..58dad57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,11 @@ calligra (1:3.1.0+dfsg-0r1) UNRELEASED; urgency=medium
     a KF5 version of Okular is available
     - uncomment the okular-dev build dependency, with the right version
     - ship again their translations
+  * Move the translations to their own packages:
+    - turn the calligra-l10n-* binaries into empty dummy packages
+    - add proper breaks/replaces
+    - remove calligra_shape_comment.mo, and calligra_shape_template.mo, as
+      these shapes are not shipped
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 Sep 2017 07:52:25 +0200
 
diff --git a/debian/control b/debian/control
index fb20327..dcdddf0 100644
--- a/debian/control
+++ b/debian/control
@@ -110,6 +110,8 @@ Depends: calligra-libs (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: pstoedit
+Breaks: ${calligra:oldLangs}
+Replaces: ${calligra:oldLangs}
 Homepage: https://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
@@ -159,6 +161,8 @@ Depends: calligra-libs (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: khelpcenter
+Breaks: ${calligra:oldLangs}
+Replaces: ${calligra:oldLangs}
 Homepage: https://www.calligra.org/sheets/
 Description: spreadsheet for the Calligra Suite
  Tables is a powerful spreadsheet application.  It is scriptable and
@@ -188,6 +192,8 @@ Package: calligrawords-data
 Architecture: all
 Section: text
 Depends: ${misc:Depends}
+Breaks: ${calligra:oldLangs}
+Replaces: ${calligra:oldLangs}
 Homepage: https://www.calligra.org/words/
 Description: data files for Words word processor
  This package contains architecture-independent data files for Words,
@@ -224,6 +230,8 @@ Description: presentation program for the Calligra Suite
 Package: calligrastage-data
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: ${calligra:oldLangs}
+Replaces: ${calligra:oldLangs}
 Homepage: https://www.calligra.org/stage/
 Description: data files for Calligra Stage
  This package contains architecture-independent data files for Stage,
@@ -252,6 +260,8 @@ Section: libs
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: khelpcenter
+Breaks: ${calligra:oldLangs}
+Replaces: ${calligra:oldLangs}
 Description: common shared data for the Calligra Suite
  This package provides the architecture-independent data that is shared
  amongst the various components of Calligra.
@@ -266,6 +276,8 @@ Depends: calligra-libs (= ${binary:Version}),
          ${shlibs:Depends}
 Recommends: okular
 Enhances: okular
+Breaks: ${calligra:oldLangs}
+Replaces: ${calligra:oldLangs}
 Description: Okular backend for ODP documents
  This package provides a backend for Okular to view OpenDocument Presentation
  (ODP) documents, but also PowerPoint and PPTX documents.
@@ -280,6 +292,8 @@ Depends: calligra-libs (= ${binary:Version}),
          ${shlibs:Depends}
 Recommends: okular
 Enhances: okular
+Breaks: ${calligra:oldLangs}
+Replaces: ${calligra:oldLangs}
 Description: Okular backend for ODT documents
  This package provides a backend for Okular to view OpenDocument Text
  (ODT) documents, but also DOC, DOCX, RTF and WPD documents.
@@ -313,433 +327,320 @@ Description: Calligra Gemini - data files
 
 Package: calligra-l10n-bs
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Bosnian (bs) localization files for Calligra
- This package contains the Bosnian translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Bosnian (bs) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-ca
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Catalan (ca) localization files for Calligra
- This package contains the Catalan translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Catalan (ca) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-cavalencia
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Southern Catalan (Valencian) (ca at valencia) files for Calligra
- This package contains the Southern Catalan (Valencian) translations for all
- the applications in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Southern Catalan (Valencian) (ca at valencia)
+ translations for all the Calligra applications, but now they are shipped
+ with the applications themselves. This package can be safely removed after
+ the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-cs
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Czech (cs) localization files for Calligra
- This package contains the Czech translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Czech (cs) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-da
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Danish (da) localization files for Calligra
- This package contains the Danish translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Danish (da) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-de
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: German (de) localization files for Calligra
- This package contains the German translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain German (de) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-el
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Greek (el) localization files for Calligra
- This package contains the Greek translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Greek (el) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-engb
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: British English (en_GB) localization files for Calligra
- This package contains the British English (en_GB) translations
- for all the applications in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain British English (en_GB) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-es
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Spanish (es) localization files for Calligra
- This package contains the Spanish translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Spanish (es) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-et
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Estonian (et) localization files for Calligra
- This package contains the Estonian translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Estonian (et) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-fi
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Finnish (fi) localization files for Calligra
- This package contains the Finnish translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Finnish (fi) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-fr
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: French (fr) localization files for Calligra
- This package contains the French translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain French (fr) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-gl
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Galician (gl) localization files for Calligra
- This package contains the Galician translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Galician (gl) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-hu
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Hungarian (hu) localization files for Calligra
- This package contains the Hungarian translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Hungarian (hu) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-it
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Italian (it) localization files for Calligra
- This package contains the Italian translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Italian (it) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-ja
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Japanese (ja) localization files for Calligra
- This package contains the Japanese translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Japanese (ja) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-kk
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Kazakh (kk) localization files for Calligra
- This package contains the Kazakh translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Kazakh (kk) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-nb
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Norwegian Bookmal (nb) localization files for Calligra
- This package contains the Norwegian Bookmal translations for all
- the applications in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Norwegian Bookmal (nb) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-nl
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Dutch (nl) localization files for Calligra
- This package contains the Dutch translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Dutch (nl) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-pl
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Polish (pl) localization files for Calligra
- This package contains the Polish translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Polish (pl) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-pt
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Portuguese (pt) localization files for Calligra
- This package contains the Portuguese translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Portuguese (pt) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-ptbr
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Brazilian Portuguese (pt_BR) localization files for Calligra
- This package contains the Brazilian Portuguese translations for all
- the applications in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Brazilian Portuguese (pt_BR) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-ru
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Russian (ru) localization files for Calligra
- This package contains the Russian translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Russian (ru) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-sk
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Slovakian (sk) localization files for Calligra
- This package contains the Slovakian translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Slovakian (sk) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-sv
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Swedish (sv) localization files for Calligra
- This package contains the Swedish translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Swedish (sv) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-tr
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Provides: ${l10n:Provides}
-Description: Turkish (tr) localization files for Calligra
- This package contains the Turkish translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Turkish (tr) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-uk
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Ukrainian (uk) localization files for Calligra
- This package contains the Ukrainian translations for all the applications
- in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Ukrainian (uk) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-zhcn
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Chinese Simplified (zh_CN) localization files for Calligra
- This package contains the Chinese Simplified translation for all
- the applications in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Chinese Simplified (zh_CN) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
 
 Package: calligra-l10n-zhtw
 Architecture: all
-Section: localization
-Depends: ${misc:Depends}, ${l10n:Depends}
-Recommends: ${l10n:Recommends}
-Suggests: ${l10n:Suggests}
-Replaces: ${l10n:Replaces}
-Breaks: ${l10n:Breaks}
-Provides: ${l10n:Provides}
-Description: Chinese Traditional (zh_TW) localization files for Calligra
- This package contains the Chinese Traditional translations for all
- the applications in the Calligra Office Suite.
+Section: oldlibs
+Depends: ${misc:Depends}
+Description: dummy empty package
+ This package used to contain Chinese Traditional (zh_TW) translations for all
+ the Calligra applications, but now they are shipped with the applications
+ themselves. This package can be safely removed after the upgrade.
  .
  This package is part of the Calligra Suite.
diff --git a/debian/karbon.install b/debian/karbon.install
index e168aa4..52d0436 100644
--- a/debian/karbon.install
+++ b/debian/karbon.install
@@ -33,6 +33,9 @@ usr/share/kservices5/karbon_wpg_thumbnail.desktop
 usr/share/kservices5/karbon_xfig_thumbnail.desktop
 usr/share/kxmlgui5/karbon/karbon.rc
 usr/share/kxmlgui5/karbon/karbon_readonly.rc
+usr/share/locale/*/LC_MESSAGES/KarbonFilterEffects.mo
+usr/share/locale/*/LC_MESSAGES/KarbonTools.mo
+usr/share/locale/*/LC_MESSAGES/karbon.mo
 usr/share/metainfo/org.kde.karbon.appdata.xml
 usr/share/templates/.source/Illustration.odg
 usr/share/templates/Illustration.desktop
diff --git a/debian/okular-backend-odp.install b/debian/okular-backend-odp.install
index 52a110c..e13a1b2 100644
--- a/debian/okular-backend-odp.install
+++ b/debian/okular-backend-odp.install
@@ -8,3 +8,4 @@ usr/share/applications/okularApplication_pptx_calligra.desktop
 usr/share/kservices5/okularOdp_calligra.desktop
 usr/share/kservices5/okularPowerpoint_calligra.desktop
 usr/share/kservices5/okularPptx_calligra.desktop
+usr/share/locale/*/LC_MESSAGES/okularGenerator_odp.mo
diff --git a/debian/okular-backend-odt.install b/debian/okular-backend-odt.install
index 4d7d5ca..eff5ec6 100644
--- a/debian/okular-backend-odt.install
+++ b/debian/okular-backend-odt.install
@@ -14,3 +14,4 @@ usr/share/kservices5/okularDocx_calligra.desktop
 usr/share/kservices5/okularOdt_calligra.desktop
 usr/share/kservices5/okularRtf_calligra.desktop
 usr/share/kservices5/okularWpd_calligra.desktop
+usr/share/locale/*/LC_MESSAGES/okularGenerator_odt.mo
diff --git a/debian/rules b/debian/rules
index 480094c..8d751b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,17 +6,14 @@
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 export QT_SELECT=5
 
-# Value of the l10n:{Depends,Recommends,Suggests,Replaces,Breaks,Provides}
-# substvars. Common relationships for each l10n package.
-L10N_Depends := calligra-libs (>= 1:3.0)
-L10N_Recommends :=
-L10N_Suggests := calligra
-L10N_Replaces :=
-L10N_Breaks :=
-L10N_Provides := calligra-l10n
-
-L10N_PREFIX := calligra-l10n
-L10N_PACKAGES_IN_CONTROL = $(shell dh_listpackages | grep '$(L10N_PREFIX)')
+# conflicts with old calligra-l10n
+# (mostly copied from l10n-packages.mk in pkg-kde-tools)
+l10npkgs_firstversion_ok := 1:3.1.0~
+l10npkgs_prefix := calligra-l10n
+l10npkgs_fixed_version_comma := (<< $(l10npkgs_firstversion_ok)),
+# the list of languages in calligra < 3.1
+l10npkgs_langs := bs ca cavalencia cs da de el engb es et eu fi fr gl hu it ja kk nb nds nl pl pt ptbr ru sk sv tr uk zhcn zhtw
+l10npkgs_packages_rels := $(patsubst %,$(l10npkgs_prefix)-% $(l10npkgs_fixed_version_comma),$(l10npkgs_langs))
 
 %:
 	dh $@ --parallel --with kf5
@@ -43,6 +40,8 @@ override_dh_auto_install:
 	# Remove translations of stuff not shipped
 	rm -f debian/tmp/usr/share/locale/*/LC_MESSAGES/braindump.mo
 	rm -f debian/tmp/usr/share/locale/*/LC_MESSAGES/calligra_semanticitem_*.mo
+	rm -f debian/tmp/usr/share/locale/*/LC_MESSAGES/calligra_shape_comment.mo
+	rm -f debian/tmp/usr/share/locale/*/LC_MESSAGES/calligra_shape_template.mo
 	rm -f debian/tmp/usr/share/locale/*/LC_MESSAGES/flow.mo
 
 override_dh_install:
@@ -52,9 +51,6 @@ override_dh_strip:
 	dh_strip --dbgsym-migration='calligra-dbg (<< 1:2.9.11)'
 
 override_dh_gencontrol:
-ifneq (,$(L10N_PACKAGES_IN_CONTROL))
-	dh_gencontrol $(foreach p,$(L10N_PACKAGES_IN_CONTROL),-p$(p)) -- $(foreach rel,Depends Recommends Suggests Replaces Breaks Provides,-V'l10n:$(rel)=$(L10N_$(rel))')
-endif
-	dh_gencontrol --remaining-packages
+	dh_gencontrol -- -Vcalligra:oldLangs='$(l10npkgs_packages_rels)'
 
 .PHONY: override_dh_auto_test
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..b7639db
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# dummy l10n packages
+calligra source: duplicate-short-description calligra-l10n-bs calligra-l10n-ca calligra-l10n-cavalencia calligra-l10n-cs calligra-l10n-da calligra-l10n-de calligra-l10n-el calligra-l10n-engb calligra-l10n-es calligra-l10n-et calligra-l10n-fi calligra-l10n-fr calligra-l10n-gl calligra-l10n-hu calligra-l10n-it calligra-l10n-ja calligra-l10n-kk calligra-l10n-nb calligra-l10n-nl calligra-l10n-pl calligra-l10n-pt calligra-l10n-ptbr calligra-l10n-ru calligra-l10n-sk calligra-l10n-sv calligra-l10n-tr calligra-l10n-uk calligra-l10n-zhcn calligra-l10n-zhtw

-- 
Calligra suite packaging

More information about the pkg-kde-commits mailing list