[powermanga] 37/41: Merge tag 'upstream/0.93'

Markus Koschany apo-guest at moszumanska.debian.org
Thu Jun 25 18:55:14 UTC 2015


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

apo-guest pushed a commit to branch master
in repository powermanga.

commit b8210a43998d7f2a045018a13cfa8bffad104e30
Merge: 54c0edb dbf8d9f
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu Jun 25 16:00:34 2015 +0200

    Merge tag 'upstream/0.93'
    
    Upstream version 0.93
    
    # gpg: Signature made Thu 25 Jun 2015 16:00:30 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]

 AUTHORS                                            |   22 +-
 CHANGES                                            |   35 +
 Makefile.am                                        |    2 +-
 Makefile.in                                        |  635 ---
 README                                             |    9 +-
 README.WIN32_CE                                    |   20 +
 aclocal.m4                                         | 1065 ----
 autom4te.cache/output.0                            | 5774 --------------------
 autom4te.cache/output.1                            | 5774 --------------------
 autom4te.cache/requests                            |  132 -
 autom4te.cache/traces.0                            |  852 ---
 autom4te.cache/traces.1                            |  422 --
 autotools/compile                                  |  142 -
 autotools/config.guess                             |  616 ++-
 autotools/config.sub                               |  385 +-
 autotools/depcomp                                  |  637 ++-
 autotools/install-sh                               |  538 +-
 autotools/missing                                  |  453 +-
 autotools/mkinstalldirs                            |  111 +
 config.h.in                                        |   68 +-
 configure                                          | 5774 --------------------
 configure.ac                                       |  113 +-
 data/Makefile.in                                   |  336 --
 data/curves/Makefile.in                            |  457 --
 data/levels/curves_phase/Makefile.in               |  377 --
 data/levels/grids_phase/Makefile.in                |  378 --
 graphics/Makefile.in                               |  342 --
 graphics/bitmap/Makefile.in                        |  339 --
 graphics/bitmap/fonts/Makefile.in                  |  339 --
 graphics/sprites/Makefile.in                       |  345 --
 graphics/sprites/guardians/Makefile.in             |  349 --
 graphics/sprites/meteors/Makefile.in               |  378 --
 graphics/sprites/spaceships/Makefile.in            |  360 --
 graphics/sprites/stars/Makefile.in                 |  367 --
 html/powermanga_en/ar01s01.html                    |   44 +
 html/powermanga_en/ar01s01s01.html                 |   45 +
 html/powermanga_en/ar01s01s02.html                 |   50 +
 html/powermanga_en/ar01s02.html                    |   50 +
 html/powermanga_en/ar01s02s01.html                 |   40 +
 html/powermanga_en/ar01s02s02.html                 |   40 +
 html/powermanga_en/ar01s02s03.html                 |   48 +
 html/powermanga_en/ar01s02s04.html                 |   44 +
 html/powermanga_en/ar01s02s05.html                 |   96 +
 html/powermanga_en/ar01s03.html                    |   56 +
 html/powermanga_en/ar01s03s01.html                 |   72 +
 html/powermanga_en/ar01s03s02.html                 |  107 +
 html/powermanga_en/ar01s03s03.html                 |   53 +
 html/powermanga_en/ar01s03s03s01.html              |   40 +
 html/powermanga_en/ar01s03s03s02.html              |   40 +
 html/powermanga_en/ar01s03s03s03.html              |   39 +
 html/powermanga_en/ar01s03s03s04.html              |   39 +
 html/powermanga_en/ar01s04.html                    |   46 +
 html/powermanga_en/ar01s04s01.html                 |   44 +
 html/powermanga_en/ar01s04s02.html                 |   44 +
 html/powermanga_en/ar01s04s03.html                 |   39 +
 html/powermanga_en/ar01s05.html                    |   50 +
 html/powermanga_en/ar01s05s01.html                 |   42 +
 html/powermanga_en/ar01s05s02.html                 |   42 +
 html/powermanga_en/ar01s05s03.html                 |   43 +
 html/powermanga_en/ar01s05s04.html                 |   43 +
 html/powermanga_en/ar01s05s05.html                 |   40 +
 html/powermanga_en/ar01s06.html                    |   58 +
 html/powermanga_en/ar01s06s01.html                 |   49 +
 html/powermanga_en/ar01s06s01s01.html              |   39 +
 html/powermanga_en/ar01s06s01s02.html              |   39 +
 html/powermanga_en/ar01s06s01s03.html              |   39 +
 html/powermanga_en/ar01s06s02.html                 |   45 +
 html/powermanga_en/ar01s06s02s01.html              |   45 +
 html/powermanga_en/ar01s06s02s02.html              |   46 +
 html/powermanga_en/ar01s07.html                    |   59 +
 html/powermanga_en/ar01s08.html                    |   58 +
 html/powermanga_en/ar01s08s01.html                 |   47 +
 html/powermanga_en/ar01s08s02.html                 |   48 +
 html/powermanga_en/ar01s08s02s01.html              |   81 +
 html/powermanga_en/ar01s08s02s02.html              |   46 +
 html/powermanga_en/ar01s08s02s03.html              |   47 +
 html/powermanga_en/ar01s08s02s04.html              |   59 +
 html/powermanga_en/ar01s09.html                    |   59 +
 html/powermanga_en/images/home.png                 |  Bin 0 -> 1831 bytes
 html/powermanga_en/images/next.png                 |  Bin 0 -> 1959 bytes
 html/powermanga_en/images/prev.png                 |  Bin 0 -> 1906 bytes
 html/powermanga_en/images/tlktop.png               |  Bin 0 -> 1590 bytes
 html/powermanga_en/images/up.png                   |  Bin 0 -> 2022 bytes
 html/powermanga_en/index.html                      |  149 +
 .../powermanga_en_fichiers/filelist.xml            |   33 +
 .../powermanga_en_fichiers/image001.gif            |  Bin 0 -> 1034 bytes
 .../powermanga_en_fichiers/image002.gif            |  Bin 0 -> 1045 bytes
 .../powermanga_en_fichiers/image003.gif            |  Bin 0 -> 1047 bytes
 .../powermanga_en_fichiers/image004.gif            |  Bin 0 -> 1040 bytes
 .../powermanga_en_fichiers/image005.gif            |  Bin 0 -> 1040 bytes
 .../powermanga_en_fichiers/image006.gif            |  Bin 0 -> 117129 bytes
 .../powermanga_en_fichiers/image007.jpg            |  Bin 0 -> 21095 bytes
 .../powermanga_en_fichiers/image008.jpg            |  Bin 0 -> 63733 bytes
 .../powermanga_en_fichiers/image009.jpg            |  Bin 0 -> 19085 bytes
 .../powermanga_en_fichiers/image010.gif            |  Bin 0 -> 1034 bytes
 .../powermanga_en_fichiers/image011.gif            |  Bin 0 -> 1045 bytes
 .../powermanga_en_fichiers/image012.gif            |  Bin 0 -> 1047 bytes
 .../powermanga_en_fichiers/image013.jpg            |  Bin 0 -> 21125 bytes
 .../powermanga_en_fichiers/image014.gif            |  Bin 0 -> 1040 bytes
 .../powermanga_en_fichiers/image015.jpg            |  Bin 0 -> 17825 bytes
 .../powermanga_en_fichiers/image016.gif            |  Bin 0 -> 1040 bytes
 .../powermanga_en_fichiers/image017.jpg            |  Bin 0 -> 2057 bytes
 .../powermanga_en_fichiers/image018.jpg            |  Bin 0 -> 2042 bytes
 .../powermanga_en_fichiers/image019.jpg            |  Bin 0 -> 1937 bytes
 .../powermanga_en_fichiers/image020.jpg            |  Bin 0 -> 4332 bytes
 .../powermanga_en_fichiers/image021.jpg            |  Bin 0 -> 4371 bytes
 .../powermanga_en_fichiers/image022.jpg            |  Bin 0 -> 4729 bytes
 .../powermanga_en_fichiers/image023.jpg            |  Bin 0 -> 4337 bytes
 .../powermanga_en_fichiers/image024.jpg            |  Bin 0 -> 23156 bytes
 .../powermanga_en_fichiers/image025.jpg            |  Bin 0 -> 14858 bytes
 .../powermanga_en_fichiers/image026.jpg            |  Bin 0 -> 7450 bytes
 .../powermanga_en_fichiers/image027.jpg            |  Bin 0 -> 31863 bytes
 .../powermanga_en_fichiers/image028.jpg            |  Bin 0 -> 3084 bytes
 .../powermanga_en_fichiers/image029.jpg            |  Bin 0 -> 23758 bytes
 html/powermanga_en/style.css                       |   93 +
 html/powermanga_fr/ar01s01.html                    |   44 +
 html/powermanga_fr/ar01s01s01.html                 |   46 +
 html/powermanga_fr/ar01s01s02.html                 |   50 +
 html/powermanga_fr/ar01s02.html                    |   50 +
 html/powermanga_fr/ar01s02s01.html                 |   39 +
 html/powermanga_fr/ar01s02s02.html                 |   39 +
 html/powermanga_fr/ar01s02s03.html                 |   47 +
 html/powermanga_fr/ar01s02s04.html                 |   44 +
 html/powermanga_fr/ar01s02s05.html                 |   62 +
 html/powermanga_fr/ar01s03.html                    |   58 +
 html/powermanga_fr/ar01s03s01.html                 |   67 +
 html/powermanga_fr/ar01s03s02.html                 |  108 +
 html/powermanga_fr/ar01s03s03.html                 |   55 +
 html/powermanga_fr/ar01s03s03s01.html              |   39 +
 html/powermanga_fr/ar01s03s03s02.html              |   40 +
 html/powermanga_fr/ar01s03s03s03.html              |   39 +
 html/powermanga_fr/ar01s03s03s04.html              |   39 +
 html/powermanga_fr/ar01s03s03s05.html              |   39 +
 html/powermanga_fr/ar01s04.html                    |   46 +
 html/powermanga_fr/ar01s04s01.html                 |   44 +
 html/powermanga_fr/ar01s04s02.html                 |   44 +
 html/powermanga_fr/ar01s04s03.html                 |   44 +
 html/powermanga_fr/ar01s05.html                    |   50 +
 html/powermanga_fr/ar01s05s01.html                 |   39 +
 html/powermanga_fr/ar01s05s02.html                 |   41 +
 html/powermanga_fr/ar01s05s03.html                 |   42 +
 html/powermanga_fr/ar01s05s04.html                 |   42 +
 html/powermanga_fr/ar01s05s05.html                 |   40 +
 html/powermanga_fr/ar01s06.html                    |   52 +
 html/powermanga_fr/ar01s06s01.html                 |   46 +
 html/powermanga_fr/ar01s06s02.html                 |   45 +
 html/powermanga_fr/ar01s06s02s01.html              |   45 +
 html/powermanga_fr/ar01s06s02s02.html              |   45 +
 html/powermanga_fr/ar01s07.html                    |   60 +
 html/powermanga_fr/ar01s08.html                    |   47 +
 html/powermanga_fr/ar01s08s01.html                 |   54 +
 html/powermanga_fr/ar01s08s02.html                 |   99 +
 html/powermanga_fr/ar01s09.html                    |   58 +
 html/powermanga_fr/images/home.png                 |  Bin 0 -> 1831 bytes
 html/powermanga_fr/images/next.png                 |  Bin 0 -> 1959 bytes
 html/powermanga_fr/images/prev.png                 |  Bin 0 -> 1906 bytes
 html/powermanga_fr/images/tlktop.png               |  Bin 0 -> 1590 bytes
 html/powermanga_fr/images/up.png                   |  Bin 0 -> 2022 bytes
 html/powermanga_fr/index.html                      |  134 +
 .../powermanga_fr_fichiers/filelist.xml            |   29 +
 .../powermanga_fr_fichiers/image001.gif            |  Bin 0 -> 1034 bytes
 .../powermanga_fr_fichiers/image001.jpg            |  Bin 0 -> 1100 bytes
 .../powermanga_fr_fichiers/image002.gif            |  Bin 0 -> 1045 bytes
 .../powermanga_fr_fichiers/image002.jpg            |  Bin 0 -> 29952 bytes
 .../powermanga_fr_fichiers/image003.gif            |  Bin 0 -> 1047 bytes
 .../powermanga_fr_fichiers/image003.jpg            |  Bin 0 -> 13374 bytes
 .../powermanga_fr_fichiers/image004.gif            |  Bin 0 -> 1040 bytes
 .../powermanga_fr_fichiers/image004.jpg            |  Bin 0 -> 18331 bytes
 .../powermanga_fr_fichiers/image005.gif            |  Bin 0 -> 1040 bytes
 .../powermanga_fr_fichiers/image005.jpg            |  Bin 0 -> 1100 bytes
 .../powermanga_fr_fichiers/image006.jpg            |  Bin 0 -> 1095 bytes
 .../powermanga_fr_fichiers/image007.jpg            |  Bin 0 -> 1089 bytes
 .../powermanga_fr_fichiers/image008.jpg            |  Bin 0 -> 21240 bytes
 .../powermanga_fr_fichiers/image009.jpg            |  Bin 0 -> 1094 bytes
 .../powermanga_fr_fichiers/image010.jpg            |  Bin 0 -> 10995 bytes
 .../powermanga_fr_fichiers/image011.jpg            |  Bin 0 -> 1097 bytes
 .../powermanga_fr_fichiers/image012.jpg            |  Bin 0 -> 2057 bytes
 .../powermanga_fr_fichiers/image013.jpg            |  Bin 0 -> 2042 bytes
 .../powermanga_fr_fichiers/image014.jpg            |  Bin 0 -> 1937 bytes
 .../powermanga_fr_fichiers/image015.jpg            |  Bin 0 -> 4332 bytes
 .../powermanga_fr_fichiers/image016.jpg            |  Bin 0 -> 4371 bytes
 .../powermanga_fr_fichiers/image017.jpg            |  Bin 0 -> 4729 bytes
 .../powermanga_fr_fichiers/image018.jpg            |  Bin 0 -> 4337 bytes
 .../powermanga_fr_fichiers/image019.jpg            |  Bin 0 -> 10235 bytes
 .../powermanga_fr_fichiers/image020.jpg            |  Bin 0 -> 9421 bytes
 .../powermanga_fr_fichiers/image021.jpg            |  Bin 0 -> 20864 bytes
 .../powermanga_fr_fichiers/image022.jpg            |  Bin 0 -> 19973 bytes
 .../powermanga_fr_fichiers/image023.jpg            |  Bin 0 -> 3084 bytes
 .../powermanga_fr_fichiers/image023.png            |  Bin 0 -> 31183 bytes
 .../powermanga_fr_fichiers/image024.jpg            |  Bin 0 -> 6640 bytes
 .../powermanga_fr_fichiers/image024.png            |  Bin 0 -> 31183 bytes
 .../powermanga_fr_fichiers/image025.jpg            |  Bin 0 -> 6640 bytes
 .../powermanga_fr_fichiers/image026.jpg            |  Bin 0 -> 19973 bytes
 .../powermanga_fr_fichiers/image027.jpg            |  Bin 0 -> 3084 bytes
 .../powermanga_fr_fichiers/image028.png            |  Bin 0 -> 31183 bytes
 html/powermanga_fr/style.css                       |   93 +
 images_for_menu_entry/powermanga.16.png            |  Bin 0 -> 794 bytes
 images_for_menu_entry/powermanga.32.png            |  Bin 0 -> 2362 bytes
 images_for_menu_entry/powermanga.48.png            |  Bin 0 -> 4324 bytes
 images_for_menu_entry/powermanga.gif               |  Bin 0 -> 2524 bytes
 images_for_menu_entry/powermanga.png               |  Bin 0 -> 398 bytes
 images_for_menu_entry/powermanga.xpm               |   56 +
 images_for_menu_entry/powermanga_16x16.png         |  Bin 0 -> 824 bytes
 images_for_menu_entry/powermanga_22x22.png         |  Bin 0 -> 1136 bytes
 images_for_menu_entry/powermanga_32x32.png         |  Bin 0 -> 1218 bytes
 images_for_menu_entry/powermanga_48x48.png         |  Bin 0 -> 2328 bytes
 initialise                                         |    0
 powermanga.6 => man/powermanga.fr.6                |   44 +-
 order/screen0.png                                  |  Bin 0 -> 80876 bytes
 order/screen1.png                                  |  Bin 0 -> 67605 bytes
 order/screen2.png                                  |  Bin 0 -> 62907 bytes
 order/scriptorder1_en.txt                          |  104 +
 order/scriptorder1_fr.txt                          |  107 +
 order/scriptorder2_en.txt                          |   94 +
 order/scriptorder2_fr.txt                          |   95 +
 order/scriptorder3_en.txt                          |  103 +
 order/scriptorder3_fr.txt                          |  106 +
 order/tlk.fnt                                      |  Bin 0 -> 41020 bytes
 powermanga                                         |    1 -
 powermanga.6                                       |   35 +-
 powermanga.desktop                                 |   12 +
 powermanga.xpm                                     |   56 +
 sounds/Makefile.in                                 |  366 --
 sounds/handheld_console/Makefile.in                |  338 --
 sounds/music_game.zik                              |  Bin 1030515 -> 1030241 bytes
 src/Makefile.am                                    |   21 +-
 src/Makefile.in                                    | 1260 -----
 src/assembler.S                                    |    4 +-
 src/assembler.h                                    |    4 +-
 src/bonus.c                                        |  114 +-
 src/bonus.h                                        |   27 +-
 src/config_file.c                                  |  228 +-
 src/config_file.h                                  |   14 +-
 src/congratulations.c                              |   45 +-
 src/congratulations.h                              |   12 +-
 src/counter_shareware.c                            |   53 +-
 src/counter_shareware.h                            |   27 +-
 src/curve_phase.c                                  |   35 +-
 src/curve_phase.h                                  |    4 +-
 src/display.c                                      |   97 +-
 src/display.h                                      |   39 +-
 src/display_sdl.c                                  | 1152 ++--
 src/display_x11.c                                  |  263 +-
 src/electrical_shock.c                             |   14 +-
 src/electrical_shock.h                             |    4 +-
 src/enemies.c                                      |  224 +-
 src/enemies.h                                      |    9 +-
 src/energy_gauge.c                                 |   66 +-
 src/energy_gauge.h                                 |   24 +-
 src/explosions.c                                   |  300 +-
 src/explosions.h                                   |   11 +-
 src/extra_gun.c                                    |  148 +-
 src/extra_gun.h                                    |   26 +-
 src/gfx_wrapper.c                                  |  116 +-
 src/gfx_wrapper.h                                  |    4 +-
 src/gfxroutines.c                                  |  636 ++-
 src/gfxroutines.h                                  |    4 +-
 src/grid_phase.c                                   |   26 +-
 src/grid_phase.h                                   |   42 +-
 src/guardians.c                                    |  311 +-
 src/guardians.h                                    |   12 +-
 src/images.c                                       |  463 +-
 src/images.h                                       |   31 +-
 src/inits_game.c                                   |  107 +-
 src/lispreader.c                                   |  217 +-
 src/lispreader.h                                   |  133 +-
 src/log_recorder.c                                 |  338 ++
 src/log_recorder.h                                 |   71 +
 src/lonely_foes.c                                  |   66 +-
 src/lonely_foes.h                                  |    8 +-
 src/main.c                                         |  142 +-
 src/menu.c                                         |  355 +-
 src/menu.h                                         |   36 +-
 src/menu_sections.c                                |  323 +-
 src/menu_sections.h                                |   38 +-
 src/meteors_phase.c                                |  112 +-
 src/meteors_phase.h                                |   25 +-
 src/movie.c                                        |   89 +-
 src/movie.h                                        |   18 +-
 src/options_panel.c                                |  268 +-
 src/options_panel.h                                |   15 +-
 src/powermanga.c                                   |  120 +-
 src/powermanga.h                                   |  171 +-
 src/satellite_protections.c                        |  186 +-
 src/satellite_protections.h                        |    9 +-
 src/scale2x.c                                      |   77 +-
 src/scale2x.h                                      |   16 +-
 src/scale3x.c                                      |   12 +-
 src/scale3x.h                                      |   14 +-
 src/scalebit.c                                     |   20 +-
 src/scalebit.h                                     |    6 +-
 src/script_page.c                                  |  369 +-
 src/script_page.h                                  |  121 +-
 src/scrolltext.c                                   |  119 +-
 src/scrolltext.h                                   |    9 +-
 src/sdl_mixer.c                                    |  126 +-
 src/shockwave.c                                    |   95 +-
 src/shockwave.h                                    |    4 +-
 src/shots.c                                        |  186 +-
 src/shots.h                                        |   32 +-
 src/spaceship.c                                    |  107 +-
 src/spaceship.h                                    |   37 +-
 src/spaceship_weapons.c                            | 1964 +++----
 src/spaceship_weapons.h                            |    8 +-
 src/special_keys.c                                 |  106 +-
 src/sprites_string.c                               |  167 +-
 src/sprites_string.h                               |   14 +-
 src/starfield.c                                    |   58 +-
 src/starfield.h                                    |    9 +-
 src/text_overlay.c                                 |  227 +-
 src/text_overlay.h                                 |    4 +-
 src/texts.c                                        |   62 +-
 src/texts.h                                        |   34 +-
 src/tools.c                                        |  885 ++-
 src/tools.h                                        |   56 +-
 stamp-h1.in                                        |    0
 stamp-h2.in                                        |    0
 texts/Makefile.am                                  |    6 +-
 texts/Makefile.in                                  |  343 --
 texts/about_en.txt                                 |    6 +-
 texts/about_fr.txt                                 |    8 +-
 texts/about_it.txt                                 |   14 +
 texts/order_en.txt                                 |    2 +-
 texts/order_fr.txt                                 |    2 +-
 texts/{order_en.txt => order_it.txt}               |    2 +-
 texts/scroll_en.txt                                |    2 +-
 texts/scroll_fr.txt                                |   16 +-
 texts/scroll_it.txt                                |    9 +
 texts/text_it.txt                                  |    4 +
 329 files changed, 14872 insertions(+), 33285 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/powermanga.git



More information about the Pkg-games-commits mailing list