[SCM] Calligra suite packaging branch, master, updated. debian/2.6.4-1-33-g69e69c0

[Adrien Grellier]

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

The following commit has been merged in the master branch:
commit bc3a8ee8ecad100c04598459fea9db3555ad9198
Author: Adrien Grellier <perso at adrieng.fr>
Date:   Thu Aug 15 16:36:50 2013 +0200

    Backed out changeset: 2d9ca22adf66 (split the fonts package)
    
    It may be not a good idea to make public the private fonts provided by calligra
---
 debian/calligra-data.install                    |    5 +++++
 debian/changelog                                |    2 --
 debian/control                                  |   11 -----------
 debian/not-installed                            |    3 +++
 debian/patches/install_fonts_in_debian_way.diff |   16 ----------------
 5 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/debian/calligra-data.install b/debian/calligra-data.install
index 658ad7c..8a4e16b 100644
--- a/debian/calligra-data.install
+++ b/debian/calligra-data.install
@@ -279,7 +279,12 @@ usr/share/kde4/apps/calligra/icons/zoom_out_cursor.png
 usr/share/kde4/apps/calligra/palettes/
 usr/share/kde4/apps/calligra/styles/markers.xml
 usr/share/kde4/apps/calligra/thesaurus/thesaurus.txt
+usr/share/kde4/apps/formulashape/fonts/Arev.ttf
+usr/share/kde4/apps/formulashape/fonts/ArevBI.ttf
+usr/share/kde4/apps/formulashape/fonts/ArevBd.ttf
+usr/share/kde4/apps/formulashape/fonts/ArevIt.ttf
 usr/share/kde4/apps/koproperty/icons/hicolor/16x16/actions/button_no.png
+usr/share/kde4/apps/musicshape/fonts/Emmentaler-14.ttf
 usr/share/kde4/services/artistictextshape.desktop
 usr/share/kde4/services/autocorrect.desktop
 usr/share/kde4/services/basicflakesplugin.desktop
diff --git a/debian/changelog b/debian/changelog
index abf1864..81bf7af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,6 @@ calligra (1:2.7.1-0r1) UNRELEASED; urgency=low
     extra packages)
   * update to my new official email address
   * split kexi to kexi-data for arch-indep files
-  * split the fonts in a separated package, and follow the Debian Policy
-    fonts are now installed in /usr/share/fonts/truetype/calligra/
   * add Multi-Arch: foreign tag for all the packages with Arch:all
     (lintian: font-package-not-multi-arch-foreign)
   * patch to add keywords to desktop files
diff --git a/debian/control b/debian/control
index b149939..006c2da 100644
--- a/debian/control
+++ b/debian/control
@@ -515,19 +515,8 @@ Description: common shared data for the Calligra Suite
  .
  This package is part of the Calligra Suite.
 
-Package: fonts-calligra
 Section: fonts
-Architecture: all
-Depends: ${misc:Depends}
-Breaks: calligra-data (<< 1:2.6.4-1~)
-Replaces: calligra-data (<< 1:2.6.4-1~)
 Multi-Arch: foreign
-Description: fonts for the Calligra Office Suite
- This package provide the fonts for the Calligra Office Suite:
-  - Arev, ArevBI, ArevBd and ArevIT
-  - Emmentaler
- .
- This package is part of the Calligra Suite.
 
 Package: okular-backend-odp
 Architecture: any
diff --git a/debian/not-installed b/debian/not-installed
index 917bae5..13c470c 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,3 +1,6 @@
+# fonts already in fonts-lyx package
+./usr/share/kde4/apps/formulashape/fonts/cmex10.ttf
+
 # add dependency on karbon, words and sheets to calligra-libs; too generic
 ./usr/bin/cstester
 ./usr/bin/cstrunner
diff --git a/debian/patches/install_fonts_in_debian_way.diff b/debian/patches/install_fonts_in_debian_way.diff
deleted file mode 100644
index b035b33..0000000
--- a/debian/patches/install_fonts_in_debian_way.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-this patch installs the calligra fonts in the Debian way, in /usr/share/fonts/calligra
---- a/plugins/formulashape/fonts/CMakeLists.txt
-+++ b/plugins/formulashape/fonts/CMakeLists.txt
-@@ -1,5 +1,6 @@
- 
--install( FILES  cmex10.ttf Arev.ttf ArevIt.ttf ArevBd.ttf ArevBI.ttf  DESTINATION ${DATA_INSTALL_DIR}/formulashape/fonts )
-+# Debian: cmex10.ttf is already packaged by fonts-lyx
-+install( FILES  Arev.ttf ArevIt.ttf ArevBd.ttf ArevBI.ttf  DESTINATION share/fonts/calligra/ )
- 
- 
- 
---- a/plugins/musicshape/fonts/CMakeLists.txt
-+++ b/plugins/musicshape/fonts/CMakeLists.txt
-@@ -1 +1 @@
--install( FILES Emmentaler-14.ttf  DESTINATION ${DATA_INSTALL_DIR}/musicshape/fonts)
-+install( FILES Emmentaler-14.ttf  DESTINATION share/fonts/calligra/)

-- 
Calligra suite packaging