[SCM] Calligra suite packaging branch, master, updated. debian/2.7.5-1-91-g223acdf

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 17 07:56:00 UTC 2014


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

The following commit has been merged in the master branch:
commit 0273667b99a04e115f030be509bcec537a9ea4bc
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Jul 15 14:05:19 2014 +0200

    New patch: do_not_install_removed_files
---
 debian/changelog                            |  1 +
 debian/patches/do_not_install_removed_files | 22 ++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6b85951..c30f8f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,7 @@ calligra (1:2.8.5.repack-1) UNRELEASED; urgency=medium
   * New patch: kisjpegtest_call_kisexiv2_initialize
   * New patch: filter_registry_not_a_singleton
   * New patch: channelFlags_logic_change
+  * New patch: do_not_install_removed_files
 
   [ Rene Engelhard ]
   * Add patch to build against the new librevenge-based import libs and update
diff --git a/debian/patches/do_not_install_removed_files b/debian/patches/do_not_install_removed_files
new file mode 100644
index 0000000..560ec15
--- /dev/null
+++ b/debian/patches/do_not_install_removed_files
@@ -0,0 +1,22 @@
+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 94a9140..86d9466 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ kisjpegtest_call_kisexiv2_initialize
 switch-to-librevenge-based-import-libs.patch
 filter_registry_not_a_singleton
 channelFlags_logic_change
+do_not_install_removed_files

-- 
Calligra suite packaging



More information about the pkg-kde-commits mailing list