From 76ff64d3c7dd37e1e95db57b388c51ae3f312d2c Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Thu, 16 Oct 2008 10:57:11 +0300 Subject: [PATCH] Fix FindSQL include in the MPEG2 module. Signed-off-by: Modestas Vainius --- debian/changelog | 8 +++++--- debian/patches/FindMPEG2_include_FindSDL_fix.diff | 11 +++++++++++ debian/patches/series | 1 + 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 debian/patches/FindMPEG2_include_FindSDL_fix.diff diff --git a/debian/changelog b/debian/changelog index 5cc957441..6c21f5440 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,10 +3,12 @@ cmake (2.6.2-2~pre1) UNRELEASED; urgency=low * Add Vcs fields. * Add patches: - FindQt4_qt4_lupdate_lrelease.diff - prefer lupdate-qt4 to lupdate and - lrelease-qt4 to lrelease. This is specific to Debian Qt4 - (Closes: #487528). + lrelease-qt4 to lrelease. This is specific to Debian Qt4. + Thanks to Ludovico Cavedon (Closes: #487528). + - FindMPEG2_include_FindSDL_fix.diff - fix FindSQL include in the + MPEG2 module. Thanks to Leopold Palomo Avellaneda (Closes: #500770). - -- Modestas Vainius Thu, 16 Oct 2008 10:46:44 +0300 + -- Modestas Vainius Thu, 16 Oct 2008 11:03:18 +0300 cmake (2.6.2-1) experimental; urgency=low diff --git a/debian/patches/FindMPEG2_include_FindSDL_fix.diff b/debian/patches/FindMPEG2_include_FindSDL_fix.diff new file mode 100644 index 000000000..b78607664 --- /dev/null +++ b/debian/patches/FindMPEG2_include_FindSDL_fix.diff @@ -0,0 +1,11 @@ +--- a/Modules/FindMPEG2.cmake ++++ b/Modules/FindMPEG2.cmake +@@ -34,7 +34,7 @@ + + #some native mpeg2 installations will depend + #on libSDL, if found, add it in. +- INCLUDE( FindSDL.cmake ) ++ INCLUDE( FindSDL ) + IF(SDL_FOUND) + SET( MPEG2_LIBRARIES ${MPEG2_LIBRARIES} ${SDL_LIBRARY}) + ENDIF(SDL_FOUND) diff --git a/debian/patches/series b/debian/patches/series index 5a8c9d81a..eac69f1eb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ relative_path_fixes.diff relative_path_fixes2.diff manpage-generation-fixes.diff FindQt4_qt4_lupdate_lrelease.diff +FindMPEG2_include_FindSDL_fix.diff