tags 667138 + pending thanks
diff -Nru codeblocks-10.05/debian/changelog codeblocks-10.05/debian/changelog --- codeblocks-10.05/debian/changelog 2011-03-08 10:13:16.000000000 +0100 +++ codeblocks-10.05/debian/changelog 2012-05-29 08:04:06.000000000 +0200 @@ -1,3 +1,11 @@ +codeblocks (10.05-2.1) unstable; urgency=low + + * Non maintainer upload. + * Drop build dependency on libstdc++6-4.5-dev | libstdc++6-4.4-dev. + * Fix build failures with GCC 4.7, build with -fpermissive. Closes: #667138. + + -- Matthias Klose <d...@debian.org> Tue, 29 May 2012 05:03:19 +0000 + codeblocks (10.05-2) unstable; urgency=low * Added Vcs-* fields to debian/control diff -Nru codeblocks-10.05/debian/control codeblocks-10.05/debian/control --- codeblocks-10.05/debian/control 2011-02-28 09:13:34.000000000 +0100 +++ codeblocks-10.05/debian/control 2012-05-29 07:03:57.000000000 +0200 @@ -11,7 +11,6 @@ , libbz2-dev , zlib1g-dev , libgtk2.0-dev - , libstdc++6-4.5-dev | libstdc++6-4.4-dev Standards-Version: 3.9.1 Homepage: http://codeblocks.org Vcs-Git: git://git.debian.org/collab-maint/codeblocks.git diff -Nru codeblocks-10.05/debian/patches/ftbfs-gcc-4.7.diff codeblocks-10.05/debian/patches/ftbfs-gcc-4.7.diff --- codeblocks-10.05/debian/patches/ftbfs-gcc-4.7.diff 1970-01-01 01:00:00.000000000 +0100 +++ codeblocks-10.05/debian/patches/ftbfs-gcc-4.7.diff 2012-05-29 08:03:43.000000000 +0200 @@ -0,0 +1,34 @@ +Index: codeblocks-10.05/src/plugins/contrib/help_plugin/defs.h +=================================================================== +--- codeblocks-10.05.orig/src/plugins/contrib/help_plugin/defs.h 2010-05-22 10:29:35.000000000 +0000 ++++ codeblocks-10.05/src/plugins/contrib/help_plugin/defs.h 2012-05-29 05:18:08.674124530 +0000 +@@ -289,7 +289,7 @@ + + if (i.second == false && overwrite) + { +- find(k)->second = t; ++ this->find(k)->second = t; + } + + return i.first; +@@ -297,7 +297,7 @@ + + int remove(const Key &k) + { +- return erase(k); ++ return this->erase(k); + } + }; + +Index: codeblocks-10.05/src/plugins/contrib/help_plugin/man2html.cpp +=================================================================== +--- codeblocks-10.05.orig/src/plugins/contrib/help_plugin/man2html.cpp 2010-05-22 10:29:35.000000000 +0000 ++++ codeblocks-10.05/src/plugins/contrib/help_plugin/man2html.cpp 2012-05-29 05:15:59.186120279 +0000 +@@ -150,6 +150,7 @@ + # include <kdeversion.h> + # define BYTEARRAY(x) x + #endif ++#include <unistd.h> + + #ifdef __MINGW32__ + #include <io.h> diff -Nru codeblocks-10.05/debian/patches/series codeblocks-10.05/debian/patches/series --- codeblocks-10.05/debian/patches/series 2011-02-23 19:05:15.000000000 +0100 +++ codeblocks-10.05/debian/patches/series 2012-05-29 07:13:27.000000000 +0200 @@ -2,3 +2,4 @@ 02-no_Makefiles_in_debian_dir.patch 03-fix_libX11_linkage.patch 04-add_support_for_sh4.patch +ftbfs-gcc-4.7.diff diff -Nru codeblocks-10.05/debian/rules codeblocks-10.05/debian/rules --- codeblocks-10.05/debian/rules 2011-01-19 23:14:57.000000000 +0100 +++ codeblocks-10.05/debian/rules 2012-05-29 07:05:23.000000000 +0200 @@ -15,7 +15,7 @@ --parallel override_dh_auto_configure: - dh_auto_configure -- --with-contrib-plugins=all + CXXFLAGS="$(dpkg-buildflags --get CXXFLAGS) -fpermissive" dh_auto_configure -- --with-contrib-plugins=all override_dh_strip: dh_strip -k
