This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository overgod.
commit 5f483b947359162e1894dc5b987252abd5d7d1bf Author: gregor herrmann <[email protected]> Date: Sat Jul 18 21:31:19 2015 +0200 Import Debian changes 1.0-4.1 overgod (1.0-4.1) unstable; urgency=medium * Non-maintainer upload. * Fix "ftbfs with GCC-5": add patch from Nicholas Luedtke: add "extern" to inline functions. (Closes: #778051) --- debian/changelog | 9 +++++++++ debian/control | 1 - debian/patches/060_gcc5.patch | 33 +++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d8059a4..0ff2487 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +overgod (1.0-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix "ftbfs with GCC-5": add patch from Nicholas Luedtke: + add "extern" to inline functions. + (Closes: #778051) + + -- gregor herrmann <[email protected]> Sat, 18 Jul 2015 21:31:19 +0200 + overgod (1.0-4) unstable; urgency=low * Team upload. diff --git a/debian/control b/debian/control index 40d1281..64a6e03 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Debian Games Team <[email protected]> Uploaders: Barry deFreese <[email protected]> Build-Depends: debhelper (>= 9), liballegro4-dev Standards-Version: 3.9.4 -Homepage: http://sourceforge.net/projects/overgod/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/overgod.git Vcs-Git: git://anonscm.debian.org/pkg-games/overgod.git diff --git a/debian/patches/060_gcc5.patch b/debian/patches/060_gcc5.patch new file mode 100644 index 0000000..a3d56ae --- /dev/null +++ b/debian/patches/060_gcc5.patch @@ -0,0 +1,33 @@ +Description: Fixed GCC5 build issue. + ADD "extern" to xpart and ypart functions +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778051 +Author: Nicholas Luedtke <[email protected]> +Reviewed-by: gregor herrmann <[email protected]> +Last-Update: 2015-07-18 + +--- a/stuff.c ++++ b/stuff.c +@@ -51,7 +51,6 @@ + float cos_table [ANGLE_FULL]; + float sin_table [ANGLE_FULL]; + +-inline int xpart(int angle, int length); + + void init_trig(void) + { +@@ -66,13 +65,13 @@ + + } + +-inline int xpart(int angle, int length) ++extern inline int xpart(int angle, int length) + { + // return (lcos(angle) * length);// / ANGLE_FULL; + return (cos_table [angle & 1023] * length);// / ANGLE_FULL; + } + +-inline int ypart(int angle, int length) ++extern inline int ypart(int angle, int length) + { + return (sin_table [angle & 1023] * length);// / ANGLE_FULL; + } diff --git a/debian/patches/series b/debian/patches/series index 63c419d..c241a17 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 030_security_build_warns.patch 040_fix_array_overrun.patch 050_fix_speaker_text.patch +060_gcc5.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/overgod.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
