[trackballs] 04/04: Import Debian changes 1.2.3-1

Markus Koschany apo at moszumanska.debian.org
Thu Jul 27 23:47:17 UTC 2017


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

apo pushed a commit to branch master
in repository trackballs.

commit 0ba8627450c799cf713e365809be344d4f2d9004
Merge: e734838 6364a08
Author: Markus Koschany <apo at debian.org>
Date:   Fri Jul 28 00:11:52 2017 +0200

    Import Debian changes 1.2.3-1
    
    trackballs (1.2.3-1) unstable; urgency=medium
    
      * New maintainer: Debian Games Team with the consent of Ari Pollak.
        Add myself to Uploaders.
      * New upstream version 1.2.3. (Closes: #868983)
        - Fixes segmentation faults. The game is usable again. (Closes: #839788)
        - The game uses SDL2 now which provides much better fullscreen support
          and switching to different resolutions should not crash the X server
          anymore. (Closes: #306998)
        - We build-depend on zlib1g-dev now. (Closes: #672946)
        - The Slovak PO file declares and uses UTF-8 now. (Closes: #621709)
      * Switch to compat level 10.
      * wrap-and-sort -sa.
      * Declare compliance with Debian Policy 4.0.0.
      * Homepage field: Point to the new fork of trackballs at github.com.
      * Move the package to Git.
      * Drop deprecated menu file and xpm icon.
      * Switch from SDL1 to SDL2. New build-dependencies zlib1g-dev, gettext. New
        build system CMake.
      * Drop all patches. No longer needed.
      * Clean up debian/rules. Add get-orig-source target.
      * Don't recommend trackballs-music anymore because the music files are
        included now.
      * Remove the paragraph of the package description that mentions the obsolete
        trackballs-music package.
      * Drop postrm file.
      * Add Breaks and Replaces relation for trackballs-music.
      * Update debian/copyright to copyright format 1.0.
      * Add manpage.patch and fix some spelling mistakes and the Lintian warning
        bad whatis entry.
      * trackballs-data: Depend on fonts-freefont-ttf and symlink the font file to
        Debian's system package.
      * Add no-execstring.patch and remove the unnecessary Exec string from
        trackballs.desktop.

 .clang-format                                      |    95 +
 .gitignore                                         |    28 +
 ABOUT-NLS                                          |   432 -
 ABOUT-NLS.md                                       |   105 +
 AUTHORS                                            |    90 -
 AUTHORS.md                                         |    80 +
 CMakeLists.txt                                     |   118 +
 COPYING                                            |    12 +-
 ChangeLog                                          |   688 -
 FAQ                                                |   170 -
 FAQ.md                                             |   106 +
 INSTALL                                            |   191 +-
 Makefile.am                                        |     8 -
 Makefile.in                                        |   643 -
 NEWS                                               |     7 -
 NEWS.md                                            |   792 +
 README                                             |    66 -
 README.md                                          |    79 +
 TODO                                               |   397 -
 TODO.md                                            |   187 +
 aclocal.m4                                         |  3237 ---
 cmake/FindGC.cmake                                 |    23 +
 cmake/FindGuile.cmake                              |    34 +
 cmake/FindSDL2_and_friends.cmake                   |    57 +
 config.guess                                       |  1453 --
 config.h.in                                        |   131 -
 config.rpath                                       |   548 -
 config.sub                                         |  1566 --
 configure                                          | 10181 --------
 configure.ac                                       |   127 -
 debian/changelog                                   |    37 +
 debian/clean                                       |     2 -
 debian/compat                                      |     2 +-
 debian/control                                     |    53 +-
 debian/copyright                                   |   197 +-
 debian/menu                                        |     5 -
 ...1-changes-in-trackballs_1.1.4-4.1.diff.gz.patch |  2537 --
 ...e-illegal-expression-context-define-to-th.patch |    37 -
 debian/patches/0003-Port-to-Guile-2.0.patch        |  1107 -
 ...ile.am-prepend-DESTDIR-to-iconsdir-here-t.patch |    32 -
 ...file.in.in-set-mkinstalldirs-to-install-d.patch |    24 -
 ...te-automatically-generated-upstream-files.patch | 23536 -------------------
 debian/patches/gcc6.patch                          |    36 -
 debian/patches/german-translations.patch           |  1509 --
 debian/patches/manpage.patch                       |   106 +
 debian/patches/no-execstring.patch                 |    27 +
 debian/patches/series                              |    10 +-
 debian/postrm                                      |    44 -
 debian/rules                                       |    31 +-
 debian/trackballs-data.install                     |     8 +-
 debian/trackballs-data.links                       |     1 +
 debian/trackballs-data.lintian-overrides           |     2 +
 debian/trackballs.desktop                          |    10 -
 debian/trackballs.install                          |     5 +-
 debian/trackballs.xpm                              |   198 -
 debian/watch                                       |     5 +-
 depcomp                                            |   530 -
 docs/Makefile.am                                   |     2 -
 docs/Makefile.in                                   |   368 -
 docs/api.html                                      |   337 +-
 docs/customizing.html                              |     3 +-
 docs/default.css                                   |    80 +
 docs/examples.html                                 |     3 +-
 docs/index.html                                    |     3 +-
 docs/mapeditor.html                                |   195 +-
 docs/scriptingLanguage.html                        |     5 +-
 editor.jpg                                         |   Bin 8945 -> 0 bytes
 gettext.h                                          |    69 -
 header.jpg                                         |   Bin 8010 -> 0 bytes
 install-sh                                         |   251 -
 missing                                            |   198 -
 mkinstalldirs                                      |   150 -
 po/ChangeLog                                       |    11 -
 po/LINGUAS                                         |     3 -
 po/Makefile.in.in                                  |   320 -
 po/Makevars                                        |    25 -
 po/POTFILES.in                                     |   122 -
 po/Rules-quot                                      |    47 -
 po/boldquot.sed                                    |    10 -
 po/de.gmo                                          |   Bin 401 -> 0 bytes
 po/de.po                                           |  2210 +-
 po/en at boldquot.header                              |    25 -
 po/en at quot.header                                  |    22 -
 po/fr.gmo                                          |   Bin 16596 -> 0 bytes
 po/fr.po                                           |  2440 +-
 po/hu.gmo                                          |   Bin 18765 -> 0 bytes
 po/hu.po                                           |  2709 ++-
 po/insert-header.sin                               |    23 -
 po/it.gmo                                          |   Bin 16846 -> 0 bytes
 po/it.po                                           |  2487 +-
 po/quot.sed                                        |     6 -
 po/remove-potcdate.sin                             |    19 -
 po/sk.gmo                                          |   Bin 18703 -> 0 bytes
 po/sk.po                                           |  2504 +-
 po/sv.gmo                                          |   Bin 11756 -> 0 bytes
 po/sv.po                                           |  2462 +-
 po/trackballs.pot                                  |  2015 +-
 po/updatePo.sh                                     |    22 +
 screen.jpg                                         |   Bin 5354 -> 0 bytes
 share/Makefile.am                                  |     9 -
 share/Makefile.in                                  |   575 -
 share/fonts/FreeSerifBoldItalic.ttf                |   Bin 0 -> 608708 bytes
 share/fonts/Makefile.am                            |     3 -
 share/fonts/Makefile.in                            |   368 -
 share/highScores                                   |   Bin 386 -> 0 bytes
 share/icons/Makefile.am                            |    27 -
 share/icons/Makefile.in                            |   390 -
 share/icons/trackballs-128x128.png                 |   Bin 0 -> 8320 bytes
 share/icons/trackballs-32x32.png                   |   Bin 2253 -> 1827 bytes
 share/icons/trackballs-48x48.png                   |   Bin 3856 -> 2737 bytes
 share/icons/trackballs-512x512.png                 |   Bin 0 -> 35337 bytes
 share/icons/trackballs-64x64.png                   |   Bin 6202 -> 3772 bytes
 share/icons/trackballs.desktop                     |     9 +-
 share/icons/trackballs.desktop.in                  |     8 -
 share/icons/trackballs.svg                         |   109 +
 share/icons/updateIcons.sh                         |    11 +
 share/images/Makefile.am                           |     3 -
 share/images/Makefile.in                           |   368 -
 share/images/blank.png                             |   Bin 0 -> 99 bytes
 share/images/difficulty0.png                       |   Bin 13972 -> 0 bytes
 share/images/difficulty0High.png                   |   Bin 17012 -> 0 bytes
 share/images/difficulty1.png                       |   Bin 16503 -> 0 bytes
 share/images/difficulty1High.png                   |   Bin 19839 -> 0 bytes
 share/images/difficulty2.png                       |   Bin 14410 -> 0 bytes
 share/images/difficulty2High.png                   |   Bin 17499 -> 0 bytes
 share/images/font.png                              |   Bin 50265 -> 0 bytes
 share/images/font.rgb                              |   Bin 110863 -> 0 bytes
 share/images/font2.png                             |   Bin 115123 -> 0 bytes
 share/images/font3.png                             |   Bin 115777 -> 0 bytes
 share/images/levelsetup.png                        |   Bin 9362 -> 0 bytes
 share/images/playersetup.png                       |   Bin 10972 -> 0 bytes
 share/images/water.png                             |   Bin 0 -> 44185 bytes
 share/levels/Makefile.am                           |     3 -
 share/levels/Makefile.in                           |   368 -
 share/levels/Shop1.map                             |   Bin 59644 -> 59393 bytes
 share/levels/Shop1.scm                             |    14 +-
 share/levels/Shop2.map                             |   Bin 60313 -> 59432 bytes
 share/levels/Shop2.scm                             |    26 +-
 share/levels/bonus.map                             |   Bin 60122 -> 60091 bytes
 share/levels/bonus.scm                             |    60 +-
 share/levels/bonusb.map                            |   Bin 64130 -> 63058 bytes
 share/levels/bonusb.scm                            |    40 +-
 share/levels/boot.scm                              |    18 +-
 share/levels/bx.set                                |    12 +-
 share/levels/bx1.map                               |   Bin 149229 -> 64161 bytes
 share/levels/bx1.scm                               |   183 +-
 share/levels/bx2.map                               |   Bin 118523 -> 88544 bytes
 share/levels/bx2.scm                               |   997 +-
 share/levels/bx3.map                               |   Bin 271006 -> 106649 bytes
 share/levels/bx3.scm                               |   522 +-
 share/levels/castle1.map                           |   Bin 61145 -> 60844 bytes
 share/levels/castle1.scm                           |    26 +-
 share/levels/castle2.map                           |   Bin 72877 -> 62055 bytes
 share/levels/castle2.scm                           |    64 +-
 share/levels/castle3.map                           |   Bin 63891 -> 63208 bytes
 share/levels/castle3.scm                           |    66 +-
 share/levels/castle4.map                           |   Bin 67207 -> 61940 bytes
 share/levels/castle4.scm                           |    43 +-
 share/levels/castles.set                           |    16 +-
 share/levels/child.set                             |    10 +-
 share/levels/child1.map                            |   Bin 59847 -> 59821 bytes
 share/levels/child1.scm                            |    12 +-
 share/levels/child2.map                            |   Bin 60481 -> 60259 bytes
 share/levels/child2.scm                            |     8 +-
 share/levels/child3.map                            |   Bin 60842 -> 59463 bytes
 share/levels/child3.scm                            |    10 +-
 share/levels/child4.map                            |   Bin 60200 -> 59830 bytes
 share/levels/child4.scm                            |    36 +-
 share/levels/child5.map                            |   Bin 59689 -> 59658 bytes
 share/levels/child5.scm                            |    30 +-
 share/levels/child6.map                            |   Bin 68450 -> 61945 bytes
 share/levels/child6.scm                            |     8 +-
 share/levels/con1.map                              |   Bin 62373 -> 62033 bytes
 share/levels/con1.scm                              |    16 +-
 share/levels/con2.map                              |   Bin 61661 -> 61429 bytes
 share/levels/con2.scm                              |    14 +-
 share/levels/con3.map                              |   Bin 72869 -> 66968 bytes
 share/levels/con3.scm                              |    56 +-
 share/levels/con4.map                              |   Bin 86507 -> 66930 bytes
 share/levels/con4.scm                              |    46 +-
 share/levels/con5.map                              |   Bin 69042 -> 64900 bytes
 share/levels/con5.scm                              |    27 +-
 share/levels/contrib.set                           |    12 +-
 share/levels/dn.set                                |    10 +-
 share/levels/dn1.map                               |   Bin 59801 -> 59436 bytes
 share/levels/dn1.scm                               |    16 +-
 share/levels/dn2.map                               |   Bin 60163 -> 59566 bytes
 share/levels/dn2.scm                               |    14 +-
 share/levels/dn3.map                               |   Bin 60684 -> 60280 bytes
 share/levels/dn3.scm                               |    18 +-
 share/levels/dn4.map                               |   Bin 60789 -> 59957 bytes
 share/levels/dn4.scm                               |    82 +-
 share/levels/dn5.map                               |   Bin 60113 -> 59652 bytes
 share/levels/dn5.scm                               |    40 +-
 share/levels/dn6.map                               |   Bin 60664 -> 60403 bytes
 share/levels/dn6.scm                               |    80 +-
 share/levels/elite.set                             |    12 +-
 share/levels/elite1.map                            |   Bin 132288 -> 123005 bytes
 share/levels/elite1.scm                            |   138 +-
 share/levels/fourSeasons.set                       |     8 +-
 share/levels/fourSeasons_1.map                     |   Bin 63870 -> 64148 bytes
 share/levels/fourSeasons_1.scm                     |    42 +-
 share/levels/fourSeasons_2.map                     |   Bin 60918 -> 61039 bytes
 share/levels/fourSeasons_2.scm                     |    55 +-
 share/levels/fourSeasons_3.map                     |   Bin 66672 -> 66125 bytes
 share/levels/fourSeasons_3.scm                     |    33 +-
 share/levels/fourSeasons_4.map                     |   Bin 61006 -> 60701 bytes
 share/levels/fourSeasons_4.scm                     |    49 +-
 share/levels/frg.set                               |    15 +-
 share/levels/frg1.map                              |   Bin 83927 -> 60297 bytes
 share/levels/frg1.scm                              |    17 +-
 share/levels/frg10.map                             |   Bin 61198 -> 60686 bytes
 share/levels/frg10.scm                             |    22 +-
 share/levels/frg2.map                              |   Bin 61900 -> 60747 bytes
 share/levels/frg2.scm                              |    35 +-
 share/levels/frg3.map                              |   Bin 62935 -> 61015 bytes
 share/levels/frg3.scm                              |    39 +-
 share/levels/frg4.map                              |   Bin 98955 -> 60436 bytes
 share/levels/frg4.scm                              |    31 +-
 share/levels/frg5.map                              |   Bin 61915 -> 60456 bytes
 share/levels/frg5.scm                              |    54 +-
 share/levels/frg6.map                              |   Bin 63182 -> 61110 bytes
 share/levels/frg6.scm                              |    30 +-
 share/levels/frg7.map                              |   Bin 61782 -> 60235 bytes
 share/levels/frg7.scm                              |    20 +-
 share/levels/frg8.map                              |   Bin 63780 -> 61862 bytes
 share/levels/frg8.scm                              |    48 +-
 share/levels/frg9.map                              |   Bin 63162 -> 61611 bytes
 share/levels/frg9.scm                              |    88 +-
 share/levels/frgb.map                              |   Bin 64552 -> 62233 bytes
 share/levels/frgb.scm                              |   119 +-
 share/levels/hxtst.map                             |   Bin 67777 -> 0 bytes
 share/levels/hxtst.scm                             |   196 -
 share/levels/jump.set                              |    13 +-
 share/levels/jump1.map                             |   Bin 59700 -> 59547 bytes
 share/levels/jump1.scm                             |    10 +-
 share/levels/jump2.map                             |   Bin 62123 -> 61896 bytes
 share/levels/jump2.scm                             |    16 +-
 share/levels/jump3.map                             |   Bin 59515 -> 59464 bytes
 share/levels/jump3.scm                             |    16 +-
 share/levels/jump4.map                             |   Bin 59490 -> 59366 bytes
 share/levels/jump4.scm                             |     4 +-
 share/levels/jump5.map                             |   Bin 59666 -> 59600 bytes
 share/levels/jump5.scm                             |    20 +-
 share/levels/ki.set                                |    12 +-
 share/levels/ki1.map                               |   Bin 59655 -> 59624 bytes
 share/levels/ki1.scm                               |    12 +-
 share/levels/ki2.map                               |   Bin 60201 -> 59959 bytes
 share/levels/ki2.scm                               |    16 +-
 share/levels/ki3.map                               |   Bin 62096 -> 60337 bytes
 share/levels/ki3.scm                               |    18 +-
 share/levels/ki4.map                               |   Bin 62744 -> 61461 bytes
 share/levels/ki4.scm                               |    24 +-
 share/levels/ki5.map                               |   Bin 59704 -> 59701 bytes
 share/levels/ki5.scm                               |    36 +-
 share/levels/lv.set                                |    16 +-
 share/levels/lv1.map                               |   Bin 67194 -> 65145 bytes
 share/levels/lv1.scm                               |   123 +-
 share/levels/lv2.map                               |   Bin 63563 -> 63011 bytes
 share/levels/lv2.scm                               |   102 +-
 share/levels/lv3.map                               |   Bin 61720 -> 61433 bytes
 share/levels/lv3.scm                               |    72 +-
 share/levels/lv4.map                               |   Bin 61325 -> 61485 bytes
 share/levels/lv4.scm                               |    28 +-
 share/levels/lv5.map                               |   Bin 61976 -> 60616 bytes
 share/levels/lv5.scm                               |    26 +-
 share/levels/lv6.map                               |   Bin 69146 -> 60425 bytes
 share/levels/lv6.scm                               |    54 +-
 share/levels/lv7.map                               |   Bin 598464 -> 107578 bytes
 share/levels/lv7.scm                               |    24 +-
 share/levels/lv8.map                               |   Bin 560645 -> 61929 bytes
 share/levels/lv8.scm                               |    48 +-
 share/levels/lv9.map                               |   Bin 66791 -> 65637 bytes
 share/levels/lv9.scm                               |    27 +-
 share/levels/mhm.set                               |    10 +-
 share/levels/mhm1.map                              |   Bin 80016 -> 65317 bytes
 share/levels/mhm1.scm                              |  1295 +-
 share/levels/mhm2.map                              |   Bin 85347 -> 85626 bytes
 share/levels/mhm2.scm                              |   624 +-
 share/levels/mhm3.map                              |   Bin 289615 -> 130632 bytes
 share/levels/mhm3.scm                              |   555 +-
 share/levels/motion1.map                           |   Bin 68776 -> 67903 bytes
 share/levels/motion1.scm                           |    49 +-
 share/levels/motion1.set                           |    10 +-
 share/levels/sl.jpg                                |   Bin 0 -> 39719 bytes
 share/levels/sl.set                                |     8 +
 share/levels/{dn6.map => sl1.map}                  |   Bin 60664 -> 61291 bytes
 share/levels/sl1.scm                               |   187 +
 share/levels/{bonus.map => sl2.map}                |   Bin 60122 -> 63281 bytes
 share/levels/sl2.scm                               |   137 +
 share/levels/{dn5.map => sl3.map}                  |   Bin 60113 -> 60717 bytes
 share/levels/sl3.scm                               |   128 +
 share/levels/{fourSeasons_3.map => sl4.map}        |   Bin 66672 -> 68705 bytes
 share/levels/sl4.scm                               |    57 +
 share/levels/{con1.map => sl5.map}                 |   Bin 62373 -> 75187 bytes
 share/levels/sl5.scm                               |   127 +
 share/levels/{lv9.map => sl6.map}                  |   Bin 66791 -> 67023 bytes
 share/levels/sl6.scm                               |   611 +
 share/levels/test1.map                             |   Bin 59684 -> 0 bytes
 share/levels/tmp.map                               |   Bin 62121 -> 0 bytes
 share/levels/tmp.scm                               |    32 -
 share/music/Makefile.am                            |     3 -
 share/music/Makefile.in                            |   368 -
 share/music/README                                 |    24 +
 share/music/c64revival.ogg                         |   Bin 0 -> 1171425 bytes
 share/music/crazy.ogg                              |   Bin 0 -> 2399424 bytes
 share/music/eurovision.ogg                         |   Bin 0 -> 2502187 bytes
 share/music/fml.html                               |   146 +
 share/music/tb_design.ogg                          |   Bin 0 -> 4440194 bytes
 share/music/tb_genesis.ogg                         |   Bin 0 -> 3297428 bytes
 share/music/tb_hrluebke.ogg                        |   Bin 0 -> 3797917 bytes
 share/music/tb_plinkeplanke.ogg                    |   Bin 0 -> 4612982 bytes
 share/music/tb_schizophrenia.ogg                   |   Bin 0 -> 2601873 bytes
 share/music/tb_sorrow.ogg                          |   Bin 0 -> 2078639 bytes
 share/sfx/Makefile.am                              |     3 -
 share/sfx/Makefile.in                              |   368 -
 share/shaders/basic.frag                           |   129 +
 share/shaders/basic.vert                           |    45 +
 share/shaders/line.frag                            |    27 +
 share/shaders/line.vert                            |    20 +
 share/shaders/object.frag                          |   129 +
 share/shaders/object.vert                          |    41 +
 share/shaders/reflection.frag                      |    77 +
 share/shaders/reflection.vert                      |    29 +
 share/shaders/ui.frag                              |    11 +
 share/shaders/ui.vert                              |    23 +
 share/shaders/water.frag                           |   107 +
 share/shaders/water.vert                           |    40 +
 src/Makefile.am                                    |    49 -
 src/Makefile.in                                    |  1415 --
 src/animated.cc                                    |   104 +-
 src/animated.h                                     |    58 +-
 src/animator.cc                                    |    74 +-
 src/animator.h                                     |    25 +-
 src/baby.cc                                        |    44 +-
 src/baby.h                                         |    12 +-
 src/ball.cc                                        |  2352 +-
 src/ball.h                                         |    89 +-
 src/bird.cc                                        |   234 +-
 src/bird.h                                         |    28 +-
 src/black.cc                                       |   105 +-
 src/black.h                                        |    12 +-
 src/box.cc                                         |    51 -
 src/box.h                                          |    36 -
 src/cactus.cc                                      |   438 +-
 src/cactus.h                                       |    21 +-
 src/calibrateJoystickMode.cc                       |   195 +-
 src/calibrateJoystickMode.h                        |     9 +-
 src/colorModifier.cc                               |   104 +-
 src/colorModifier.h                                |    22 +-
 src/cyclicPlatform.cc                              |    77 +-
 src/cyclicPlatform.h                               |    15 +-
 src/debris.cc                                      |    73 +-
 src/debris.h                                       |    12 +-
 src/diamond.cc                                     |   141 +-
 src/diamond.h                                      |    27 +-
 src/editMode.cc                                    |  2084 +-
 src/editMode.h                                     |    57 +-
 src/editMode_codes.h                               |   221 +-
 src/editWindows.cc                                 |   846 +-
 src/editWindows.h                                  |    66 +-
 src/enterHighScoreMode.cc                          |   131 +-
 src/enterHighScoreMode.h                           |    12 +-
 src/flag.cc                                        |   201 +-
 src/flag.h                                         |    20 +-
 src/font.cc                                        |   854 +-
 src/font.h                                         |   112 +-
 src/forcefield.cc                                  |   145 +-
 src/forcefield.h                                   |    26 +-
 src/fountain.cc                                    |   211 +-
 src/fountain.h                                     |    20 +-
 src/game.cc                                        |   363 +-
 src/game.h                                         |    55 +-
 src/gameHook.cc                                    |    76 +-
 src/gameHook.h                                     |    21 +-
 src/gameMode.cc                                    |    41 +-
 src/gameMode.h                                     |    17 +-
 src/gamer.cc                                       |   302 +-
 src/gamer.h                                        |    22 +-
 src/general.cc                                     |   123 +-
 src/general.h                                      |    94 +-
 src/glHelp.cc                                      |  2083 +-
 src/glHelp.h                                       |   210 +-
 src/goal.cc                                        |   246 +-
 src/goal.h                                         |    17 +-
 src/guile.cc                                       |  2082 +-
 src/guile.cc.x                                     |   142 -
 src/guile.h                                        |    17 +-
 src/heightModifier.cc                              |   206 +-
 src/heightModifier.h                               |    30 +-
 src/helpMode.cc                                    |   299 +-
 src/helpMode.h                                     |    22 +-
 src/highScore.cc                                   |   186 +-
 src/highScore.h                                    |     6 +-
 src/hofMode.cc                                     |   181 +-
 src/hofMode.h                                      |    13 +-
 src/image.cc                                       |   320 -
 src/image.h                                        |    43 -
 src/mainMode.cc                                    |  1120 +-
 src/mainMode.h                                     |    35 +-
 src/map.cc                                         |  2046 +-
 src/map.h                                          |   143 +-
 src/menuMode.cc                                    |   309 +-
 src/menuMode.h                                     |    13 +-
 src/menusystem.cc                                  |   230 +-
 src/menusystem.h                                   |    25 +-
 src/mmad.cc                                        |  1073 +-
 src/modPill.cc                                     |   226 +-
 src/modPill.h                                      |    16 +-
 src/myWindow.cc                                    |   240 +-
 src/myWindow.h                                     |    40 +-
 src/pipe.cc                                        |   174 +-
 src/pipe.h                                         |    32 +-
 src/pipeConnector.cc                               |   116 +-
 src/pipeConnector.h                                |    22 +-
 src/player.cc                                      |   467 +-
 src/player.h                                       |    19 +-
 src/scoreSign.cc                                   |    84 +-
 src/scoreSign.h                                    |    20 +-
 src/settings.cc                                    |   584 +-
 src/settings.h                                     |    31 +-
 src/settingsMode.cc                                |   531 +-
 src/settingsMode.h                                 |    64 +-
 src/setupMode.cc                                   |   583 +-
 src/setupMode.h                                    |    18 +-
 src/sideSpike.cc                                   |   443 +-
 src/sideSpike.h                                    |    23 +-
 src/sign.cc                                        |   190 +-
 src/sign.h                                         |    33 +-
 src/smartTrigger.cc                                |    38 +-
 src/smartTrigger.h                                 |    16 +-
 src/sound.cc                                       |   276 +-
 src/sound.h                                        |    64 +-
 src/sparkle2d.cc                                   |   179 +-
 src/sparkle2d.h                                    |    20 +-
 src/spike.cc                                       |   282 +-
 src/spike.h                                        |    25 +-
 src/splash.cc                                      |   103 +-
 src/splash.h                                       |    13 +-
 src/switch.cc                                      |   194 +-
 src/switch.h                                       |    17 +-
 src/teleport.cc                                    |   302 +-
 src/teleport.h                                     |    23 +-
 src/trampoline.cc                                  |    30 +-
 src/trampoline.h                                   |    11 +-
 src/trigger.cc                                     |    19 +-
 src/trigger.h                                      |    14 +-
 src/weather.cc                                     |   324 +-
 src/weather.h                                      |    16 +-
 trackballs-fedora5.spec                            |    48 -
 450 files changed, 33584 insertions(+), 78384 deletions(-)

diff --cc debian/changelog
index e4c19fc,0000000..4ee35cc
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,281 -1,0 +1,318 @@@
++trackballs (1.2.3-1) unstable; urgency=medium
++
++  * New maintainer: Debian Games Team with the consent of Ari Pollak.
++    Add myself to Uploaders.
++  * New upstream version 1.2.3. (Closes: #868983)
++    - Fixes segmentation faults. The game is usable again. (Closes: #839788)
++    - The game uses SDL2 now which provides much better fullscreen support
++      and switching to different resolutions should not crash the X server
++      anymore. (Closes: #306998)
++    - We build-depend on zlib1g-dev now. (Closes: #672946)
++    - The Slovak PO file declares and uses UTF-8 now. (Closes: #621709)
++  * Switch to compat level 10.
++  * wrap-and-sort -sa.
++  * Declare compliance with Debian Policy 4.0.0.
++  * Homepage field: Point to the new fork of trackballs at github.com.
++  * Move the package to Git.
++  * Drop deprecated menu file and xpm icon.
++  * Switch from SDL1 to SDL2. New build-dependencies zlib1g-dev, gettext. New
++    build system CMake.
++  * Drop all patches. No longer needed.
++  * Clean up debian/rules. Add get-orig-source target.
++  * Don't recommend trackballs-music anymore because the music files are
++    included now.
++  * Remove the paragraph of the package description that mentions the obsolete
++    trackballs-music package.
++  * Drop postrm file.
++  * Add Breaks and Replaces relation for trackballs-music.
++  * Update debian/copyright to copyright format 1.0.
++  * Add manpage.patch and fix some spelling mistakes and the Lintian warning
++    bad whatis entry.
++  * trackballs-data: Depend on fonts-freefont-ttf and symlink the font file to
++    Debian's system package.
++  * Add no-execstring.patch and remove the unnecessary Exec string from
++    trackballs.desktop.
++
++ -- Markus Koschany <apo at debian.org>  Fri, 28 Jul 2017 00:11:52 +0200
++
 +trackballs (1.1.4-4.3) unstable; urgency=medium
 +
 +  * Non-maintainer upload.
 +  * Add gcc6.patch and fix FTBFS with GCC-6. (Closes: #831119)
 +  * Provide a new trackballs.xpm icon for menu file.
 +    Converted from share/icons/trackballs-32x32.png. (Closes: #420727)
 +  * Add and install trackballs.desktop file.
 +    Thanks to Stefan Potyra for the initial patch. (Closes: #414651)
 +  * Add german-translations.patch.
 +    Thanks to Erik Pfannenstein for the report and patch. (Closes: #598517)
 +  * Fix installation path for arch-independent files like icons and locales
 +    to /usr/share as appropriate.
 +  * Add debian/clean and ensure that the game can be built twice in a row.
 +  * Drop -dbg package and use the automatic -dbgsym package instead.
 +  * Delete empty directories and do not install them.
 +  * Switch to compat level 10.
 +  * d/control: Remove duplicate Section field from binary packages.
 +  * Remove dirs file. It is obsolete.
 +
 + -- Markus Koschany <apo at debian.org>  Tue, 04 Oct 2016 21:11:56 +0200
 +
 +trackballs (1.1.4-4.2) unstable; urgency=medium
 +
 +  * Non-maintainer upload.
 +  * Update source for guile-2.0.
 +    Add these patches:
 +      0002-lv1.scm-move-illegal-expression-context-define-to-th.patch
 +      0003-Port-to-Guile-2.0.patch
 +      0004-icons-Makefile.am-prepend-DESTDIR-to-iconsdir-here-t.patch
 +      0005-po-Makefile.in.in-set-mkinstalldirs-to-install-d.patch
 +  * Change build-dep to guile-2.0-dev. (Closes: 746011)
 +  * Migrate to debhelper 9
 +  * Delete automatically generated upstream files.  Add
 +    0006-Delete-automatically-generated-upstream-files.patch to handle the
 +    removals.
 +  * Add dh-autoreconf build-dep.
 +
 + -- Rob Browning <rlb at defaultvalue.org>  Tue, 26 Jan 2016 21:39:58 -0600
 +
 +trackballs (1.1.4-4.2~1.gbp940fd0) UNRELEASED; urgency=medium
 +
 +  ** SNAPSHOT build @940fd0a287d81a72e4e2154aae0e161131c9a841 **
 +
 +  * Non-maintainer upload.
 +  * Import trackballs 1.1.4-4.1
 +
 + -- Rob Browning <rlb at defaultvalue.org>  Mon, 25 Jan 2016 22:51:45 -0600
 +
 +trackballs (1.1.4-4.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Update build dependencies. (Closes: #629794)
 +  * debian/control: Add ${misc:Depends}.
 +  * debian/control: Change Section for trackballs-dbg from games to debug.
 +
 + -- Ansgar Burchardt <ansgar at debian.org>  Wed, 28 Dec 2011 13:17:39 +0100
 +
 +trackballs (1.1.4-4) unstable; urgency=low
 +
 +  * Remove MimeType in .desktop.in file so nautilus doesn't try to open
 +    scripts with trackballs (Closes: #457331)
 +
 + -- Ari Pollak <ari at debian.org>  Sun, 30 Dec 2007 16:39:03 -0500
 +
 +trackballs (1.1.4-3) unstable; urgency=low
 +
 +  * Make trackballs-dbg not recommend trackballs-music anymore
 +    (Closes: #455597)
 +
 + -- Ari Pollak <ari at debian.org>  Mon, 17 Dec 2007 13:08:01 -0500
 +
 +trackballs (1.1.4-2) unstable; urgency=low
 +
 +  * Install .desktop file to /usr/share/applications (Closes: #414651)
 +
 + -- Ari Pollak <ari at debian.org>  Wed, 27 Jun 2007 19:45:46 -0400
 +
 +trackballs (1.1.4-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Take out --disable-nls (Closes: #421601)
 +
 + -- Ari Pollak <ari at debian.org>  Sat, 26 May 2007 23:30:35 -0400
 +
 +trackballs (1.1.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Ari Pollak <ari at debian.org>  Sun,  6 Aug 2006 14:38:52 -0400
 +
 +trackballs (1.1.1-4) unstable; urgency=medium
 +
 +  * Change build-dep from xlibmesa-glu-dev to libglu1-xorg-dev (Closes: #379716)
 +
 + -- Ari Pollak <ari at debian.org>  Thu, 27 Jul 2006 21:30:42 -0400
 +
 +trackballs (1.1.1-3) unstable; urgency=low
 +
 +  * Remove "boxofun" level since it's not in upstream CVS anymore anyway
 +    (Closes: #250110)
 +  * Disable the SDL parachute, which was preventing proper coredumps.
 +    It's kind of hard to run GL apps under gdb while
 +    some drivers depend on signal handlers to work as normal.
 +
 + -- Ari Pollak <ari at debian.org>  Fri, 27 Jan 2006 11:06:42 -0500
 +
 +trackballs (1.1.1-2) unstable; urgency=low
 +
 +  * Add versioned dependency on binutils since we now use dh_strip
 +    --dbg-package
 +
 + -- Ari Pollak <ari at debian.org>  Tue, 15 Nov 2005 13:45:58 -0500
 +
 +trackballs (1.1.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Don't run trackballs as gid games anymore, thanks to the upstream
 +    authors who now allow easy storing of the high-score file 
 +    in users' home directories. (Closes: #302454)
 +  * Add trackballs-dbg package which includes debugging symbols
 +  * Fix a serious bug that prevented 1.1.0 from starting
 +    under some X DRI drivers
 +
 + -- Ari Pollak <ari at debian.org>  Tue, 15 Nov 2005 10:05:02 -0500
 +
 +trackballs (1.1.0-2) experimental; urgency=low
 +
 +  * Don't bother running the script to install a GNOME .desktop file
 +    since it doesn't work anyway
 +
 + -- Ari Pollak <ari at debian.org>  Sun,  8 May 2005 19:13:05 -0400
 +
 +trackballs (1.1.0-1) experimental; urgency=low
 +
 +  * New upstream release.
 +    - Upload for experimental so we don't affect the security fix from 1.0.0-9
 +      going into sarge.
 +    - configure with --disable-nls, gettext support is kind of broken right
 +      now and there haven't really been any translations yet.
 +    - Change some functions in src/{menusystem,font}.{cc,h} from accepting
 +      char* to const char*, so it will build with gettext support disabled.
 +      Committed fixes upstream.
 +
 + -- Ari Pollak <ari at debian.org>  Fri,  4 Mar 2005 21:07:05 -0500
 +
 +trackballs (1.0.0-8) unstable; urgency=low
 +
 +  * Apply modified patch from Ulf Harnhammar to prevent a crash when
 +    the environment variable USER=%n%n%n%n%n or similar. (Closes: #297646)
 +
 + -- Ari Pollak <ari at debian.org>  Wed,  2 Mar 2005 01:48:41 -0500
 +
 +trackballs (1.0.0-7) unstable; urgency=low
 +
 +  * Apply modified patch from Steve Kemp to fix buffer overflows
 +    (Closes: #289942)
 +
 + -- Ari Pollak <ari at debian.org>  Fri, 14 Jan 2005 12:54:41 -0500
 +
 +trackballs (1.0.0-6) unstable; urgency=low
 +
 +  * Oops, forgot 2 out of the 4 int->longs. (Closes: #289452)
 +
 + -- Ari Pollak <ari at debian.org>  Mon, 10 Jan 2005 11:49:13 -0500
 +
 +trackballs (1.0.0-5) unstable; urgency=low
 +
 +  * Apply patch from Andreas Jochens to fix compile error on amd64/gcc-4.0
 +    (Closes: #289452)
 +
 + -- Ari Pollak <ari at debian.org>  Sun,  9 Jan 2005 13:06:49 -0500
 +
 +trackballs (1.0.0-4) unstable; urgency=low
 +
 +  * Fix build dependencies on libgl-dev and libglu-dev to prefer xlibmesa
 +  * Apply tiny patch from upstream bug report to fix ball
 +    initialization (Closes: #289203)
 +
 + -- Ari Pollak <ari at debian.org>  Fri,  7 Jan 2005 16:00:30 -0500
 +
 +trackballs (1.0.0-3) unstable; urgency=low
 +
 +  * Fix conflicts/replaces (Closes: #234463)
 +
 + -- Ari Pollak <ari at debian.org>  Mon, 23 Feb 2004 19:46:45 -0500
 +
 +trackballs (1.0.0-2) unstable; urgency=low
 +
 +  * Split most of /usr/share into -data package (Closes: #233451)
 +
 + -- Ari Pollak <ari at debian.org>  Tue, 17 Feb 2004 23:01:04 -0500
 +
 +trackballs (1.0.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Ari Pollak <ari at debian.org>  Mon,  9 Feb 2004 21:34:48 -0500
 +
 +trackballs (0.9.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Ari Pollak <ari at debian.org>  Tue,  6 Jan 2004 02:21:49 -0500
 +
 +trackballs (0.9.1-1) unstable; urgency=low
 +
 +  * New upstream release (Closes: #185361)
 +
 + -- Ari Pollak <ari at debian.org>  Wed, 24 Sep 2003 11:03:14 -0400
 +
 +trackballs (0.9.0-6) unstable; urgency=low
 +
 +  * Run automake so the autobuilders don't have to
 +
 + -- Ari Pollak <ari at debian.org>  Tue, 22 Apr 2003 23:51:27 -0400
 +
 +trackballs (0.9.0-5) unstable; urgency=low
 +
 +  * Don't include highscores file in package, but create it in
 +    /var/games/trackballs and remove it on purge
 +    (Addresses comment in bug #185075)
 +
 + -- Ari Pollak <ari at debian.org>  Mon, 21 Apr 2003 21:02:59 -0400
 +
 +trackballs (0.9.0-4) unstable; urgency=low
 +
 +  * Fix permissions on highscores file (again) (Closes: #185075)
 +
 + -- Ari Pollak <ari at debian.org>  Sat, 12 Apr 2003 18:06:18 -0400
 +
 +trackballs (0.9.0-3) unstable; urgency=low
 +
 +  * Rebuild against libsdl-ttf2.0
 +
 + -- Ari Pollak <ari at debian.org>  Fri, 11 Apr 2003 16:38:08 -0400
 +
 +trackballs (0.9.0-2) unstable; urgency=low
 +
 +  * Don't use a menu icon (Closes: #187841)
 +
 + -- Ari Pollak <ari at debian.org>  Sun,  6 Apr 2003 12:25:16 -0400
 +
 +trackballs (0.9.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Ari Pollak <ari at debian.org>  Fri,  4 Apr 2003 16:11:09 -0500
 +
 +trackballs (0.8.99+cvs20030322-1) unstable; urgency=low
 +
 +  * New CVS release, lots of gameplay fixes
 +  * Fix #185075 again from switching paths to the shared directory
 +
 + -- Ari Pollak <ari at debian.org>  Sat, 22 Mar 2003 23:11:17 -0500
 +
 +trackballs (0.8.0+cvs20030317-1) unstable; urgency=low
 +
 +  * New CVS release (And the year isn't 2002. Whoops.)
 +  * Keep permissions on highScores file writable by games group
 +    (Closes: #185075)
 +
 + -- Ari Pollak <ari at debian.org>  Mon, 17 Mar 2003 12:26:27 -0500
 +
 +trackballs (0.8.0+cvs20020313-1) unstable; urgency=low
 +
 +  * New interim release from CVS
 +  * Fix a few possible buffer overflows - submitted patch upstream, 
 +    thanks to Steve Kemp for providing part of the  patch. If you find any more 
 +    possible crashes/vulnerabilities (since it does use OpenGL which can 
 +    speak directly to the video hardware, there is the possibility for 
 +    something bad happening), feel free to let me know as I now have 
 +    upstream CVS access. (Closes: #184478)
 +  * Move game to /usr/games, be consistent
 +
 + -- Ari Pollak <ari at debian.org>  Sat, 15 Mar 2003 01:28:12 -0500
 +
 +trackballs (0.8.0-1) unstable; urgency=low
 +
 +  * Initial Release. (Closes: #173210)
 +
 + -- Ari Pollak <ari at debian.org>  Fri,  7 Mar 2003 09:34:12 -0500
diff --cc debian/compat
index ec63514,0000000..f599e28
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 9
++10
diff --cc debian/control
index 11ce943,0000000..ba98e97
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,44 -1,0 +1,53 @@@
 +Source: trackballs
 +Section: games
 +Priority: extra
- Maintainer: Ari Pollak <ari at debian.org>
- Build-Depends: debhelper (>= 9),
-   binutils (>= 2.12.90.0.9),
-   dh-autoreconf,
-   guile-2.0-dev,
-   libgl1-mesa-dev | libgl-dev,
-   libglu1-mesa-dev | libglu-dev,
-   libsdl1.2-dev,
-   libsdl-ttf2.0-dev,
-   libsdl-mixer1.2-dev,
-   libsdl-image1.2-dev
- Standards-Version: 3.7.3
- Homepage: http://trackballs.sf.net
++Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
++Uploaders:
++ Markus Koschany <apo at debian.org>
++Build-Depends:
++ cmake,
++ debhelper (>= 10),
++ guile-2.0-dev,
++ libsdl2-dev,
++ libsdl2-image-dev,
++ libsdl2-ttf-dev,
++ libsdl2-mixer-dev,
++ zlib1g-dev,
++ gettext
++Standards-Version: 4.0.0
++Homepage: https://trackballs.github.io/
++Vcs-Git: https://anonscm.debian.org/git/pkg-games/trackballs.git
++Vcs-Browser: https://anonscm.debian.org/git/pkg-games/trackballs.git
 +
 +Package: trackballs
 +Architecture: any
- Depends: trackballs-data, ${shlibs:Depends}, ${misc:Depends}
- Recommends: trackballs-music
- Description: An OpenGL-based game of marbles through a labyrinth
++Depends:
++ trackballs-data,
++ ${misc:Depends},
++ ${shlibs:Depends}
++Description: OpenGL-based game of steering a marble through a labyrinth
 + Trackballs is a simple game similar to the classical game Marble Madness
 + on the Amiga in the 80's. By steering a marble ball through a labyrinth
 + filled with vicious hammers, pools of acid and other obstacles the
 + player collects points. When the ball reaches the destination it continues
 + at the next, more difficult level - unless the time runs out.
 + .
 + This game is not intended to be a replica of Marble Madness but rather
 + inspired by it. The game is also highly configurable by using a
 + scripting extension (Guile) and it provides a simple editor by which new
 + levels can easily be created.
-  .
-  Install the trackballs-music package for a soundtrack to be played during
-  gameplay. For more information and screenshots of the game please see
-  <http://trackballs.sourceforge.net>.
 +
 +Package: trackballs-data
 +Architecture: all
- Depends: ${misc:Depends}
- Enhances: trackballs
++Depends:
++ fonts-freefont-ttf,
++ ${misc:Depends}
++Enhances:
++ trackballs
++Breaks:
++ trackballs-music (<< 1.2.2-1)
++Replaces:
++ trackballs-music (<< 1.2.2-1)
 +Description: Data files for trackballs
 + This package contains the necessary architecture-independent data files
 + needed for running trackballs.
diff --cc debian/copyright
index 606080d,0000000..b656991
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,11 -1,0 +1,194 @@@
- This package was debianized by Ari Pollak <ari at debian.org> on
- Thu,  6 Feb 2003 00:17:15 -0500.
++Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: Trackballs
++Source: https://github.com/trackballs/trackballs
 +
- It was downloaded from <http://www.lysator.liu.se/~mbrx/trackballs/>
++Files: *
++Copyright: Mathias Broxvall    project founder and administrator
++           Dietrich Radel      graphics, music, levels, documentation, bugs etc.
++           Yannick Perret      extra coder:~
++           Samuel Listopad
++           Benoit Rouits       sounds
++           Joshua Harding      sounds
++           Rusty Johnson       sounds
++           Bob Bailey          sounds
++           Warren D.Ober       sounds
++           Marco Göbel         music
++           Attila Boros        music
++           Primoz Peterlin     fonts
++           See also AUTHORS.md in the source package for more information
++License: GPL-2+
 +
- Upstream Author: Mathias Broxvall <matbr at home.se>
++Files: share/music/c64revival.ogg
++       share/music/crazy.ogg
++       share/music/eurovision.ogg
++Copyright: 2007, Paul Leach
++License: ETHYMONICS-FREE-MUSIC-LICENSE
 +
- Copyright:
++Files: debian/*
++Copyright: 2003-2007, Ari Pollak <ari at debian.org>
++           2011,      Ansgar Burchardt <ansgar at debian.org>
++           2016,      Rob Browning <rlb at defaultvalue.org>
++           2016-2017, Markus Koschany <apo at debian.org>
++License: GPL-2+
++
++License: GPL-2+
++ On Debian systems the complete text of the GNU General Public License 2 can be
++ found at /usr/share/common-licenses/GPL-2.
++
++License: ETHYMONICS-FREE-MUSIC-LICENSE
++                        ETHYMONICS FREE MUSIC LICENSE
++ .
++                           Version 1, August 2000
++ .
++                   Copyright (C) 2000, Ethymonics Limited
++ .
++   Everyone is permitted to copy and distribute verbatim copies of this
++   license document, but changing it is not allowed.
++ .
++                                  Preamble
++ .
++   The licenses for most musical works are designed to take away your
++   freedom to share the music. By contrast, this Free Music License is
++   intended to guarantee your freedom to make copies of a piece of music,
++   and charge for this service if you wish. Recipients of those copies
++   have the same freedom. The word "Free" in "Free Music License" means
++   the freedom to make copies. It does not mean that those copies cannot
++   then be sold.
++ .
++   This license is designed to protect and pass on the right to make
++   copies to whoever receives a copy. This encourages wide distribution on
++   the artist's behalf. You can apply this license to your own music too.
++ .
++   To protect the right to copy the music, it is necessary to pass on
++   certain requirements that must be followed when the music is copied or
++   distributed. For example, if you distribute a piece of music subject to
++   this license, even if this is done for a fee, you must give the
++   recipients all the rights that you have. You must show them these terms
++   so that they know their rights.
++ .
++   The freedom to copy is protected by two things: (1) Copyright of the
++   music, and (2) This license that provides legal permission to copy and
++   distribute the music.
++ .
++   The precise terms and conditions for copying, distribution and
++   performance follow.
++ .
++                             FREE MUSIC LICENSE
++ .
++       TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND PERFORMANCE
++ .
++   1. This License applies to any musical work or other type of work which
++   has a notice placed by the copyright holder saying that it may be
++   distributed under the terms of this Free Music License. The "Music",
++   below, refers to any such music or work, whether in a recording,
++   performance or other form of musical representation, or any derivative
++   work under copyright law: that is to say, a work, in any medium,
++   containing the Music or a portion of it, either unaltered, modified and
++   or re-performed.
++ .
++   You may play or perform the Music publicly, for example in a broadcast,
++   provided that you make available to listeners the title of the work and
++   the name of the Artist. A recording made as a result of the Music being
++   played or performed is covered by this License when its contents
++   constitute a work based on the Music. If a listener wishes to make
++   copies of such a recording, the terms and conditions of this License
++   must be made available to them, along with any other information
++   required to make and distribute copies according to the terms and
++   conditions of this License.
++ .
++   2. You may copy and distribute copies of the Music as you receive it,
++   in any medium, provided that you:
++ .
++   (a) conspicuously and appropriately publish on each copy an appropriate
++   copyright notice;
++ .
++   (b) keep intact all the notices that refer to this License;
++ .
++   (c) supply, with each copy of the Music, all significant information
++   about the Music, including the title of the work, the name of the
++   artist, and the names and roles of all credited personnel;
++ .
++   (d) supply, to each recipient of the Music, along with the Music,
++   either a copy of this License or a clearly visible URL that lets the
++   recipient know where to find a copy of this License on the Internet.
++ .
++   If the information required by (a) to (d) above is not available, for
++   example when the Music has been received by making a recording of a
++   performance, then this information must be obtained independently and
++   no copies can be made or distributed without this information being
++   included with each copy of the Music.
++ .
++   You may, at your option, charge a fee for the act of supplying a copy
++   of the Music.
++ .
++   3. You may not copy, distribute, perform or sub-license the Music
++   except as expressly provided under this License. Any attempt to
++   otherwise do so is void, and will automatically terminate your rights
++   under this License. However, parties who have received copies, or
++   rights, from you under this License will not have their Licenses
++   terminated as long as such parties remain in full compliance.
++ .
++   4. You are not required to accept this License, since you have not
++   signed it. However, nothing else grants you permission to copy,
++   distribute, play or perform the Music or any of its derivative works.
++   Therefore, by copying, distributing, playing or performing the Music,
++   or any of its derivative works, you indicate your acceptance of this
++   License to do so, and all of its terms and conditions.
++ .
++   5. Each time you redistribute the Music the recipient automatically
++   receives a license from the original licensor to copy, distribute, play
++   and or perform the Music subject to the terms and conditions of this
++   License. You may not impose any further restrictions on the recipient's
++   exercise of the rights granted herein. You are not responsible for
++   enforcing compliance by third parties to this License.
++ .
++   6. If, as a consequence of a court judgment or allegation of copyright
++   infringement or for any reason (not limited to copyright issues),
++   conditions are imposed on you (whether by court order, agreement or
++   otherwise) that contradict the conditions of this License, they do not
++   excuse you from the conditions of this License. If you cannot satisfy
++   simultaneously your obligations under this License and any other
++   pertinent obligations, then your rights under this License are
++   terminated. For example, if an existing agreement would not permit
++   royalty-free redistribution of the Music by all those who receive
++   copies directly or indirectly through you, then the only way to satisfy
++   both it and this License would be to refrain entirely from
++   redistributing the Music.
++ .
++   If any portion of this section is held invalid or unenforceable under
++   any particular circumstance, the balance of the section is intended to
++   apply and the section as a whole is intended to apply in other
++   circumstances.
++ .
++   It is not the purpose of this section to induce you to infringe any
++   copyright or other property right claims or to contest validity of any
++   such claims; this section has the sole purpose of protecting the
++   integrity of a music distribution system, which is implemented by
++   copyright and license practices.
++ .
++   7. If an activity permitted by this License is restricted in certain
++   countries either for copyright or other reasons, the original copyright
++   holder who places the Music under this License may add an explicit
++   geographical distribution limitation excluding those countries, so that
++   distribution is permitted only in or among countries not thus excluded.
++   In such cases, this License incorporates the limitation as if written
++   in the body of this License.
++ .
++   8. Ethymonics may publish revised and or new versions of the Free Music
++   License from time to time. Such new versions will be similar in spirit
++   to the present version, but may differ in detail to address new
++   problems as they arise.
++ .
++   Each License is given a distinguishing version number. If the Music
++   specifies a version number of this License which applies to it, and
++   "any later version", you have the option of following the terms and
++   conditions either of that version or any later version published by
++   Ethymonics. If the Music does not specify a version number of this
++   License, you may choose any version ever published by Ethymonics.
++ .
++   9. If you wish to incorporate parts of the Music into another work
++   whose distribution conditions are different, write to the composer to
++   ask for permission.
++ .
++                          END OF FREE MUSIC LICENSE
 +
- Game and all data/sounds/music are licensed under the GPL.
- On Debian systems, it is available at: /usr/share/common-licenses/GPL.
diff --cc debian/patches/manpage.patch
index 0000000,0000000..9f21bb1
new file mode 100644
--- /dev/null
+++ b/debian/patches/manpage.patch
@@@ -1,0 -1,0 +1,106 @@@
++From: Markus Koschany <apo at debian.org>
++Date: Fri, 28 Jul 2017 00:48:09 +0200
++Subject: manpage
++
++---
++ share/trackballs.6 | 58 +++++++++++++++++++++++++-----------------------------
++ 1 file changed, 27 insertions(+), 31 deletions(-)
++
++diff --git a/share/trackballs.6 b/share/trackballs.6
++index 0db8026..2598051 100644
++--- a/share/trackballs.6
+++++ b/share/trackballs.6
++@@ -1,13 +1,9 @@
++ .\" This man page is a consise summary of Trackballs. Full documentation for the game and the editor can be found in the README.html file included in this package.
++ .TH "trackballs" "6" "" "Mathias Broxwall" "Games"
++ .SH "NAME"
++-.LP 
++-/trackballs/
++-
++-.br 
++-A marble game for Linux that is similiar to the classic arcade game 'Marble Madness'.
+++Trackballs \- marble game similar to the classic arcade game 'Marble Madness'
++ .SH "SYNTAX"
++-.LP 
+++.LP
++ trackballs [\-w, \-m] [\-e, \-l <level>] [\-r <width>] ...
++ 
++   \-h  \-\-help         Display this usage information.
++@@ -21,52 +17,52 @@ trackballs [\-w, \-m] [\-e, \-l <level>] [\-r <width>] ...
++ 
++ The last 5 options are all but obsolete as these can now be accessed through the games menu system.
++ .SH "DESCRIPTION"
++-.LP 
++-Trackballs is a simple game similar to the classic Atari 1980's arcade game 'Marble Madness' (later released by Electronic Arts for the Amiga and other platforms). 
+++.LP
+++Trackballs is a simple game similar to the classic Atari 1980's arcade game 'Marble Madness' (later released by Electronic Arts for the Amiga and other platforms).
++ 
++-By steering a marble ball through a labyrinth filled with vicious hammers, pools of acid and other obstacles the player collects points. When the ball reaches the destination it continues to the next, more difficult track \- unless the time runs out. 
+++By steering a marble ball through a labyrinth filled with vicious hammers, pools of acid and other obstacles the player collects points. When the ball reaches the destination it continues to the next, more difficult track \- unless the time runs out.
++ 
++-It should be noted that this game is _not_ intended to be a replica of Marble Madness but rather merely inspired by it. For instance the game uses 3D graphics even though the original game had no real use for it. Also we aim at making the game highly configurable by a scripting extension (Guile) and provide a simple editor by which new levels easily can be created. 
+++It should be noted that this game is _not_ intended to be a replica of Marble Madness but rather merely inspired by it. For instance the game uses 3D graphics even though the original game had no real use for it. Also we aim at making the game highly configurable by a scripting extension (Guile) and provide a simple editor by which new levels easily can be created.
++ .SH "FILES"
++-.LP 
++-Binary:				/usr/local/bin/trackballs
++-.br 
++-Shared files directory:	/usr/local/share/trackballs/
++-.br 
++-Settings directory:		~/.trackballs/
+++.LP
+++Binary: trackballs
+++.br
+++Shared files directory: /usr/local/share/trackballs/ or /usr/share/trackballs or /usr/share/games/trackballs
+++.br
+++Settings directory: ~/.trackballs/
++ .SH "ENVIRONMENT VARIABLES"
++-.LP 
++-.TP 
+++.LP
+++.TP
++ \fBGUILE_LOAD_PATH\fP
++ Specifies the directory where the guile files are
++ .SH "EXAMPLES"
++-.LP 
+++.LP
++ To run this program the standard way type:
++-.LP 
+++.LP
++     trackballs
++-.LP 
++-Alternativly you edit a level using this command:
++-.LP 
+++.LP
+++Alternatively you edit a level using this command:
+++.LP
++     trackballs \-e steep
++-.LP 
++-Alternativly you can test a level with:
++-.LP 
+++.LP
+++Alternatively you can test a level with:
+++.LP
++     trackballs \-l steep
++ .SH "AUTHOR"
++-.LP 
+++.LP
++ Mathias Broxvall <matbr at home.se>
++ 
++ 
++ .SH "CONTRIBUTORS"
++ Music and UI Graphics \- Dietrich Radel <radel at inet.net.nz>
++-.br 
+++.br
++ Sound Effects \- Beno�t Rouits <brouits at free.fr>
++ 
++ Packagers:
++-.br 
+++.br
++ Mandrake \- Guillaume Bedot <guillaume.bedot at wanadoo.fr>
++-.br 
+++.br
++ Debian \- Ari Pollak <ari at debian.org>
++ .SH "SEE ALSO"
++-.LP 
+++.LP
++ Full documentation for the game and the editor can be found in the README.html file included in this package.
diff --cc debian/patches/no-execstring.patch
index 0000000,0000000..9bc6769
new file mode 100644
--- /dev/null
+++ b/debian/patches/no-execstring.patch
@@@ -1,0 -1,0 +1,27 @@@
++From: Markus Koschany <apo at debian.org>
++Date: Fri, 28 Jul 2017 01:14:39 +0200
++Subject: no execstring
++
++The execstring is not necessary in trackballs.desktop.
++---
++ CMakeLists.txt | 6 ++----
++ 1 file changed, 2 insertions(+), 4 deletions(-)
++
++diff --git a/CMakeLists.txt b/CMakeLists.txt
++index a64a444..78f6b48 100644
++--- a/CMakeLists.txt
+++++ b/CMakeLists.txt
++@@ -100,11 +100,9 @@ endforeach()
++ install(FILES ${PROJECT_SOURCE_DIR}/share/icons/trackballs.svg
++         DESTINATION ${TRACKBALLS_SHARE}/../icons/hicolor/scalable/apps/)
++ 
++-add_custom_command(OUTPUT execstring
++-                  COMMAND echo "Exec=${CMAKE_INSTALL_PREFIX}/bin/trackballs" > execstring)
++ add_custom_command(OUTPUT trackballs.desktop
++-                  COMMAND cat ${PROJECT_SOURCE_DIR}/share/icons/trackballs.desktop execstring > ${CMAKE_CURRENT_BINARY_DIR}/trackballs.desktop
++-                  DEPENDS ${PROJECT_SOURCE_DIR}/share/icons/trackballs.desktop execstring)
+++                  COMMAND cat ${PROJECT_SOURCE_DIR}/share/icons/trackballs.desktop > ${CMAKE_CURRENT_BINARY_DIR}/trackballs.desktop
+++                  DEPENDS ${PROJECT_SOURCE_DIR}/share/icons/trackballs.desktop )
++ add_custom_target(desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/trackballs.desktop)
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/trackballs.desktop DESTINATION ${TRACKBALLS_SHARE}/../applications)
++ 
diff --cc debian/patches/series
index b724ae6,0000000..76b3228
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,0 +1,2 @@@
- 0001-changes-in-trackballs_1.1.4-4.1.diff.gz.patch
- 0002-lv1.scm-move-illegal-expression-context-define-to-th.patch
- 0003-Port-to-Guile-2.0.patch
- 0004-icons-Makefile.am-prepend-DESTDIR-to-iconsdir-here-t.patch
- 0005-po-Makefile.in.in-set-mkinstalldirs-to-install-d.patch
- 0006-Delete-automatically-generated-upstream-files.patch
- gcc6.patch
- german-translations.patch
++manpage.patch
++no-execstring.patch
diff --cc debian/rules
index b288715,0000000..f2e8600
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,30 -1,0 +1,17 @@@
 +#!/usr/bin/make -f
- 
- # Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
- export DEB_CFLAGS_MAINT_APPEND := -fpermissive
- export DEB_CXXFLAGS_MAINT_APPEND := $(DEB_CFLAGS_MAINT_APPEND)
- export DEB_BUILD_MAINT_OPTIONS := hardening=-format
- 
 +%:
- 	dh $@ --with autoreconf
- 
- override_dh_autoreconf:
- 	dh_autoreconf --as-needed
++	dh $@
 +
 +override_dh_auto_configure:
- 	dh_auto_configure -- --bindir=\$${prefix}/games \
- 	  --datadir=\$${prefix}/share/games --with-highscores=~
- 
- # Still need to adjust po/Makefile.in.in to set mkinstalldirs to "install -d"
++	dh_auto_configure -- \
++		-DCMAKE_VERBOSE_MAKEFILE=ON \
++		-DTRACKBALLS_SHARE_DIR=/usr/share/games/trackballs \
++		-DTRACKBALLS_HIGHSCORES_DIR=~
 +
- override_dh_auto_install:
- 	dh_auto_install - \
- 	  iconsdir=/usr/share/icons/hicolor \
- 	  desktopdir=/usr/share/applications
- 	$(RM) debian/tmp/usr/share/games/applications/trackballs.desktop
- 	find debian/tmp -type d -empty -delete
++override_dh_missing:
++	dh_missing --list-missing
 +
- override_dh_install:
- 	dh_install --fail-missing
++get-orig-source:
++	uscan --download-current-version --force-download
diff --cc debian/trackballs-data.install
index 81df07f,0000000..57ced1a
mode 100644,000000..100644
--- a/debian/trackballs-data.install
+++ b/debian/trackballs-data.install
@@@ -1,4 -1,0 +1,4 @@@
- /usr/share/games/icons usr/share
- /usr/share/games/locale usr/share
- /usr/share/games/trackballs
- debian/trackballs.xpm usr/share/pixmaps
++usr/share/locale
++usr/share/games/trackballs
++usr/share/games/applications usr/share
++usr/share/games/icons usr/share
diff --cc debian/trackballs-data.links
index 0000000,0000000..9031e53
new file mode 100644
--- /dev/null
+++ b/debian/trackballs-data.links
@@@ -1,0 -1,0 +1,1 @@@
++usr/share/fonts/truetype/freefont/FreeSerifBoldItalic.ttf usr/share/games/trackballs/fonts/FreeSerifBoldItalic.ttf
diff --cc debian/trackballs-data.lintian-overrides
index 0000000,0000000..7b164d9
new file mode 100644
--- /dev/null
+++ b/debian/trackballs-data.lintian-overrides
@@@ -1,0 -1,0 +1,2 @@@
++# trackballs depends on trackballs-data, so there should be nothing to warn about
++trackballs-data: desktop-command-not-in-package
diff --cc debian/trackballs.install
index d9ddb74,0000000..bb8ec79
mode 100644,000000..100644
--- a/debian/trackballs.install
+++ b/debian/trackballs.install
@@@ -1,3 -1,0 +1,2 @@@
- /usr/games/trackballs
- /usr/share/man
- debian/trackballs.desktop usr/share/applications
++usr/bin/trackballs usr/games
++usr/man usr/share
diff --cc debian/watch
index 536dba7,0000000..e71c0bb
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,3 @@@
- version=3
- http://sf.net/trackballs/trackballs-([\d.]+)\.tar\.gz
++version=4
++opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/trackballs-$1\.tar\.gz/ \
++  https://github.com/trackballs/trackballs/tags .*/v?(\d\S+)\.tar\.gz

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



More information about the Pkg-games-commits mailing list