diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/find-clucene-config.h.diff | 13 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 21 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index fcd3654..1aeca34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +bibletime (2.9.1-3) unstable; urgency=low + + * fix FindCLucene.cmake to look in /usr/lib/{CMAKE_LIBRARY_ARCHITECTURE} + to find clucene-config.h with multiarched clucene (Closes: #718374) + + -- Rene Engelhard <rene@debian.org> Tue, 30 Jul 2013 19:23:42 +0000 + bibletime (2.9.1-2) unstable; urgency=low * Disable -Werror to work-around FTBFS with gcc-4.7 (Closes: #667113) diff --git a/debian/patches/find-clucene-config.h.diff b/debian/patches/find-clucene-config.h.diff new file mode 100644 index 0000000..566172e --- /dev/null +++ b/debian/patches/find-clucene-config.h.diff @@ -0,0 +1,13 @@ +Description: find clucene-config.h in clucene 2.x' multiarch dir +Author: Rene Engelhard <rene@debian.org> + +--- bibletime-2.9.1.orig/cmake/FindCLucene.cmake ++++ bibletime-2.9.1/cmake/FindCLucene.cmake +@@ -55,6 +55,7 @@ SET(TRIAL_INCLUDE_PATHS + ${CMAKE_INSTALL_PREFIX}/include + /usr/local/include + /usr/include ++ /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} + /sw/include + /usr/pkg/include + ${WIN_CLUCENE_INCLUDE_PATH} diff --git a/debian/patches/series b/debian/patches/series index fd217ed..3b5fb5a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ gcc4.7-ftbfs.patch +find-clucene-config.h.diff |