From 444809607c3a05c1b690a644cd147d1e9c51762a Mon Sep 17 00:00:00 2001 From: Dmitrijs Ledkovs Date: Thu, 7 Jun 2012 07:49:56 +0100 Subject: Imported Debian patch 1.6.2+dfsg-5 --- debian/changelog | 6 ++++++ debian/patches/fix-ftbfs-icu.patch | 17 +++++++++++++++++ debian/patches/series | 1 + 3 files changed, 24 insertions(+) create mode 100644 debian/patches/fix-ftbfs-icu.patch diff --git a/debian/changelog b/debian/changelog index ab16217..a5e306a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sword (1.6.2+dfsg-5) unstable; urgency=low + + * Fix FTBFS due to icu changes (Closes: #676097). + + -- Dmitrijs Ledkovs Thu, 07 Jun 2012 07:49:56 +0100 + sword (1.6.2+dfsg-4) unstable; urgency=low [ Matthias Klose ] diff --git a/debian/patches/fix-ftbfs-icu.patch b/debian/patches/fix-ftbfs-icu.patch new file mode 100644 index 0000000..f4f1438 --- /dev/null +++ b/debian/patches/fix-ftbfs-icu.patch @@ -0,0 +1,17 @@ +Description: Fix FTBFS by requesting libraries only from icu-config +Author: Dmitrijs Ledkovs , Daniel Glassey +Bug-Debian: http://bugs.debian.org/676097 + +Index: b/cmake/FindICU.cmake +=================================================================== +--- a/cmake/FindICU.cmake ++++ b/cmake/FindICU.cmake +@@ -36,7 +36,7 @@ + string(REPLACE "-I" "" ICU_INCLUDE_DIR ${ICU_INCLUDE_DIR}) + + # Try to get the Libraries we need +- execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags" ++ execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags-libsonly" + OUTPUT_VARIABLE ICU_LIBRARY_RAW + OUTPUT_STRIP_TRAILING_WHITESPACE + ) diff --git a/debian/patches/series b/debian/patches/series index 55eb22f..a3afc62 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ cmake_backport.patch icu_in_soname.patch fix-ftbfs-gcc4.7.diff +fix-ftbfs-icu.patch -- cgit v1.2.3