[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-98-g26c5365

Pino Toscano pino at moszumanska.debian.org
Sun Sep 11 18:55:14 UTC 2016


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

The following commit has been merged in the master branch:
commit 26c536590004146c92b33a1186283c8d777cb55d
Author: Pino Toscano <pino at debian.org>
Date:   Sun Sep 11 20:55:08 2016 +0200

    cmake-do_not_install_removed_files.patch: drop, obsolete
---
 debian/changelog                                   |  2 ++
 .../cmake-do_not_install_removed_files.patch       | 22 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3c2865..7fd9f1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -105,6 +105,8 @@ calligra (1:2.9.11+dfsg-1) UNRELEASED; urgency=low
   * Update lintian overrides.
   * Replace all the khelpcenter4 suggests with khelpcenter.
   * Replace the libqca2-plugin-ossl recommend with libqca2-plugins.
+  * Remove patch cmake-do_not_install_removed_files.patch, already not
+    applied anymore.
 
   [ Maximiliano Curia ]
   * Update homepage links. (Closes: #762305) Thanks to Julian Gilbey
diff --git a/debian/patches/cmake-do_not_install_removed_files.patch b/debian/patches/cmake-do_not_install_removed_files.patch
deleted file mode 100644
index 560ec15..0000000
--- a/debian/patches/cmake-do_not_install_removed_files.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: calligra/plugins/colorengines/lcms2/colorprofiles/data/CMakeLists.txt
-===================================================================
---- calligra.orig/plugins/colorengines/lcms2/colorprofiles/data/CMakeLists.txt	2014-07-15 15:01:36.007724217 +0200
-+++ calligra/plugins/colorengines/lcms2/colorprofiles/data/CMakeLists.txt	2014-07-15 15:01:36.003724384 +0200
-@@ -1,4 +0,0 @@
--install(FILES
--    CMY.icm 
--    fogra27l.icm
--    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/color/icc/pigment)
-Index: calligra/plugins/colorengines/lcms2/CMakeLists.txt
-===================================================================
---- calligra.orig/plugins/colorengines/lcms2/CMakeLists.txt	2014-07-15 15:01:32.683863328 +0200
-+++ calligra/plugins/colorengines/lcms2/CMakeLists.txt	2014-07-15 15:02:55.052417218 +0200
-@@ -5,8 +5,6 @@
- 	add_subdirectory(tests)
- endif(!WIN32)
- 
--add_subdirectory(colorprofiles)
--
- include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
- 
- include_directories( 
diff --git a/debian/patches/series b/debian/patches/series
index abbb889..c1e409e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ add_keywords_to_desktop_files.patch
 cmake-xbase64.patch
 libwps-0.4.patch
 no-planconvert-jar.patch
-#cmake-do_not_install_removed_files.patch

-- 
Calligra suite packaging



More information about the pkg-kde-commits mailing list