diff -u plee-the-bear-0.4.1/debian/changelog plee-the-bear-0.4.1/debian/changelog --- plee-the-bear-0.4.1/debian/changelog +++ plee-the-bear-0.4.1/debian/changelog @@ -1,3 +1,13 @@ +plee-the-bear (0.4.1-3ubuntu1) natty; urgency=low + + * debian/patches/series: + - add two patches, fix_dso_linking.patch and fix_ftbfs_gcc45.patch + to fix ftbfs on natty. (LP: #663485) + * debian/control: + - Update Maintainer field. + + -- Krzysztof Klimonda Wed, 20 Oct 2010 00:52:20 +0200 + plee-the-bear (0.4.1-3build1) lucid; urgency=low * No-change rebuild against libboost 1.40. diff -u plee-the-bear-0.4.1/debian/control plee-the-bear-0.4.1/debian/control --- plee-the-bear-0.4.1/debian/control +++ plee-the-bear-0.4.1/debian/control @@ -1,7 +1,8 @@ Source: plee-the-bear Section: games Priority: extra -Maintainer: Debian Games Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Games Team Uploaders: Julien Jorge , Barry deFreese Build-Depends: quilt, docbook-to-man, debhelper (>= 5.0.51), cmake (>= 2.6), libsdl-mixer1.2-dev (>= 1.2.8), libboost-filesystem-dev (>= 1.33), diff -u plee-the-bear-0.4.1/debian/patches/series plee-the-bear-0.4.1/debian/patches/series --- plee-the-bear-0.4.1/debian/patches/series +++ plee-the-bear-0.4.1/debian/patches/series @@ -5,0 +6,2 @@ +fix_dso_linking.patch +fix_ftbfs_gcc45.patch only in patch2: unchanged: --- plee-the-bear-0.4.1.orig/debian/patches/fix_ftbfs_gcc45.patch +++ plee-the-bear-0.4.1/debian/patches/fix_ftbfs_gcc45.patch @@ -0,0 +1,128 @@ +Description: Update code to compile with gcc 4.5 + gcc 4.5 is more pedantic, complains about returning class' constructor + when previously it interpreted it as returning class' type. +Bug-Debian: http://bugs.debian.org/565062 +Bug-Ubuntu: https://launchpad.net/bugs/663485 +diff -uNr plee-the-bear-0.4.1//bear-engine/core/src/engine/code/compiled_file.cpp /tmp/chroot/home/kklimonda/code/plee-the-bear-0.4.1//bear-engine/core/src/engine/code/compiled_file.cpp +--- plee-the-bear-0.4.1//bear-engine/core/src/engine/code/compiled_file.cpp 2009-06-18 00:25:43.000000000 +0200 ++++ /tmp/chroot/home/kklimonda/code/plee-the-bear-0.4.1//bear-engine/core/src/engine/code/compiled_file.cpp 2010-10-20 00:18:27.114704001 +0200 +@@ -50,7 +50,7 @@ + * \brief Read a string from the file. + * \param s The string to read. + */ +-bear::engine::compiled_file::compiled_file& ++bear::engine::compiled_file& + bear::engine::compiled_file::operator>>( std::string& s ) + { + if (m_text) +@@ -66,7 +66,7 @@ + * \brief Read an long from the file. + * \param i The long to read. + */ +-bear::engine::compiled_file::compiled_file& ++bear::engine::compiled_file& + bear::engine::compiled_file::operator>>( long& i ) + { + if (m_text) +@@ -82,7 +82,7 @@ + * \brief Read an unsigned long from the file. + * \param i The long to read. + */ +-bear::engine::compiled_file::compiled_file& ++bear::engine::compiled_file& + bear::engine::compiled_file::operator>>( unsigned long& i ) + { + if (m_text) +@@ -98,7 +98,7 @@ + * \brief Read an integer from the file. + * \param i The integer to read. + */ +-bear::engine::compiled_file::compiled_file& ++bear::engine::compiled_file& + bear::engine::compiled_file::operator>>( int& i ) + { + if (m_text) +@@ -114,7 +114,7 @@ + * \brief Read an unsigned integer from the file. + * \param i The integer to read. + */ +-bear::engine::compiled_file::compiled_file& ++bear::engine::compiled_file& + bear::engine::compiled_file::operator>>( unsigned int& i ) + { + if (m_text) +@@ -130,7 +130,7 @@ + * \brief Read a real from the file. + * \param r The value to read. + */ +-bear::engine::compiled_file::compiled_file& ++bear::engine::compiled_file& + bear::engine::compiled_file::operator>>( double& r ) + { + if (m_text) +@@ -146,7 +146,7 @@ + * \brief Read a boolean from the file. + * \param b The value to read. + */ +-bear::engine::compiled_file::compiled_file& ++bear::engine::compiled_file& + bear::engine::compiled_file::operator>>( bool& b ) + { + if (m_text) +diff -uNr plee-the-bear-0.4.1//bear-factory/bear-editor/src/bf/code/compiled_file.cpp /tmp/chroot/home/kklimonda/code/plee-the-bear-0.4.1//bear-factory/bear-editor/src/bf/code/compiled_file.cpp +--- plee-the-bear-0.4.1//bear-factory/bear-editor/src/bf/code/compiled_file.cpp 2009-09-02 23:14:42.000000000 +0200 ++++ /tmp/chroot/home/kklimonda/code/plee-the-bear-0.4.1//bear-factory/bear-editor/src/bf/code/compiled_file.cpp 2010-10-20 00:24:10.654704001 +0200 +@@ -44,7 +44,7 @@ + * \brief Write a string in the file. + * \param s The string to write. + */ +-bf::compiled_file::compiled_file& ++bf::compiled_file& + bf::compiled_file::operator<<( const std::string& s ) + { + output_string_as_text(s); +@@ -57,7 +57,7 @@ + * \brief Write an long in the file. + * \param i The long to write. + */ +-bf::compiled_file::compiled_file& ++bf::compiled_file& + bf::compiled_file::operator<<( long i ) + { + output_long_as_text(i); +@@ -70,7 +70,7 @@ + * \brief Write an unsigned long in the file. + * \param i The long to write. + */ +-bf::compiled_file::compiled_file& ++bf::compiled_file& + bf::compiled_file::operator<<( unsigned long i ) + { + output_unsigned_long_as_text(i); +@@ -83,7 +83,7 @@ + * \brief Write an integer in the file. + * \param i The integer to write. + */ +-bf::compiled_file::compiled_file& ++bf::compiled_file& + bf::compiled_file::operator<<( int i ) + { + output_integer_as_text(i); +@@ -96,7 +96,7 @@ + * \brief Write an unsigned integer in the file. + * \param i The integer to write. + */ +-bf::compiled_file::compiled_file& ++bf::compiled_file& + bf::compiled_file::operator<<( unsigned int i ) + { + output_unsigned_integer_as_text(i); +@@ -109,7 +109,7 @@ + * \brief Write a real in the file. + * \param r The value to write. + */ +-bf::compiled_file::compiled_file& ++bf::compiled_file& + bf::compiled_file::operator<<( double r ) + { + output_real_as_text(r); only in patch2: unchanged: --- plee-the-bear-0.4.1.orig/debian/patches/fix_dso_linking.patch +++ plee-the-bear-0.4.1/debian/patches/fix_dso_linking.patch @@ -0,0 +1,50 @@ +Description: Link directly to libboost_system library to fix FTBFS +Forwarded: no +Bug-Ubuntu: https://launchpad.net/bugs/663485 + +diff -uNr plee-the-bear-0.4.1//bear-factory/animation-editor/src/bf/CMakeLists.txt /tmp/chroot/home/kklimonda/code/plee-the-bear-0.4.1//bear-factory/animation-editor/src/bf/CMakeLists.txt +--- plee-the-bear-0.4.1//bear-factory/animation-editor/src/bf/CMakeLists.txt 2009-07-10 23:59:24.000000000 +0200 ++++ /tmp/chroot/home/kklimonda/code/plee-the-bear-0.4.1//bear-factory/animation-editor/src/bf/CMakeLists.txt 2010-10-20 00:33:59.634704001 +0200 +@@ -26,6 +32,7 @@ + ${CLAW_CONFIGURATION_FILE_LIBRARIES} + ${CLAW_LOGGER_LIBRARIES} + ${Boost_FILESYSTEM_LIBRARY} ++ ${Boost_SYSTEM_LIBRARY} + ) + + INSTALL( +diff -uNr plee-the-bear-0.4.1//bear-factory/CMakeLists.txt /tmp/chroot/home/kklimonda/code/plee-the-bear-0.4.1//bear-factory/CMakeLists.txt +--- plee-the-bear-0.4.1//bear-factory/CMakeLists.txt 2009-09-02 23:14:42.000000000 +0200 ++++ /tmp/chroot/home/kklimonda/code/plee-the-bear-0.4.1//bear-factory/CMakeLists.txt 2010-10-20 00:29:57.204704001 +0200 +@@ -68,7 +68,7 @@ + ${Boost_INCLUDE_DIR} + ) + +-FIND_PACKAGE( Boost 1.33 REQUIRED COMPONENTS filesystem ) ++FIND_PACKAGE( Boost 1.33 REQUIRED COMPONENTS filesystem system ) + + IF( NOT Boost_FOUND ) + MESSAGE( FATAL_ERROR +diff -uNr plee-the-bear-0.4.1//bear-factory/desktop/locale/bear-factory/fr_FR.po /tmp/chroot/home/kklimonda/code/plee-the-bear-0.4.1//bear-factory/desktop/locale/bear-factory/fr_FR.po +diff -uNr plee-the-bear-0.4.1//bear-factory/level-editor/src/bf/CMakeLists.txt /tmp/chroot/home/kklimonda/code/plee-the-bear-0.4.1//bear-factory/level-editor/src/bf/CMakeLists.txt +--- plee-the-bear-0.4.1//bear-factory/level-editor/src/bf/CMakeLists.txt 2009-07-10 23:59:24.000000000 +0200 ++++ /tmp/chroot/home/kklimonda/code/plee-the-bear-0.4.1//bear-factory/level-editor/src/bf/CMakeLists.txt 2010-10-20 00:36:13.494704001 +0200 +@@ -76,6 +82,7 @@ + ${CLAW_CONFIGURATION_FILE_LIBRARIES} + ${CLAW_LOGGER_LIBRARIES} + ${Boost_FILESYSTEM_LIBRARY} ++ ${Boost_SYSTEM_LIBRARY} + ) + + INSTALL( +diff -uNr plee-the-bear-0.4.1//bear-factory/model-editor/src/bf/CMakeLists.txt /tmp/chroot/home/kklimonda/code/plee-the-bear-0.4.1//bear-factory/model-editor/src/bf/CMakeLists.txt +--- plee-the-bear-0.4.1//bear-factory/model-editor/src/bf/CMakeLists.txt 2009-08-12 11:38:29.000000000 +0200 ++++ /tmp/chroot/home/kklimonda/code/plee-the-bear-0.4.1//bear-factory/model-editor/src/bf/CMakeLists.txt 2010-10-20 00:37:33.084704002 +0200 +@@ -73,6 +79,7 @@ + ${CLAW_CONFIGURATION_FILE_LIBRARIES} + ${CLAW_LOGGER_LIBRARIES} + ${Boost_FILESYSTEM_LIBRARY} ++ ${Boost_SYSTEM_LIBRARY} + ) + + INSTALL(