Control: tags -1 -fixed-upstream +patch Hi,
On Tue, 11 Feb 2014 11:49:45 +0000 "Manuel A. Fernandez Montecelo" <manuel.montez...@gmail.com> wrote: > There already exists src:ogre-1.9, up to date w.r.t. upstream, and > present in unstable for a few months. Oops, it's my mistake, investigation is not enough. > src:ogre-1.8 should be fixed if possible anyway, there are rdepends > which didn't move onto 1.9 (and probably not all of their upstreams > are ready). Okay, then I've created patch for it, please review and consider to apply it :) -- Regards, Hideki Yamane henrich @ debian.or.jp/org http://wiki.debian.org/HidekiYamane
diff -Nru ogre-1.8-1.8.0+dfsg1/debian/changelog ogre-1.8-1.8.0+dfsg1/debian/changelog --- ogre-1.8-1.8.0+dfsg1/debian/changelog 2013-09-08 03:24:10.000000000 +0900 +++ ogre-1.8-1.8.0+dfsg1/debian/changelog 2014-02-11 21:22:38.000000000 +0900 @@ -1,3 +1,12 @@ +ogre-1.8 (1.8.0+dfsg1-6.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches + - add search_freetype2.5.0_or_above.patch to avoid FTBFS with newer + freetype (Closes: #735785) + + -- Hideki Yamane <henr...@debian.org> Tue, 11 Feb 2014 21:22:37 +0900 + ogre-1.8 (1.8.0+dfsg1-6) unstable; urgency=low * Document some files missing in debian/copyright diff -Nru ogre-1.8-1.8.0+dfsg1/debian/patches/search_freetype2.5.0_or_above.patch ogre-1.8-1.8.0+dfsg1/debian/patches/search_freetype2.5.0_or_above.patch --- ogre-1.8-1.8.0+dfsg1/debian/patches/search_freetype2.5.0_or_above.patch 1970-01-01 09:00:00.000000000 +0900 +++ ogre-1.8-1.8.0+dfsg1/debian/patches/search_freetype2.5.0_or_above.patch 2014-02-11 21:26:16.000000000 +0900 @@ -0,0 +1,26 @@ +Description: also checks newer freetype version +Bug-Debian: http://bugs.debian.org/735785 +Last-Update: 2014-02-10 + +Index: ogre-1.8-1.8.0+dfsg1/CMake/Packages/FindFreetype.cmake +=================================================================== +--- ogre-1.8-1.8.0+dfsg1.orig/CMake/Packages/FindFreetype.cmake 2014-02-11 21:21:00.000000000 +0900 ++++ ogre-1.8-1.8.0+dfsg1/CMake/Packages/FindFreetype.cmake 2014-02-11 21:26:14.998906335 +0900 +@@ -31,7 +31,7 @@ + FREETYPE_INCLUDE_DIR + ) + +-set(FREETYPE_LIBRARY_NAMES freetype249 freetype248 freetype246 freetype2311 freetype239 freetype238 freetype235 freetype219 freetype) ++set(FREETYPE_LIBRARY_NAMES freetype251 freetype2501 freetype250 freetype249 freetype248 freetype246 freetype2311 freetype239 freetype238 freetype235 freetype219 freetype) + get_debug_names(FREETYPE_LIBRARY_NAMES) + + use_pkgconfig(FREETYPE_PKGC freetype2) +@@ -43,7 +43,7 @@ + findpkg_framework(FREETYPE) + message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") + +-find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) ++find_path(FREETYPE_INCLUDE_DIR NAMES freetype2/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) + find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS}) + + if (SYMBIAN) diff -Nru ogre-1.8-1.8.0+dfsg1/debian/patches/series ogre-1.8-1.8.0+dfsg1/debian/patches/series --- ogre-1.8-1.8.0+dfsg1/debian/patches/series 2013-09-04 05:42:45.000000000 +0900 +++ ogre-1.8-1.8.0+dfsg1/debian/patches/series 2014-02-11 21:21:00.000000000 +0900 @@ -1,2 +1,3 @@ boost.patch remove-alignment-hack.patch +search_freetype2.5.0_or_above.patch
