diff -u libclaw-1.5.4/debian/changelog libclaw-1.5.4/debian/changelog --- libclaw-1.5.4/debian/changelog +++ libclaw-1.5.4/debian/changelog @@ -1,3 +1,14 @@ +libclaw (1.5.4-3ubuntu1) natty; urgency=low + + * debian/patches/series: + - 01-fix_ftbfs_gcc45.patch: Fix methods to return types and not + constructors. gcc 4.5 is (again) more pedantic about the syntax + (LP: #663560) + * debian/control: + - Update Maintainer field. + + -- Krzysztof Klimonda Wed, 20 Oct 2010 00:10:22 +0200 + libclaw (1.5.4-3) unstable; urgency=low [ Barry deFreese ] diff -u libclaw-1.5.4/debian/control libclaw-1.5.4/debian/control --- libclaw-1.5.4/debian/control +++ libclaw-1.5.4/debian/control @@ -1,7 +1,8 @@ Source: libclaw Section: devel 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), cmake (>= 2.8), libjpeg62-dev (>= 6b-11), libpng12-dev (>= 1.2.8), doxygen (>= 1.5) diff -u libclaw-1.5.4/debian/patches/series libclaw-1.5.4/debian/patches/series --- libclaw-1.5.4/debian/patches/series +++ libclaw-1.5.4/debian/patches/series @@ -1,0 +2 @@ +01-fix_ftbfs_gcc45.patch only in patch2: unchanged: --- libclaw-1.5.4.orig/debian/patches/01-fix_ftbfs_gcc45.patch +++ libclaw-1.5.4/debian/patches/01-fix_ftbfs_gcc45.patch @@ -0,0 +1,54 @@ +diff -uNr a/claw/code/basic_socket.cpp b/claw/code/basic_socket.cpp +--- a/claw/code/basic_socket.cpp 2010-10-19 23:52:03.563241000 +0200 ++++ b/claw/code/basic_socket.cpp 2010-10-19 23:46:11.504704001 +0200 +@@ -45,7 +45,7 @@ + * \brief Open the socket. + * \return this is everything works fine, NULL otherwise. + */ +-claw::net::basic_socket::basic_socket* claw::net::basic_socket::open() ++claw::net::basic_socket* claw::net::basic_socket::open() + { + basic_socket* result = NULL; + +@@ -62,7 +62,7 @@ + * \brief Close the socket. + * \return this if everything works fine, NULL otherwise. + */ +-claw::net::basic_socket::basic_socket* claw::net::basic_socket::close() ++claw::net::basic_socket* claw::net::basic_socket::close() + { + basic_socket* result = this; + +diff -uNr a/claw/code/socket_server.cpp b/claw/code/socket_server.cpp +--- a/claw/code/socket_server.cpp 2010-10-19 23:52:03.563241000 +0200 ++++ b/claw/code/socket_server.cpp 2010-10-19 23:48:48.844704002 +0200 +@@ -58,7 +58,7 @@ + * \param queue_size The size of the waiting queue for incoming connections. + * \return this if everything works fine, NULL otherwise. + */ +-claw::net::socket_server::socket_server* ++claw::net::socket_server* + claw::net::socket_server::open( int port, unsigned int queue_size ) + { + socket_server* result = NULL; +@@ -78,7 +78,7 @@ + /** + * \brief Close the socket. + */ +-claw::net::socket_server::socket_server* claw::net::socket_server::close() ++claw::net::socket_server* claw::net::socket_server::close() + { + if ( basic_socket::close() ) + return this; +diff -uNr a/claw/impl/logger.tpp b/claw/impl/logger.tpp +--- a/claw/impl/logger.tpp 2010-10-19 23:52:03.563241000 +0200 ++++ b/claw/impl/logger.tpp 2010-10-19 23:43:44.344704001 +0200 +@@ -36,7 +36,7 @@ + * \remark T must support operator<<(std::ostream&, const T&); + */ + template +-claw::log_system::log_system& claw::log_system::operator<<( const T& t ) ++claw::log_system& claw::log_system::operator<<( const T& t ) + { + if (m_message_level <= m_log_level) + {