[SCM] Calligra suite packaging branch, experimental, updated. debian/2.6.4-1-13-g63d7193

[Adrien Grellier]

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

The following commit has been merged in the experimental branch:
commit 63d7193102142c054a79f9d9636fb4c0b15e84e0
Author: Adrien Grellier <perso at adrieng.fr>
Date:   Sat Jul 27 17:54:52 2013 +0200

    patch upstream to install fonts in the Debian way
---
 debian/calligra-data.install                    |    5 -----
 debian/changelog                                |    2 ++
 debian/control                                  |   11 +++++++++++
 debian/not-installed                            |    3 ---
 debian/patches/install_fonts_in_debian_way.diff |   15 +++++++++++++++
 debian/patches/series                           |    1 +
 6 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/debian/calligra-data.install b/debian/calligra-data.install
index 5f8c17f..be83098 100644
--- a/debian/calligra-data.install
+++ b/debian/calligra-data.install
@@ -279,12 +279,7 @@ 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 f852922..0b39189 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ calligra (1:2.7.0-0r1.1) 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/
 
 
  -- Adrien Grellier <perso at adrieng.fr>  Sat, 27 Jul 2013 17:54:00 +0200
diff --git a/debian/control b/debian/control
index f380f40..3936da7 100644
--- a/debian/control
+++ b/debian/control
@@ -509,6 +509,17 @@ Description: common shared data for the Calligra Suite
  .
  This package is part of the Calligra Suite.
 
+Package: fonts-calligra
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: calligra-data (<< 1:2.6.4-1~)
+Replaces: calligra-data (<< 1:2.6.4-1~)
+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
 Section: graphics
diff --git a/debian/not-installed b/debian/not-installed
index 13c470c..917bae5 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,6 +1,3 @@
-# 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
new file mode 100644
index 0000000..c51c0e1
--- /dev/null
+++ b/debian/patches/install_fonts_in_debian_way.diff
@@ -0,0 +1,15 @@
+--- 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/)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0fdefa9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+install_fonts_in_debian_way.diff

-- 
Calligra suite packaging