[Python-modules-commits] [pygame] 02/03: Merge tag 'upstream/1.9.3'

Dominik George natureshadow-guest at moszumanska.debian.org
Thu Jan 26 00:37:35 UTC 2017


This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository pygame.

commit 942c183dd17135d6db8ed038d6c2f6768192aeb9
Merge: 71706d3 e222c18
Author: Dominik George <nik at naturalnet.de>
Date:   Thu Jan 26 01:26:30 2017 +0100

    Merge tag 'upstream/1.9.3'
    
    Upstream version 1.9.3

 .gdbinit                                           |    1 -
 .travis.yml                                        |   35 -
 .travis_osx_rename_whl.py                          |   41 +
 .travis_osx_upload_whl.py                          |   66 +
 MANIFEST.in                                        |    2 +-
 Makefile                                           |   27 -
 PKG-INFO                                           |   13 +
 Setup.in                                           |    4 +-
 WHATSNEW                                           |  615 ++++++++-
 config.py                                          |   10 +-
 config_darwin.py                                   |   13 +-
 config_msys.py                                     |   10 +-
 config_unix.py                                     |   64 +-
 config_win.py                                      |   10 +-
 configtest/Setup_Win_Common.in                     |    2 -
 configtest/readme.txt                              |   19 -
 configtest/test-sdl-config                         |    7 -
 configtest/test_config_msys.py                     |  154 ---
 configtest/test_config_win.py                      |  121 --
 configtest/test_dll.py                             |   94 --
 configtest/test_msys.py                            |  325 -----
 .../testdir/SDL-1.2/VisualC/SDL/Release/SDL.dll    |    1 -
 configtest/testdir/SDL-1.2/include/SDL.h           |    1 -
 .../SDL_image-1.2.6/VisualC/Release/SDL_image.dll  |    1 -
 .../testdir/SDL_mixer-1.2/Release/SDL_mixer.dll    |    1 -
 .../testdir/SDL_ttf-2.0.9/Release/SDL_ttf.dll      |    1 -
 configtest/testdir/bin/SDL.dll                     |    1 -
 configtest/testdir/bin/SDL_image.dll               |    1 -
 configtest/testdir/bin/SDL_ttf.dll                 |    1 -
 configtest/testdir/bin/jpeg.dll                    |    1 -
 configtest/testdir/bin/libfreetype-6.dll           |    1 -
 configtest/testdir/bin/libogg-0.dll                |    1 -
 configtest/testdir/bin/libpng12-0.dll              |    1 -
 configtest/testdir/bin/libtiff.dll                 |    1 -
 configtest/testdir/bin/libvorbis-0.dll             |    1 -
 configtest/testdir/bin/libvorbisfile-3.dll         |    1 -
 configtest/testdir/bin/smpeg.dll                   |    1 -
 configtest/testdir/bin/zlib1.dll                   |    1 -
 configtest/testdir/include/SDL/SDL_image.h         |    1 -
 configtest/testdir/include/SDL/SDL_ttf.h           |    1 -
 configtest/testdir/include/SDL/jpeglib.h           |    1 -
 configtest/testdir/include/SDL_mixer.h             |    1 -
 configtest/testdir/include/libpng12/png.h          |    1 -
 configtest/testdir/jpeg-6b/Release/jpeg.dll        |    1 -
 configtest/testdir/lib/SDL_mixer.dll               |    1 -
 configtest/testdir/lib/libSDL_image.dll.a          |    1 -
 configtest/testdir/lib/libSDL_mixer.dll.a          |    1 -
 configtest/testdir/lib/libSDL_ttf.dll.a            |    1 -
 configtest/testdir/lib/libjpeg.dll.a               |    1 -
 configtest/testdir/lib/libpng12.dll.a              |    1 -
 .../testdir/libogg-1.1.3/Release/libogg-0.dll      |    1 -
 configtest/testdir/libpng-1.2.32/lib/libpng13.dll  |    1 -
 .../libvorbis-1.2.0/Release/libvorbis-0.dll        |    1 -
 .../libvorbis-1.2.0/Release/libvorbisfile-3.dll    |    1 -
 configtest/testdir/smpeg/Release/smpeg.dll         |    1 -
 configtest/testdir/tiff-3.8.2/Release/libtiff.dll  |    1 -
 configtest/testdir/zlib-1.2.3/Release/zlib1.dll    |    1 -
 configure                                          |    4 -
 docs/howto_release_pygame.txt                      |   17 +-
 docs/reST/common.txt                               |    3 +
 docs/reST/ext/boilerplate.py                       |   15 +-
 docs/reST/index.rst                                |   36 +-
 docs/reST/ref/examples.rst                         |   23 +-
 docs/reST/ref/font.rst                             |    4 +-
 docs/reST/ref/freetype.rst                         |  132 +-
 docs/reST/ref/pixelcopy.rst                        |   21 +-
 docs/reST/ref/sndarray.rst                         |   48 +-
 docs/reST/ref/surfarray.rst                        |   73 +-
 docs/reST/themes/classic/elements.html             |    7 -
 docs/reST/themes/classic/static/pygame.css_t       |  151 +++
 docs/reST/tut/CameraIntro.rst                      |  300 +++++
 docs/reST/tut/ChimpLineByLine.rst                  |  526 ++++++++
 docs/reST/tut/DisplayModes.rst                     |  200 +++
 .../ImportInit.html => reST/tut/ImportInit.rst}    |   68 +-
 docs/reST/tut/MakeGames.rst                        |  149 +++
 docs/reST/tut/MoveIt.rst                           |  474 +++++++
 docs/reST/tut/PygameIntro.rst                      |  298 +++++
 docs/reST/tut/SpriteIntro.rst                      |  290 ++---
 docs/reST/tut/SurfarrayIntro-rest                  |  114 ++
 docs/reST/tut/SurfarrayIntro.rst                   |  582 +++++++++
 .../average.jpg => reST/tut/camera_average.jpg}    |  Bin
 .../tut/camera_background.jpg}                     |  Bin
 .../camera/green.jpg => reST/tut/camera_green.jpg} |  Bin
 .../camera/hsv.jpg => reST/tut/camera_hsv.jpg}     |  Bin
 .../camera/mask.jpg => reST/tut/camera_mask.jpg}   |  Bin
 .../camera/rgb.jpg => reST/tut/camera_rgb.jpg}     |  Bin
 .../thresh.jpg => reST/tut/camera_thresh.jpg}      |  Bin
 .../tut/camera_thresholded.jpg}                    |  Bin
 .../camera/yuv.jpg => reST/tut/camera_yuv.jpg}     |  Bin
 docs/reST/tut/chimp.py.rst                         |    8 +
 docs/{tut/chimp => reST/tut}/chimpshot.gif         |  Bin
 docs/reST/tut/common.txt                           |    8 +
 .../intro/ball.gif => reST/tut/intro_ball.gif}     |  Bin
 .../intro/blade.jpg => reST/tut/intro_blade.jpg}   |  Bin
 .../freedom.jpg => reST/tut/intro_freedom.jpg}     |  Bin
 docs/reST/tut/newbieguide.rst                      |   13 +-
 docs/reST/tut/surfarray.png                        |  Bin 0 -> 50836 bytes
 docs/reST/tut/surfarray_allblack.png               |  Bin 0 -> 125 bytes
 docs/reST/tut/surfarray_flipped.png                |  Bin 0 -> 50835 bytes
 docs/reST/tut/surfarray_redimg.png                 |  Bin 0 -> 23443 bytes
 docs/reST/tut/surfarray_rgbarray.png               |  Bin 0 -> 50897 bytes
 docs/reST/tut/surfarray_scaledown.png              |  Bin 0 -> 15109 bytes
 docs/reST/tut/surfarray_scaleup.png                |  Bin 0 -> 67759 bytes
 docs/reST/tut/surfarray_soften.png                 |  Bin 0 -> 47540 bytes
 docs/reST/tut/surfarray_striped.png                |  Bin 0 -> 392 bytes
 docs/reST/tut/surfarray_xfade.png                  |  Bin 0 -> 41834 bytes
 docs/{tut/tom/basic.png => reST/tut/tom_basic.png} |  Bin
 .../tut/tom_event-flowchart.png}                   |  Bin
 .../tom/formulae.png => reST/tut/tom_formulae.png} |  Bin
 docs/reST/tut/tom_games2.rst                       |  135 ++
 docs/reST/tut/tom_games3.rst                       |  103 ++
 docs/reST/tut/tom_games4.rst                       |  143 +++
 docs/reST/tut/tom_games5.rst                       |  121 ++
 docs/reST/tut/tom_games6.rst                       |  329 +++++
 .../tom/radians.png => reST/tut/tom_radians.png}   |  Bin
 docs/tut/DisplayModes.html                         |  174 ---
 docs/tut/MoveIt.html                               |  436 -------
 docs/tut/camera/CameraIntro.html                   |  233 ----
 docs/tut/chimp/ChimpLineByLine.html                |  644 ----------
 docs/tut/chimp/chimp.py.html                       |  196 ---
 docs/tut/intro/intro.html                          |  351 ------
 docs/tut/surfarray/SurfarrayIntro.html             |  483 -------
 docs/tut/surfarray/allblack.jpg                    |  Bin 380 -> 0 bytes
 docs/tut/surfarray/flipped.jpg                     |  Bin 12053 -> 0 bytes
 docs/tut/surfarray/imgarray.jpg                    |  Bin 12075 -> 0 bytes
 docs/tut/surfarray/redimg.jpg                      |  Bin 8160 -> 0 bytes
 docs/tut/surfarray/scaledown.jpg                   |  Bin 4724 -> 0 bytes
 docs/tut/surfarray/scaleup.jpg                     |  Bin 31368 -> 0 bytes
 docs/tut/surfarray/soften.jpg                      |  Bin 9410 -> 0 bytes
 docs/tut/surfarray/striped.jpg                     |  Bin 2754 -> 0 bytes
 docs/tut/surfarray/xfade.jpg                       |  Bin 8576 -> 0 bytes
 docs/tut/tom/MakeGames.html                        |  455 -------
 docs/tut/tom/games2.html                           |  315 -----
 docs/tut/tom/games3.html                           |  275 ----
 docs/tut/tom/games4.html                           |  368 ------
 docs/tut/tom/games5.html                           |  325 -----
 docs/tut/tom/games6.html                           |  515 --------
 examples/arraydemo.py                              |  123 +-
 examples/glcube.py                                 |    4 +-
 examples/liquid.py                                 |    4 +-
 examples/readme.txt                                |    4 +-
 examples/sound_array_demos.py                      |   48 +-
 install.html                                       |   20 +-
 install.txt                                        |  150 ---
 lib/__init__.py                                    |    1 -
 lib/compat.py                                      |    2 +-
 lib/freetype.py                                    |   17 +-
 lib/sndarray.py                                    |  119 +-
 lib/surfarray.py                                   |  155 +--
 lib/sysfont.py                                     |    2 +-
 lib/version.py                                     |   32 +
 makeref.py                                         |    2 +-
 pygame.egg-info/PKG-INFO                           |   13 +
 pygame.egg-info/SOURCES.txt                        |  540 ++++++++
 pygame.egg-info/dependency_links.txt               |    1 +
 pygame.egg-info/top_level.txt                      |    1 +
 readme.html                                        |    3 +-
 readme.rst                                         |   28 +-
 setmods                                            |   26 -
 setup.cfg                                          |    5 +
 setup.py                                           |   76 +-
 src/_freetype.c                                    |    6 +-
 src/_numericsndarray.c                             |  248 ----
 src/_numericsurfarray.c                            | 1164 -----------------
 src/draw.c                                         |   24 +-
 src/fastevents.c                                   |    9 +-
 src/numeric_arrayobject.h                          |  473 -------
 src/transform.c                                    |   30 +-
 symbian/BuildPygameRelease.py                      |  122 --
 symbian/SConscript.Ogg.py                          |   29 -
 symbian/SConscript.SDL.py                          |  181 ---
 symbian/SConscript.Vorbis.py                       |   59 -
 symbian/SConscript.app.py                          |   69 -
 symbian/SConscript.jpeg.py                         |   81 --
 symbian/SConscript.libpng.py                       |   38 -
 symbian/SConscript.pygame.py                       |  165 ---
 symbian/SConscript.sft2.py                         |   74 --
 symbian/SConstruct                                 |  163 ---
 symbian/app/apps/liquid_s60.py                     |   91 --
 symbian/app/launcher/logo.jpg                      |  Bin 9856 -> 0 bytes
 symbian/app/launcher/pygame_launcher.py            | 1314 --------------------
 symbian/app/pygame.hrh                             |   10 -
 symbian/app/pygame.rss                             |   62 -
 symbian/app/pygame_app.cpp                         |  338 -----
 symbian/app/pygame_main.cpp                        |   78 --
 symbian/app/pygame_main.py                         |   73 --
 symbian/app/pygame_reg.rss                         |   12 -
 symbian/changes_for_symbian.txt                    |   27 -
 symbian/common/builtins.c                          |   60 -
 symbian/common/logmanutils.h                       |  174 ---
 symbian/configure.py                               |   63 -
 symbian/default_build_config.py                    |   15 -
 symbian/how_to_build.txt                           |  141 ---
 symbian/lib/base.py                                |    1 -
 symbian/lib/bufferproxy.py                         |    1 -
 symbian/lib/color.py                               |    1 -
 symbian/lib/constants.py                           |    1 -
 symbian/lib/display.py                             |    1 -
 symbian/lib/draw.py                                |    1 -
 symbian/lib/event.py                               |    1 -
 symbian/lib/fastevent.py                           |    1 -
 symbian/lib/font.py                                |    1 -
 symbian/lib/gfxdraw.py                             |    1 -
 symbian/lib/image.py                               |    1 -
 symbian/lib/imageext.py                            |    1 -
 symbian/lib/key.py                                 |    1 -
 symbian/lib/mixer.py                               |    2 -
 symbian/lib/overlay.py                             |    1 -
 symbian/lib/pixelarray.py                          |    1 -
 symbian/lib/rect.py                                |    1 -
 symbian/lib/rwobject.py                            |    1 -
 symbian/lib/surface.py                             |    1 -
 symbian/lib/surflock.py                            |    1 -
 symbian/lib/time.py                                |    1 -
 symbian/lib/transform.py                           |    1 -
 symbian/pygame_pkgtemplate.txt                     |   42 -
 test/__main__.py                                   |   20 +-
 test/base_test.py                                  |    9 +-
 test/blit_test.py                                  |    6 +-
 test/bufferproxy_test.py                           |    7 +-
 test/camera_test.py                                |    8 +-
 test/cdrom_test.py                                 |    7 +-
 test/color_test.py                                 |    7 +-
 test/compat_test.py                                |    5 +-
 test/cursors_test.py                               |    7 +-
 test/display_test.py                               |    5 +-
 test/draw_test.py                                  |   27 +-
 test/event_test.py                                 |    5 +-
 test/fastevent_test.py                             |    3 +-
 test/font_tags.py                                  |    2 +-
 test/font_test.py                                  |   24 +-
 test/freetype_test.py                              |    8 +-
 test/ftfont_test.py                                |    3 +-
 test/gfxdraw_test.py                               |    5 +-
 test/image__save_gl_surface_test.py                |    8 +-
 test/image_test.py                                 |    7 +-
 test/imageext_test.py                              |    8 +-
 test/joystick_test.py                              |    5 +-
 test/key_test.py                                   |    7 +-
 test/mask_test.py                                  |    5 +-
 test/math_test.py                                  |   29 +-
 test/midi_test.py                                  |    7 +-
 test/mixer_music_test.py                           |   86 +-
 test/mixer_test.py                                 |   12 +-
 test/mouse_test.py                                 |    5 +-
 test/overlay_test.py                               |    5 +-
 test/pixelarray_test.py                            |    5 +-
 test/pixelcopy_test.py                             |    3 +-
 test/rect_test.py                                  |    5 +-
 test/run_tests__tests/all_ok/fake_2_test.py        |    9 +-
 test/run_tests__tests/all_ok/fake_3_test.py        |    9 +-
 test/run_tests__tests/all_ok/fake_4_test.py        |    9 +-
 test/run_tests__tests/all_ok/fake_5_test.py        |    9 +-
 test/run_tests__tests/all_ok/fake_6_test.py        |    9 +-
 .../all_ok/no_assertions__ret_code_of_1__test.py   |    9 +-
 test/run_tests__tests/all_ok/zero_tests_test.py    |    9 +-
 test/run_tests__tests/everything/fake_2_test.py    |    9 +-
 .../everything/incomplete_todo_test.py             |    7 +-
 test/run_tests__tests/everything/magic_tag_test.py |    7 +-
 test/run_tests__tests/everything/sleep_test.py     |    7 +-
 test/run_tests__tests/exclude/fake_2_test.py       |    9 +-
 .../run_tests__tests/exclude/invisible_tag_test.py |    7 +-
 test/run_tests__tests/exclude/magic_tag_test.py    |    7 +-
 test/run_tests__tests/failures1/fake_2_test.py     |    9 +-
 test/run_tests__tests/failures1/fake_3_test.py     |    9 +-
 test/run_tests__tests/failures1/fake_4_test.py     |    9 +-
 test/run_tests__tests/incomplete/fake_2_test.py    |   19 +-
 test/run_tests__tests/incomplete/fake_3_test.py    |    9 +-
 .../incomplete_todo/fake_2_test.py                 |    7 +-
 .../incomplete_todo/fake_3_test.py                 |    9 +-
 test/run_tests__tests/infinite_loop/fake_1_test.py |    9 +-
 test/run_tests__tests/infinite_loop/fake_2_test.py |    9 +-
 test/run_tests__tests/print_stderr/fake_2_test.py  |    9 +-
 test/run_tests__tests/print_stderr/fake_3_test.py  |    7 +-
 test/run_tests__tests/print_stderr/fake_4_test.py  |    9 +-
 test/run_tests__tests/print_stdout/fake_2_test.py  |    9 +-
 test/run_tests__tests/print_stdout/fake_3_test.py  |    7 +-
 test/run_tests__tests/print_stdout/fake_4_test.py  |    9 +-
 test/run_tests__tests/run_tests__test.py           |    3 -
 test/run_tests__tests/timeout/fake_2_test.py       |    9 +-
 test/run_tests__tests/timeout/sleep_test.py        |    7 +-
 test/rwobject_test.py                              |    7 +-
 test/scrap_test.py                                 |    7 +-
 test/sndarray_tags.py                              |    6 +-
 test/sndarray_test.py                              |   64 +-
 test/sprite_test.py                                |    7 +-
 test/surface_test.py                               |    5 +-
 test/surfarray_tags.py                             |    7 +-
 test/surfarray_test.py                             |  105 +-
 test/surflock_test.py                              |    5 +-
 test/sysfont_test.py                               |    5 +-
 test/test_utils/__init__.py                        |   20 -
 test/test_utils/run_tests.py                       |   90 +-
 test/test_utils/test_machinery.py                  |   74 ++
 test/test_utils/test_runner.py                     |  158 +--
 test/test_utils/unittest.py                        |  874 -------------
 test/test_utils/unittest_patch.py                  |  307 -----
 test/threads_test.py                               |    5 +-
 test/time_test.py                                  |    7 +-
 test/transform_test.py                             |    3 +-
 test/util/gen_stubs.py                             |    2 +-
 trackmod/__init__.py                               |  169 ---
 trackmod/importer.py                               |   81 --
 trackmod/module.py                                 |   91 --
 trackmod/namereg.py                                |   57 -
 trackmod/reporter.py                               |  134 --
 306 files changed, 5975 insertions(+), 14612 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pygame.git



More information about the Python-modules-commits mailing list