[SCM] Calligra suite packaging branch, experimental, updated. debian/2.9.11+dfsg1-1-24-g292f586

[Pino Toscano]

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

The following commit has been merged in the experimental branch:
commit bb566776833c6a88dab0602ea1ebb1d17b2c7f54
Author: Pino Toscano <pino at debian.org>
Date:   Sun Aug 20 14:19:04 2017 +0200

    adapt override_dh_auto_install
---
 debian/changelog | 4 ++++
 debian/rules     | 9 ++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 85a6f15..904309b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,10 @@ calligra (1:3.0.1+dfsg-0r1) UNRELEASED; urgency=medium
       get also what upstream considers unmaintained; maybe this should be
       revised in the future
   * Update/rewrite the install files.
+  * Adapt the job in override_dh_auto_install:
+    - stop removing headers and cmake files, no more installed
+    - adapt path (even if not installed currently) to the font (cmex10.ttf)
+      to remove
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 19 Aug 2017 15:51:55 +0200
 
diff --git a/debian/rules b/debian/rules
index c7d4f94..5dec7ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,18 +16,13 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
 	dh_auto_install
-	# Remove development stuff:
-	# - symlinks of libraries
+	# Remove development symlinks of libraries
 	find debian/tmp/usr/lib -name '*.so' -type l -print -delete
-	# - headers
-	rm -rfv debian/tmp/usr/include
-	# - cmake configuration files
-	rm -rfv debian/tmp/usr/share/kde4/apps/cmake
 	# 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
+	rm -f debian/tmp/usr/share/calligra_shape_formula/fonts/cmex10.ttf
 
 override_dh_install:
 	dh_install --list-missing

-- 
Calligra suite packaging