[trackballs] 04/09: Drop all patches. Merged upstream.
Markus Koschany
apo at moszumanska.debian.org
Sun Oct 29 22:12:59 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 899999e4b6a727b5f8a0addec607bcc3865e1175
Author: Markus Koschany <apo at debian.org>
Date: Sun Oct 29 22:09:32 2017 +0100
Drop all patches. Merged upstream.
---
debian/patches/manpage.patch | 106 -------------------------------------
debian/patches/no-execstring.patch | 27 ----------
debian/patches/series | 2 -
3 files changed, 135 deletions(-)
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
deleted file mode 100644
index 9f21bb1..0000000
--- a/debian/patches/manpage.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-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 --git a/debian/patches/no-execstring.patch b/debian/patches/no-execstring.patch
deleted file mode 100644
index 9bc6769..0000000
--- a/debian/patches/no-execstring.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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 --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 76b3228..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-manpage.patch
-no-execstring.patch
--
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