lp:~z-man/armagetronad/0.4-build-unified
- Get this branch:
- bzr branch lp:~z-man/armagetronad/0.4-build-unified
Branch merges
Branch information
Recent revisions
- 504. By z-man
-
Merging branch 0.2.8 from revision 10838 to 10868:
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r10868 | z-man | 2016-11-12 22:33:19 +0100 (Sa, 12 Nov 2016) | 16 linesMerging branch 0.2.8.3 from revision 10863 to 10867:
------------ ------- ------- ------- ------- ------- ------- ------- ------- ----
r10866 | z-man | 2016-11-08 23:04:58 +0100 (Di, 08 Nov 2016) | 4 linesTurning the undefined crashy functions into functions that should work
fine even on gcc6 by tricking it to actually perform checks on the
this pointer. Just as an extra safety net.
(Not merged. We'll be fine here.)-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ----
r10865 | z-man | 2016-11-08 23:03:32 +0100 (Di, 08 Nov 2016) | 2 linesFormatting.
-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ---- ------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r10864 | z-man | 2016-11-08 22:44:15 +0100 (Di, 08 Nov 2016) | 55 linesMerging branch 0.2.8.3 from revision 10852 to 10863:
------------ ------- ------- ------- ------- ------- ------- ------- ------- ----
r10862 | z-man | 2016-10-26 00:37:03 +0200 (Mi, 26 Okt 2016) | 2 linesAdding fromunix.sh from 0.2.8, technically a merge. (not merged)
-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ----
r10861 | z-man | 2016-10-25 00:19:46 +0200 (Di, 25 Okt 2016) | 2 linesMore NULL checks and assertions. None of them were problematic.
-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ----
r10860 | z-man | 2016-10-25 00:19:18 +0200 (Di, 25 Okt 2016) | 5 linesProper NULL checks for list sorting, the ones in tLinkedList just for
safety (can't really be NULL at that point, but careless code changes may
change that). The only problematic case would be sorting an empty
list, which does not happen with the current (hardcoded) data.-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ----
r10859 | z-man | 2016-10-25 00:15:41 +0200 (Di, 25 Okt 2016) | 2 linesRemoved unused function.
-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ----
r10858 | z-man | 2016-10-25 00:14:57 +0200 (Di, 25 Okt 2016) | 3 linesIn the spirit of proper testing, make calls that crash a gcc 6 build
crash for everyone. Will probably revert for full release.-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ----
r10857 | z-man | 2016-10-25 00:13:28 +0200 (Di, 25 Okt 2016) | 5 linesFixed two misleading indentations, one of them was indeed hiding
faulty logic. The effect was just stuff written to a non-open file
stream in case the file could not be opened for writing, so probably
harmless.-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ----
r10856 | z-man | 2016-10-25 00:08:57 +0200 (Di, 25 Okt 2016) | 2 linesProper fopen return value check. Sort of merged from 0.2.8.
-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ----
r10855 | z-man | 2016-10-25 00:06:48 +0200 (Di, 25 Okt 2016) | 2 linesAdded tASSERT_THIS for compiler warning free assertions that the this pointer is valid.
-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ----
r10854 | z-man | 2016-10-25 00:01:43 +0200 (Di, 25 Okt 2016) | 2 linesProper NULL pointer checks instead of this checks here, too.
-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ---- ------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r10863 | bazaaarmagetron | 2016-11-04 20:10:24 +0100 (Fr, 04 Nov 2016) | 2 linesManuel Moos: Adding new automake generated link to ignore list.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r10853 | z-man | 2016-10-25 00:00:16 +0200 (Di, 25 Okt 2016) | 32 linesMerging branch 0.2.8.3 from revision 10845 to 10852:
------------ ------- ------- ------- ------- ------- ------- ------- ------- ----
r10852 | z-man | 2016-10-24 22:57:02 +0200 (Mo, 24 Okt 2016) | 2 linesUpdated release notes for upcoming 0.2.8.3.4 (not merged)
-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ----
r10851 | z-man | 2016-10-24 02:05:22 +0200 (Mo, 24 Okt 2016) | 2 linesAll builds from this branch are now probably BETA. (not merged)
-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ----
r10850 | z-man | 2016-10-24 02:04:52 +0200 (Mo, 24 Okt 2016) | 1 lineMerging format change from 0.2.8, don't mess with directories during rebranding sed run
------------ ------- ------- ------- ------- ------- ------- ------- ------- ----
r10848 | z-man | 2016-10-24 00:53:31 +0200 (Mo, 24 Okt 2016) | 3 linesMarked memory manager as currently broken (gcc 6 compatibility
problems) and disabled its activation for debug builds. (not merged, hope we can fix it here)-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ----
r10847 | z-man | 2016-10-24 00:29:51 +0200 (Mo, 24 Okt 2016) | 1 lineUpdating NEWS
------------ ------- ------- ------- ------- ------- ------- ------- ------- ----
r10846 | z-man | 2016-10-24 00:20:10 +0200 (Mo, 24 Okt 2016) | 2 linesAnother gcc-6 related crashfix due to undefined behavior.
-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ---- ------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r10849 | z-man | 2016-10-24 00:54:36 +0200 (Mo, 24 Okt 2016) | 49 linesMerging branch 0.2.8.3 from revision 10723 to 10845:
------------ ------- ------- ------- ------- ------- ------- ------- ------- ----
r10845 | z-man | 2016-10-24 00:13:56 +0200 (Mo, 24 Okt 2016) | 1 lineMerging gcc-6 fixes from 0.2.8
------------ ------- ------- ------- ------- ------- ------- ------- ------- ----
r10844 | z-man | 2016-10-23 22:41:05 +0200 (So, 23 Okt 2016) | 1 lineMerging ubuntu changes
------------ ------- ------- ------- ------- ------- ------- ------- ------- ----
r10843 | z-man | 2016-10-23 22:36:09 +0200 (So, 23 Okt 2016) | 1 lineMerging ubuntu build changes from 0.2.8, part 4
------------ ------- ------- ------- ------- ------- ------- ------- ------- ----
r10842 | z-man | 2016-10-23 22:35:33 +0200 (So, 23 Okt 2016) | 1 lineMerging ubuntu build changes from 0.2.8, part 3
------------ ------- ------- ------- ------- ------- ------- ------- ------- ----
r10841 | z-man | 2016-10-23 22:32:32 +0200 (So, 23 Okt 2016) | 1 lineMerging ubuntu build changes from 0.2.8, part 2
------------ ------- ------- ------- ------- ------- ------- ------- ------- ----
r10840 | z-man | 2016-10-23 22:31:54 +0200 (So, 23 Okt 2016) | 1 lineMerging ubuntu build changes from 0.2.8, part 1
------------ ------- ------- ------- ------- ------- ------- ------- ------- ----
r10740 | z-man | 2015-02-26 20:28:18 +0100 (Do, 26 Feb 2015) | 2 linesUpdating NEWS and releasenotes.txt for 0.2.8.3.3
-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ----
r10736 | z-man | 2015-02-16 06:55:52 +0100 (Mo, 16 Feb 2015) | 4 linesMerge from 0.2.8:
png_sig_cmp is in both libpng12 and libpng14, where as png_check_sig is only libpng12 --ssuominen-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ----
r10730 | z-man | 2015-02-04 23:19:32 +0100 (Mi, 04 Feb 2015) | 2 linesRadical solution: disabling generation of uninstall script.
-----
------- ------- ------- ------- ------- ------- ------- ------- ------- ----
r10725 | z-man | 2015-02-01 10:49:46 +0100 (So, 01 Feb 2015) | 1 lineRemoving pointless saucy upload
------------ ------- ------- ------- ------- ------- ------- ------- ------- ----
Most not really merged, they were already here.------
------- ------- ------- ------- ------- ------- ------- ------- ------- --- - 502. By Manuel Moos
-
Ubuntu 16.10 no longer has libpng12; Trying to solve it the somewhat
sensible way by depending on libpng instead. - 499. By Manuel Moos
-
Removing missing sdl2 dependencies from precise, should still build with sdl1.2.
- 498. By Manuel Moos
-
Picking last known working ubuntu package branch. Still messed up, I
can't pull from it or clone it. Got my copy from the build slave
instead. - 497. By z-man
-
Merging branch 0.2.8 from revision 10817 to 10822:
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r10822 | bazaaarmagetron | 2016-10-05 02:11:44 +0200 (Mi, 05 Okt 2016) | 2 linesManuel Moos: Also add yakkety.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r10821 | bazaaarmagetron | 2016-10-04 23:53:28 +0200 (Di, 04 Okt 2016) | 2 linesManuel Moos: These ubuntu releases seem to be still supported by the ppa build system.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r10820 | bazaaarmagetron | 2016-10-04 23:53:21 +0200 (Di, 04 Okt 2016) | 2 linesManuel Moos: Eek, typo.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r10819 | bazaaarmagetron | 2016-10-04 23:53:10 +0200 (Di, 04 Okt 2016) | 2 linesManuel Moos: Updated ubuntu release list, will sort out the ones no longer supported by the PPA builders later.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- --- - 496. By Manuel Moos
-
ADDING sdl2 libraries. SDL1.2 libraries stay for now, they are needed
for current 0.4 builds.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)