[blockattack] 88/88: Imported Debian patch 1.4.2-1

Markus Koschany apo-guest at moszumanska.debian.org
Wed Jan 6 11:53:37 UTC 2016


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

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

commit 7d3a081ab51d8bfbc67771ccc7fbe916da207077
Merge: 3b35524 a95a8d9
Author: Markus Koschany <apo at debian.org>
Date:   Wed Jan 6 12:27:58 2016 +0100

    Imported Debian patch 1.4.2-1

 AUTHORS                                            |   17 -
 Game/COPYING.txt                                   |  340 +
 Game/SConscript                                    |    7 +-
 Game/blockattack.data                              |  Bin 5496807 -> 0 bytes
 Game/gfx/14P_Arial_Angle_Red.png                   |  Bin 0 -> 20313 bytes
 Game/gfx/24P_Arial_Blue.png                        |  Bin 0 -> 58472 bytes
 Game/gfx/BackBoard.png                             |  Bin 0 -> 7056 bytes
 Game/gfx/SmallStone.png                            |  Bin 0 -> 27639 bytes
 Game/gfx/animations/bomb/bomb_1.png                |  Bin 0 -> 1463 bytes
 Game/gfx/animations/bomb/bomb_2.png                |  Bin 0 -> 1439 bytes
 Game/gfx/animations/cursor/1.png                   |  Bin 0 -> 480 bytes
 Game/gfx/animations/cursor/2.png                   |  Bin 0 -> 463 bytes
 Game/gfx/animations/explosion/0.png                |  Bin 0 -> 2185 bytes
 Game/gfx/animations/explosion/1.png                |  Bin 0 -> 4769 bytes
 Game/gfx/animations/explosion/2.png                |  Bin 0 -> 7446 bytes
 Game/gfx/animations/explosion/3.png                |  Bin 0 -> 6539 bytes
 Game/gfx/animations/ready/ready_1.png              |  Bin 0 -> 1867 bytes
 Game/gfx/animations/ready/ready_2.png              |  Bin 0 -> 1951 bytes
 Game/gfx/b1024.png                                 |  Bin 0 -> 3436 bytes
 Game/gfx/bBack.png                                 |  Bin 0 -> 2912 bytes
 Game/gfx/bChange.png                               |  Bin 0 -> 2728 bytes
 Game/gfx/bConfigure.png                            |  Bin 0 -> 2204 bytes
 Game/gfx/bConnect.png                              |  Bin 0 -> 2191 bytes
 Game/gfx/bEndless.png                              |  Bin 0 -> 3623 bytes
 Game/gfx/bExit.png                                 |  Bin 0 -> 2966 bytes
 Game/gfx/bForward.png                              |  Bin 0 -> 3245 bytes
 Game/gfx/bHighScore.png                            |  Bin 0 -> 3088 bytes
 Game/gfx/bHost.png                                 |  Bin 0 -> 2239 bytes
 Game/gfx/bHowToPlay.png                            |  Bin 0 -> 12290 bytes
 Game/gfx/bInternet.png                             |  Bin 0 -> 11721 bytes
 Game/gfx/bLoad.png                                 |  Bin 0 -> 1922 bytes
 Game/gfx/bNetwork.png                              |  Bin 0 -> 3711 bytes
 Game/gfx/bNewGame.png                              |  Bin 0 -> 2500 bytes
 Game/gfx/bNext.png                                 |  Bin 0 -> 2827 bytes
 Game/gfx/bOff.png                                  |  Bin 0 -> 1383 bytes
 Game/gfx/bOn.png                                   |  Bin 0 -> 1306 bytes
 Game/gfx/bOnePlayer.png                            |  Bin 0 -> 2620 bytes
 Game/gfx/bOptions.png                              |  Bin 0 -> 3160 bytes
 Game/gfx/bPuzzle.png                               |  Bin 0 -> 3532 bytes
 Game/gfx/bReplays.png                              |  Bin 0 -> 2771 bytes
 Game/gfx/bRetry.png                                |  Bin 0 -> 2966 bytes
 Game/gfx/bSave.png                                 |  Bin 0 -> 2137 bytes
 Game/gfx/bSelectPuzzle.png                         |  Bin 0 -> 1849 bytes
 Game/gfx/bSkip.png                                 |  Bin 0 -> 2935 bytes
 Game/gfx/bStageClear.png                           |  Bin 0 -> 2208 bytes
 Game/gfx/bTheme.png                                |  Bin 0 -> 1970 bytes
 Game/gfx/bTimeTrial.png                            |  Bin 0 -> 2894 bytes
 Game/gfx/bTwoPlayers.png                           |  Bin 0 -> 3489 bytes
 Game/gfx/bVsGame.png                               |  Bin 0 -> 2482 bytes
 Game/gfx/bVsGameConfig.png                         |  Bin 0 -> 2218 bytes
 Game/gfx/background.png                            |  Bin 0 -> 74074 bytes
 Game/gfx/balls/ballBlue.png                        |  Bin 0 -> 265 bytes
 Game/gfx/balls/ballGray.png                        |  Bin 0 -> 312 bytes
 Game/gfx/balls/ballGreen.png                       |  Bin 0 -> 273 bytes
 Game/gfx/balls/ballPurple.png                      |  Bin 0 -> 360 bytes
 Game/gfx/balls/ballRed.png                         |  Bin 0 -> 327 bytes
 Game/gfx/balls/ballTurkish.png                     |  Bin 0 -> 426 bytes
 Game/gfx/balls/ballYellow.png                      |  Bin 0 -> 378 bytes
 Game/gfx/blackBackGround.png                       |  Bin 0 -> 2569 bytes
 Game/gfx/blackLine.png                             |  Bin 0 -> 135 bytes
 Game/gfx/blockAttack.ico                           |  Bin 0 -> 25766 bytes
 Game/gfx/boardBackBack.png                         |  Bin 0 -> 19018 bytes
 Game/gfx/bricks/blue.png                           |  Bin 0 -> 593 bytes
 Game/gfx/bricks/green.png                          |  Bin 0 -> 621 bytes
 Game/gfx/bricks/grey.png                           |  Bin 0 -> 907 bytes
 Game/gfx/bricks/purple.png                         |  Bin 0 -> 1024 bytes
 Game/gfx/bricks/red.png                            |  Bin 0 -> 831 bytes
 Game/gfx/bricks/turkish.png                        |  Bin 0 -> 877 bytes
 Game/gfx/bricks/yellow.png                         |  Bin 0 -> 890 bytes
 Game/gfx/chainFrame.png                            |  Bin 0 -> 322 bytes
 Game/gfx/changeButtonsBack.png                     |  Bin 0 -> 4249 bytes
 Game/gfx/changeButtonsBack1.png                    |  Bin 0 -> 4550 bytes
 Game/gfx/counter/1.png                             |  Bin 0 -> 961 bytes
 Game/gfx/counter/2.png                             |  Bin 0 -> 2868 bytes
 Game/gfx/counter/3.png                             |  Bin 0 -> 3573 bytes
 Game/gfx/crossover.png                             |  Bin 0 -> 2323 bytes
 Game/gfx/dialogbox.png                             |  Bin 0 -> 9894 bytes
 Game/gfx/fileDialogbox.png                         |  Bin 0 -> 10310 bytes
 Game/gfx/garbage/garbageB.png                      |  Bin 0 -> 1079 bytes
 Game/gfx/garbage/garbageBL.png                     |  Bin 0 -> 1198 bytes
 Game/gfx/garbage/garbageBR.png                     |  Bin 0 -> 1139 bytes
 Game/gfx/garbage/garbageFill.png                   |  Bin 0 -> 1148 bytes
 Game/gfx/garbage/garbageGM.png                     |  Bin 0 -> 583 bytes
 Game/gfx/garbage/garbageGML.png                    |  Bin 0 -> 727 bytes
 Game/gfx/garbage/garbageGMR.png                    |  Bin 0 -> 734 bytes
 Game/gfx/garbage/garbageL.png                      |  Bin 0 -> 1150 bytes
 Game/gfx/garbage/garbageM.png                      |  Bin 0 -> 996 bytes
 Game/gfx/garbage/garbageML.png                     |  Bin 0 -> 1180 bytes
 Game/gfx/garbage/garbageMR.png                     |  Bin 0 -> 1143 bytes
 Game/gfx/garbage/garbageR.png                      |  Bin 0 -> 1119 bytes
 Game/gfx/garbage/garbageT.png                      |  Bin 0 -> 1098 bytes
 Game/gfx/garbage/garbageTL.png                     |  Bin 0 -> 1165 bytes
 Game/gfx/garbage/garbageTR.png                     |  Bin 0 -> 1183 bytes
 Game/gfx/iCheckBoxArea.png                         |  Bin 0 -> 3198 bytes
 Game/gfx/iDraw.png                                 |  Bin 0 -> 10515 bytes
 Game/gfx/iGameOver.png                             |  Bin 0 -> 10151 bytes
 Game/gfx/iLevelCheck.png                           |  Bin 0 -> 280 bytes
 Game/gfx/iLevelCheckBox.png                        |  Bin 0 -> 165 bytes
 Game/gfx/iLoser.png                                |  Bin 0 -> 8298 bytes
 Game/gfx/iStageClearLimit.png                      |  Bin 0 -> 2069 bytes
 Game/gfx/iWinner.png                               |  Bin 0 -> 11639 bytes
 Game/gfx/icon.png                                  |  Bin 0 -> 1067 bytes
 Game/gfx/mouse.png                                 |  Bin 0 -> 409 bytes
 Game/gfx/options.png                               |  Bin 0 -> 30310 bytes
 Game/gfx/smileys/0.png                             |  Bin 0 -> 4800 bytes
 Game/gfx/smileys/1.png                             |  Bin 0 -> 4848 bytes
 Game/gfx/smileys/2.png                             |  Bin 0 -> 5316 bytes
 Game/gfx/smileys/3.png                             |  Bin 0 -> 6767 bytes
 Game/gfx/transCover.png                            |  Bin 0 -> 228 bytes
 Game/music/bgMusic.ogg                             |  Bin 0 -> 4440194 bytes
 Game/music/highbeat.ogg                            |  Bin 0 -> 522989 bytes
 Game/sound/applause.ogg                            |  Bin 0 -> 135773 bytes
 Game/sound/cameraclick.ogg                         |  Bin 0 -> 11058 bytes
 Game/sound/counter.ogg                             |  Bin 0 -> 8168 bytes
 Game/sound/counterFinal.ogg                        |  Bin 0 -> 8062 bytes
 Game/sound/pop.ogg                                 |  Bin 0 -> 12249 bytes
 Game/sound/typing.ogg                              |  Bin 0 -> 4258 bytes
 Game/themes/default                                |    5 +
 Makefile                                           |    2 +-
 README                                             |   16 -
 blockattack.xpm                                    | 1612 -----
 changelog141                                       |    3 -
 debian/README.source                               |    3 -
 debian/blockattack.desktop                         |    4 +-
 debian/changelog                                   |   48 +-
 debian/clean                                       |    3 +
 debian/compat                                      |    2 +-
 debian/control                                     |   39 +-
 debian/copyright                                   |   83 +-
 debian/docs                                        |    3 +-
 .../icons/blockattack32.xpm                        |    0
 .../icons/blockattack64.xpm                        |    0
 debian/patches/enet-1.3.1.patch                    |   30 -
 debian/patches/fix-scons-paths.patch               |   21 -
 debian/patches/fix-spelling-errors.patch           |   54 -
 debian/patches/gcc44.diff                          |   15 -
 debian/patches/series                              |    4 -
 debian/rules                                       |   30 +-
 debian/watch                                       |    3 +-
 packdata.sh                                        |    8 +
 source/AUTH                                        |  169 +
 source/assets/gfx/backgrounds/back.svg             |  111 +
 source/assets/gfx/backgrounds/background.svg       |  284 +
 source/assets/gfx/backgrounds/boardBack.svg        |  251 +
 source/assets/gfx/balls/blue.svg                   |   93 +
 source/assets/gfx/balls/green.svg                  |   75 +
 source/assets/gfx/balls/grey.svg                   |  166 +
 source/assets/gfx/balls/purple.svg                 |  121 +
 source/assets/gfx/balls/red.svg                    |   94 +
 source/assets/gfx/balls/turkish.svg                |  103 +
 source/assets/gfx/balls/yellow.svg                 |  107 +
 source/assets/gfx/bricks/blue.svg                  |  104 +
 source/assets/gfx/bricks/green.svg                 |   93 +
 source/assets/gfx/bricks/grey.svg                  |  184 +
 source/assets/gfx/bricks/purple.svg                |  138 +
 source/assets/gfx/bricks/red.svg                   |  111 +
 source/assets/gfx/bricks/turkish.svg               |  121 +
 source/assets/gfx/bricks/yellow.svg                |  124 +
 source/assets/gfx/buttons/buttons.svg              | 6477 ++++++++++++++++++++
 source/assets/gfx/buttons/exit.svg                 |  111 +
 source/assets/gfx/garbage/brown.svg                |  391 ++
 source/assets/gfx/garbage/grey.svg                 |  277 +
 source/assets/gfx/smileys/smileys.svg              |  340 +
 source/code/BlockGame.hpp                          |   55 +-
 source/code/Makefile                               |   78 +
 source/code/MenuSystem.cc                          |  227 -
 source/code/MenuSystem.h                           |  119 -
 source/code/NetworkThing.hpp                       |   21 +-
 source/code/README                                 |   10 +-
 source/code/ReadKeyboard.cpp                       |    4 +-
 source/code/SConscript                             |    6 +-
 source/code/{SFont.c => SFont.cpp}                 |    0
 source/code/block.make                             |   84 -
 source/code/{common.cc => common.cpp}              |    0
 source/code/common.h                               |    7 +
 source/code/highscore.cpp                          |    6 +-
 source/code/main.cpp                               |  436 +-
 source/code/mainVars.hpp                           |    1 +
 source/code/physfs_stream.hpp                      |    6 +-
 source/code/replay.cpp                             |   20 +-
 source/code/{stats.cc => stats.cpp}                |   12 +-
 source/code/{ttfont.cc => ttfont.cpp}              |    0
 source/code/uploadReplay.cc                        |   88 -
 source/code/uploadReplay.h                         |   57 -
 source/code/win.make                               |   93 -
 source/code/winicon.rc                             |    1 +
 {debian => source/manual}/block_attack_manual.tex  |    0
 {debian => source/misc}/blockattack.desktop        |    0
 source/misc/install_script.nsi                     |  283 +
 189 files changed, 11161 insertions(+), 2850 deletions(-)

diff --cc debian/blockattack.desktop
index 8903e77,0000000..99aa78a
mode 100644,000000..100644
--- a/debian/blockattack.desktop
+++ b/debian/blockattack.desktop
@@@ -1,13 -1,0 +1,15 @@@
 +[Desktop Entry]
 +Version=1.0
 +Name=Block Attack - Rise of the Blocks
 +Comment=Switch blocks so they match
 +Comment[ro_RO]=Ridicarea blocurilor
 +Comment[da_DK]=Byt blokke så de passer sammen
 +Comment[fr_FR]=Empilez les blocks
++Comment[de]=Staple zusammenpassende Spielsteine
 +GenericName=Block Attack
 +Exec=blockattack
- Icon=blockattack32
++Icon=blockattack64
 +Terminal=false
 +Type=Application
 +Categories=Game;ArcadeGame;
++Keywords=blocks;attack;tetris;
diff --cc debian/changelog
index 315844b,0000000..c9143c8
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,104 -1,0 +1,140 @@@
- blockattack (1.4.1+ds1-3) UNRELEASED; urgency=low
++blockattack (1.4.2-1) unstable; urgency=medium
++
++  * Team upload.
++
++  [ Markus Koschany ]
++  * Acknowledge NMU by Jonathan Wiltshire. Thanks.
++  * New upstream release. The upstream tarball is pristine now.
++  * Rebuild against GCC-5. (Closes: #793219)
++  * Remove README.source.
++  * Use compat level 9 and require debhelper >= 9.
++  * wrap-and-sort -sa.
++  * Declare compliance with Debian Policy 3.9.6.
++  * Vcs-Browser: Use https.
++  * debian/watch: Make the extension regex more flexible to detect the latest
++    releases.
++  * Update debian/copyright to copyright format 1.0.
++  * Simplify get-orig-source.
++  * Use old blockattack*.xpm icons from version 1.4.1 because the new icon
++    Game/gfx/icon.png has a poorer resolution.
++  * Remove debian/block_attack_manual.tex and use upstream's file instead.
++  * debian/docs: Don't install README and adjust the path to AUTHORS file.
++  * Update debian/blockattack.desktop. Add keywords and a comment in German.
++    Use blockattack64.xpm because of the better resolution.
++  * Drop all patches. Fixed upstream.
++  * debian/menu: Use the absolute icon path to display the menu icon.
++    (Closes: #726212)
++  * Remove override for dh_installchangelogs because there is no changelog to
++    install.
++  * Update debian/clean file and ensure that the game can be built twice in a
++    row.
 +
 +  [ Evgeni Golov ]
 +  * Correct Vcs-* URLs to point to anonscm.debian.org
 +
 +  [ Cyril Brulebois ]
 +  * Remove myself from Uploaders.
 +
-   [ Markus Koschany ]
-   * debian/menu: Use the absolute icon path to display the menu icon.
-     (Closes: #726212)
-   * Moved the package to Git
++  [ Paul Wise ]
++  * Drop gcc47.diff. Fixed upstream.
++
++ -- Markus Koschany <apo at debian.org>  Wed, 06 Jan 2016 12:27:58 +0100
++
++blockattack (1.4.1+ds1-2.1) unstable; urgency=low
++
++  [ Cyril Brulebois ]
++  * Non-maintainer upload.
++  * Fix FTBFS with gcc 4.7 by adding “this->” when appropriate
++    (Closes: #667118).
 +
-  -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 22:21:10 +0200
++ -- Jonathan Wiltshire <jmw at debian.org>  Sun, 13 May 2012 15:19:11 +0100
 +
 +blockattack (1.4.1+ds1-2) unstable; urgency=low
 +
 +  * Team upload.
 +  * Build with enet 1.3.1.
 +    + new patch: enet-1.3.1.patch
 +
 + -- Ansgar Burchardt <ansgar at debian.org>  Sat, 12 Mar 2011 19:03:54 +0100
 +
 +blockattack (1.4.1+ds1-1) unstable; urgency=low
 +
 +  * Team upload.
 +  * New upstream release
 +    - Drop several patches no longer useful or included upstream
 +    - Refresh GCC 4.4 patch
 +    - Re-add desktop file dropped upstream
 +    - Requires PhysFS, add libphysfs-dev build-dep
 +  * Clean up watch file
 +  * Switch to dpkg-source v3
 +  * Switch to debhelper 7 dh tiny rules
 +  * Strip the prebuilt PDF and binaries out (Closes: #616672)
 +  * Add the source for the PDF and create it at build time
 +  * Wrap fields in debian/control
 +  * Add DEP-3 headers to the patches
 +  * Refer to the correct version of the GPL
 +  * Clean up the package description a bit
 +  * Fix some spelling errors
 +  * Register the documentation with doc-base
 +  * Bump Standards-Version, no changes needed
 +
 + -- Paul Wise <pabs at debian.org>  Fri, 11 Mar 2011 12:22:59 +0800
 +
 +blockattack (1.3.1-4) unstable; urgency=low
 +
 +  * Build depend on libenet-dev instead of libenet1-dev, thank you Andreas
 +    Moog (Closes: #541067)
 +  * Standard version 3.8.2, no changes
 +
 + -- Gonéri Le Bouder <goneri at rulezlan.org>  Tue, 11 Aug 2009 16:16:29 +0200
 +
 +blockattack (1.3.1-3) unstable; urgency=low
 +
 +  [ Gonéri Le Bouder ]
 +  * remove the Xs- prefix from the Vcs entrys
 +  * remove the homepage from the package description since the Homepage: field
 +    do the job now
 +
 +  [ Eddy Petrișor ]
 +  * fix Vcs-Svn URL to point to svn, not the incomplete ssh location
 +
 +  [ Cyril Brulebois ]
 +  * update my mail address
 +
 +  [ Bary deFreese ]
 +  * Add myself to uploaders.
 +  * gcc44.diff - Build with gcc-4.4. (Closes: #505026).
 +    + Thanks to Martin Michlmayr for the hint and patch.
 +  * Remove quilt .pc dir on clean.
 +  * Remove autogenerated enet-1.0/config.{status, log} on clean.
 +  * Remove Windows Thumbs.db on install so it's not in the .deb.
 +  * Bump Standards Version to 3.8.1. (No changes needed).
 +
 + -- Barry deFreese <bdefreese at debian.org>  Mon, 30 Mar 2009 16:50:08 -0400
 +
 +blockattack (1.3.1-2) unstable; urgency=low
 +
 +  [ Gonéri Le Bouder ]
 +  * fix spelling error in blockattack's long description (Closes: #432653)
 +  * add desktop_file.diff to remove the Application category from the
 +    desktop file
 +
 +  [ Jon Dowland ]
 +  * update menu section to "Games/Action" for menu transition
 +    (thanks Linas Žvirblis)
 +
 +  [ Jordà Polo ]
 +  * debian/patches:
 +    + scons_args.diff: New patch to fix scons command-line argument handling.
 +      (Closes: #444536)
 +    + replay_init.diff: New patch to initialize the Replay class correctly.
 +  * debian/control: Added Homepage and XS-Vcs-Browser fields.
 +
 + -- Gonéri Le Bouder <goneri at rulezlan.org>  Mon, 01 Oct 2007 22:16:15 +0000
 +
 +blockattack (1.3.1-1) unstable; urgency=low
 +
 +  * Initial release Closes: #368395
 +
 + -- Gonéri Le Bouder <goneri at rulezlan.org>  Mon, 14 May 2007 00:12:30 +0200
 +
diff --cc debian/clean
index b25d336,0000000..0bcf66c
mode 100644,000000..100644
--- a/debian/clean
+++ b/debian/clean
@@@ -1,8 -1,0 +1,11 @@@
 +.sconsign.dblite
 +man/blockattack.6.gz
 +blockattack.desktop
 +block_attack_manual.toc
 +block_attack_manual.aux
 +block_attack_manual.dvi
 +block_attack_manual.pdf
 +block_attack_manual.log
++Game/blockattack.data
++blockattack32.xpm
++blockattack64.xpm
diff --cc debian/compat
index 7f8f011,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++9
diff --cc debian/control
index c77fe89,0000000..5f00513
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,47 -1,0 +1,52 @@@
 +Source: blockattack
 +Section: games
 +Priority: optional
 +Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
- Uploaders: Barry deFreese <bdefreese at debian.org>
- Build-Depends: debhelper (>= 7.0.50~),
++Uploaders:
++ Barry deFreese <bdefreese at debian.org>
++Build-Depends:
++ debhelper (>= 9),
 + docbook-to-man,
-  texlive-binaries,
-  texlive-latex-base,
-  libsdl-mixer1.2-dev,
-  libsdl-image1.2-dev,
-  libsdl1.2-dev,
 + libenet-dev (>= 1.3.1),
 + libphysfs-dev,
-  scons
- Standards-Version: 3.9.1
++ libsdl-image1.2-dev,
++ libsdl-mixer1.2-dev,
++ libsdl1.2-dev,
++ scons,
++ texlive-binaries,
++ texlive-latex-base,
++ zip
++Standards-Version: 3.9.6
 +Homepage: http://blockattack.sf.net
- Vcs-Git: git://anonscm.debian.org/pkg-games/blockattack.git
- Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/blockattack/
++Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/blockattack/
++Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/blockattack/
 +
 +Package: blockattack
 +Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
++Depends:
++ ${misc:Depends},
++ ${shlibs:Depends}
 +Description: puzzle game inspired by Tetris
 + Block Attack is a puzzle/blockfall game inspired by Nintendo's Tetris Attack
 + for the Super Nintendo. The game is pretty action packed for a puzzle game :-)
 + .
 + Features:
-   * Based on the classic "Tetris Attack" for the SNES 
++  * Based on the classic "Tetris Attack" for the SNES
 +  * 5 single player modes: Endless, Time Trial, Puzzle Mode, Stage Clear and
-   Vs. Mode 
++  Vs. Mode
 +  * 2 two player options: Time Trial and Vs. Mode
 +  * Puzzle mode has 20+ puzzles
 +  * Players can use a custom key setup
 +  * Handicap in multiplayer
-   * Highscores are saved 
++  * Highscores are saved
 +  * Joypad support
-   * Music and sound effects 
++  * Music and sound effects
 +  * Animations
-   * Select puzzle file from a list in the game 
++  * Select puzzle file from a list in the game
 + .
 + System requirements:
 +  * Screen resolution: 1024x768 (cannot be changed, but it can run in a window)
 +  * Keyboard
 +  * Mouse (optional)
 +  * Processor: Decent (tested on 733 MHz)
 +  * Memory: at least 64 MB
diff --cc debian/copyright
index ac85475,0000000..37fb101
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,44 -1,0 +1,41 @@@
- This package was debianized by Gonéri Le Bouder <goneri at rulezlan.org> on
- Fri, 19 May 2006 17:38:23 +0200.
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: Blockattack
++Source: http://blockattack.sf.net
++
++Files: *
++Copyright: 2006-2014 Poul Sander <poul at poulsander.com>
++           2006      Gonéri Le Bouder <goneri at rulezlan.org>
++           2003      Karl Bartel
++License: GPL-2+
++
++Files: source/code/physfs_stream.hpp
++Copyright: 2007 Warzone Resurrection Project
++           2007 Giel van Schijndel <me at mortis.eu>
++           2006 Matthias Braun <matze at braunis.de>
++License: GPL-2+
++
++Files: debian/*
++Copyright: 2006 Gonéri Le Bouder <goneri at rulezlan.org>
++           2009 Barry deFreese <bdefreese at debian.org>
++           2011 Paul Wise <pabs at debian.org>
++           2016 Markus Koschany <apo at debian.org>
++License: GPL-2+
++
++License: GPL-2+
++ This package is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++ .
++ This package is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ GNU General Public License for more details.
++ .
++ You should have received a copy of the GNU General Public License
++ along with this package; if not, write to the Free Software
++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
++ .
++ On Debian systems, the complete text of the GNU General
++ Public License can be found in `/usr/share/common-licenses/GPL-2'.
 +
- It was downloaded from http://blockattack.sf.net
- 
- The actual maintainer is the Debian Games Team:
- http://wiki.debian.org/Games/Development
- 
- Copyright 2006-2009 Poul Sander <poul at poulsander.com>
- 
- SCons scripts and some minor changes around SHAREDIR were done by
- Gonéri Le Bouder
- Copyright 2006 Gonéri Le Bouder <goneri at rulezlan.org>
- 
- physfs_stream.hpp is copyright by:
- 
- Copyright (C) 2007 Warzone Resurrection Project
- Copyright (C) 2007 Giel van Schijndel <me at mortis.eu>
- Copyright (C) 2006 Matthias Braun <matze at braunis.de>
- 
- License:
- 
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
- 
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
- 
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- 
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
- 
- SFont files are Copyright (C) 2003 Karl Bartel
- License: GPL or LGPL (at your choice)
- 
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL-*'.
diff --cc debian/docs
index 1fa857e,0000000..6da0011
mode 100644,000000..100644
--- a/debian/docs
+++ b/debian/docs
@@@ -1,3 -1,0 +1,2 @@@
- README
- AUTHORS
++source/code/AUTHORS
 +block_attack_manual.pdf
diff --cc debian/icons/blockattack32.xpm
index cedfd00,0000000..cedfd00
mode 100644,000000..100644
--- a/debian/icons/blockattack32.xpm
+++ b/debian/icons/blockattack32.xpm
diff --cc debian/icons/blockattack64.xpm
index c2fe1be,0000000..c2fe1be
mode 100644,000000..100644
--- a/debian/icons/blockattack64.xpm
+++ b/debian/icons/blockattack64.xpm
diff --cc debian/rules
index cb2fadf,0000000..08c253d
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,42 -1,0 +1,30 @@@
 +#!/usr/bin/make -f
 +
 +#export DH_VERBOSE=1
 +
 +%:
 +	dh $@
 +
 +override_dh_auto_build:
 +	cd man ; docbook-to-man blockattack.sgml | gzip -9 > blockattack.6.gz
 +	cp debian/blockattack.desktop .
- 	latex debian/block_attack_manual.tex
++	cp debian/icons/* .
++	latex source/manual/block_attack_manual.tex
 +	dvipdfm block_attack_manual.dvi
 +	scons prefix=/usr sharedir=/usr/share/games/blockattack
++	./packdata.sh
 +
 +override_dh_auto_clean:
 +	scons -c
 +
 +override_dh_auto_install:
 +	dh_installdirs
 +	find Game -type f -exec chmod 644 {} \;
- 	scons prefix=/usr bindir=/usr/games mandir=/usr/share/man sharedir=/usr/share/games/blockattack destdir=$(CURDIR)/debian/blockattack install
- 
- override_dh_installchangelogs:
- 	dh_installchangelogs changelog*
- 
- v=1.4.1
- p=blockattack
- sfp=$(p)/binaries+source/Block Attack $(v)
++	scons prefix=/usr \
++		bindir=/usr/games \
++		mandir=/usr/share/man \
++		sharedir=/usr/share/games/blockattack \
++		destdir=$(CURDIR)/debian/blockattack install
 +
 +get-orig-source:
- 	wget -c "http://downloads.sourceforge.net/project/$(sfp)/$(p)-$(v).tar.gz"
- 	tar zxf $(p)-$(v).tar.gz
- 	# Pre-built binaries
- 	rm $(p)-$(v)/Game/blockattack.i386
- 	rm $(p)-$(v)/Game/blockattack.x86_64
- 	rm $(p)-$(v)/Game/blockattack_nonet.i386
- 	rm $(p)-$(v)/Game/blockattack_nonet.x86_64
- 	# Pre-built PDF
- 	rm $(p)-$(v)/block_attack_manual.pdf
- 	mv $(p)-$(v) $(p)-$(v)+ds1.orig
- 	tar zcf ../$(p)_$(v)+ds1.orig.tar.gz $(p)-$(v)+ds1.orig
- 	rm -r $(p)-$(v).tar.gz $(p)-$(v)+ds1.orig
++	uscan --download-current-version --force-download
diff --cc debian/watch
index 01ead1e,0000000..0ee3a07
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,3 @@@
 +version=3
- opts=dversionmangle=s/\+ds\d*// http://sf.net/blockattack/blockattack-([\d\.]+)\.tar\.gz
++opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/ \
++http://sf.net/blockattack/blockattack-([\d\.]+)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))

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



More information about the Pkg-games-commits mailing list