diff --git a/debian/changelog b/debian/changelog index 73481bda0..576e20216 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ cmake (2.8.12-0r2) UNRELEASED; urgency=low (Closes: #710573) * Remove the whole emacs compiled directory rather than just .elc file. Thanks to Kevin Ryde. (Closes: #710572) + * Fix a code typo in PHP4 (patch FindPHP4_fix_typo.diff). Thanks to Mathieu + Malaterre for the patch. (Closes: #722475) -- Modestas Vainius Sun, 03 Nov 2013 12:28:06 +0200 diff --git a/debian/patches/FindPHP4_fix_typo.diff b/debian/patches/FindPHP4_fix_typo.diff new file mode 100644 index 000000000..e1d6c035e --- /dev/null +++ b/debian/patches/FindPHP4_fix_typo.diff @@ -0,0 +1,21 @@ +From: Mathieu Malaterre +Subject: Typo in PHP find module +Forwarded: yes +Origin: other +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722475 +Reviewed-by: Modestas Vainius + +There is a missing CACHE keyword which make the set() command produce improper +result in FindPHP4 + +--- a/Modules/FindPHP4.cmake ++++ b/Modules/FindPHP4.cmake +@@ -40,7 +40,7 @@ if(PHP4_FOUND_INCLUDE_PATH) + foreach(php4_path Zend main TSRM) + set(php4_paths ${php4_paths} "${PHP4_FOUND_INCLUDE_PATH}/${php4_path}") + endforeach() +- set(PHP4_INCLUDE_PATH "${php4_paths}" INTERNAL "PHP4 include paths") ++ set(PHP4_INCLUDE_PATH "${php4_paths}" CACHE INTERNAL "PHP4 include paths") + endif() + + find_program(PHP4_EXECUTABLE NAMES php4 php ) diff --git a/debian/patches/series b/debian/patches/series index 859daf873..9aede6a00 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ multiarch_findgtk2_fix.diff install_to_multiarch_libdir_on_kfreebsd_hurd.diff multiarch-python-include-dirs.diff qt_import_dir_variable.diff +FindPHP4_fix_typo.diff