[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=bee01c1

The following commit has been merged in the master branch:
commit bee01c12e1716b67662d885a3e4fe2a2e0d83d3f
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jul 22 13:12:41 2017 +0200

    rm instead of not-installed for lyx fonts
---
 debian/changelog     | 2 ++
 debian/not-installed | 2 --
 debian/rules         | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 446bf42..5a6cb47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ calligra (1:2.9.11+dfsg1-1) UNRELEASED; urgency=medium
     in any binary package anyway:
     - pass -DBUILD_app_cstester=OFF -DBUILD_app_devtools=OFF to cmake
     - remove from debian/not-installed files now disappeared
+  * Instead of ignoring the lyx fonts, and listing it in debian/not-installed,
+    remove it from debian/tmp.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jun 2017 20:54:16 +0200
 
diff --git a/debian/not-installed b/debian/not-installed
deleted file mode 100644
index 18b4add..0000000
--- a/debian/not-installed
+++ /dev/null
@@ -1,2 +0,0 @@
-# fonts already in fonts-lyx package
-./usr/share/kde4/apps/formulashape/fonts/cmex10.ttf
diff --git a/debian/rules b/debian/rules
index 50b0793..0533dc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,8 @@ override_dh_auto_install:
 	# Remove mimetypes already provided by shared-mime-info
 	rm -f debian/tmp/usr/share/mime/packages/msooxml-all.xml
 	rm -f debian/tmp/usr/share/mime/packages/x-iwork-keynote-sffkey.xml
+	# Remove fonts already in fonts-lyx package
+	rm -f debian/tmp/usr/share/kde4/apps/formulashape/fonts/cmex10.ttf
 
 override_dh_install:
 	dh_install --list-missing

-- 
Calligra suite packaging