r14922 - in packages/trunk/freegish/debian: . patches
Lubos Novak
lubos-guest at moszumanska.debian.org
Mon Feb 24 13:52:40 UTC 2014
Author: lubos-guest
Date: 2014-02-24 13:52:40 +0000 (Mon, 24 Feb 2014)
New Revision: 14922
Removed:
packages/trunk/freegish/debian/freegish.6
packages/trunk/freegish/debian/freegish.desktop
packages/trunk/freegish/debian/freegish.manpages
packages/trunk/freegish/debian/freegish.png
packages/trunk/freegish/debian/freegish.xpm
packages/trunk/freegish/debian/patches/cmake_installation.patch
packages/trunk/freegish/debian/patches/fix_for_png15.patch
packages/trunk/freegish/debian/patches/fix_title_and_icon_text.patch
packages/trunk/freegish/debian/patches/ftbfs_freebsd_hurd.patch
packages/trunk/freegish/debian/patches/rename_config_dir.patch
Modified:
packages/trunk/freegish/debian/changelog
packages/trunk/freegish/debian/freegish.install
packages/trunk/freegish/debian/patches/custom_level_loading.patch
packages/trunk/freegish/debian/patches/series
Log:
Drop files and patches merged upstream
Modified: packages/trunk/freegish/debian/changelog
===================================================================
--- packages/trunk/freegish/debian/changelog 2014-02-24 13:25:10 UTC (rev 14921)
+++ packages/trunk/freegish/debian/changelog 2014-02-24 13:52:40 UTC (rev 14922)
@@ -5,6 +5,7 @@
[ Luboš Novák ]
* New upstream snapshot.
+ * Drop files and patches merged upstream.
* Bump Standards Version to 3.9.5.
* Fixed typo in package description. (Closes: #710548)
* Use an absolute icon path in menu file.
Deleted: packages/trunk/freegish/debian/freegish.6
===================================================================
--- packages/trunk/freegish/debian/freegish.6 2014-02-24 13:25:10 UTC (rev 14921)
+++ packages/trunk/freegish/debian/freegish.6 2014-02-24 13:52:40 UTC (rev 14922)
@@ -1,25 +0,0 @@
-.TH FREEGISH 6 "Dec 25, 2010"
-.SH NAME
-freegish \- A physics based arcade game
-.SH SYNOPSIS
-.B freegish
-.RI [ options ]
-.SH DESCRIPTION
-\fBfreegish\fP is a physics based arcade game
-.SH OPTIONS
-.TP
-.B \-nosound
-Disable sound and music
-.TP
-.B \-sound
-Enable sound
-.TP
-.B \-nomusic
-Disable music
-.SH FILES
-\fI${HOME}/.freegish/level/\fR - directory containing custom levels
-.SH AUTHOR
-Gish was written by Cryptic Sea and FreeGish is maintained by FreeGish team.
-.PP
-This manual page was written by Lubos Novak <alvinx12 at centrum.cz>,
-for the Debian project (and may be used by others).
Deleted: packages/trunk/freegish/debian/freegish.desktop
===================================================================
--- packages/trunk/freegish/debian/freegish.desktop 2014-02-24 13:25:10 UTC (rev 14921)
+++ packages/trunk/freegish/debian/freegish.desktop 2014-02-24 13:52:40 UTC (rev 14922)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=FreeGish
-Comment=A physics based arcade game
-Type=Application
-Icon=freegish
-Terminal=false
-Exec=freegish
-Categories=Game;ArcadeGame;
-Keywords=game;2D;arcade;platform;
Modified: packages/trunk/freegish/debian/freegish.install
===================================================================
--- packages/trunk/freegish/debian/freegish.install 2014-02-24 13:25:10 UTC (rev 14921)
+++ packages/trunk/freegish/debian/freegish.install 2014-02-24 13:52:40 UTC (rev 14922)
@@ -1,4 +1,5 @@
usr/games/freegish
-debian/freegish.xpm usr/share/pixmaps
-debian/freegish.png usr/share/icons/hicolor/32x32/apps
-debian/freegish.desktop usr/share/applications
\ No newline at end of file
+usr/share/pixmaps
+usr/share/icons
+usr/share/applications
+usr/share/man
Deleted: packages/trunk/freegish/debian/freegish.manpages
===================================================================
--- packages/trunk/freegish/debian/freegish.manpages 2014-02-24 13:25:10 UTC (rev 14921)
+++ packages/trunk/freegish/debian/freegish.manpages 2014-02-24 13:52:40 UTC (rev 14922)
@@ -1 +0,0 @@
-debian/freegish.6
Deleted: packages/trunk/freegish/debian/freegish.png
===================================================================
(Binary files differ)
Deleted: packages/trunk/freegish/debian/freegish.xpm
===================================================================
--- packages/trunk/freegish/debian/freegish.xpm 2014-02-24 13:25:10 UTC (rev 14921)
+++ packages/trunk/freegish/debian/freegish.xpm 2014-02-24 13:52:40 UTC (rev 14922)
@@ -1,38 +0,0 @@
-/* XPM */
-static char * freegish_xpm[] = {
-"32 32 3 1",
-" c None",
-". c #000000",
-"+ c #FF0000",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ....... ",
-" ............... ",
-" .................. ",
-" .................... ",
-" ....................... ",
-" ......................... ",
-" ........................... ",
-" .............................",
-" ..............................",
-" ...............................",
-" ...............................",
-" ......+++++......+++++.........",
-"......+++++++....+++++++........",
-"......+++++++....+++++++........",
-"......+++++++....+++++++........",
-"......+++++++....+++++++........",
-"......+++++++....+++++++........",
-".......+++++......+++++.........",
-"................................",
-" ...............................",
-" ...............................",
-" ..............................",
-" ............................ ",
-" ......................... "};
Deleted: packages/trunk/freegish/debian/patches/cmake_installation.patch
===================================================================
--- packages/trunk/freegish/debian/patches/cmake_installation.patch 2014-02-24 13:25:10 UTC (rev 14921)
+++ packages/trunk/freegish/debian/patches/cmake_installation.patch 2014-02-24 13:52:40 UTC (rev 14922)
@@ -1,84 +0,0 @@
-Include embedded glext.h only for windows
-Add installation
-Index: freegish-1.53+git20101011+dfsg/CMakeLists.txt
-===================================================================
---- freegish-1.53+git20101011+dfsg.orig/CMakeLists.txt 2011-03-21 13:28:37.000000000 +0100
-+++ freegish-1.53+git20101011+dfsg/CMakeLists.txt 2011-03-21 13:34:42.000000000 +0100
-@@ -1,9 +1,15 @@
- cmake_minimum_required(VERSION 2.6)
-
--project(Gish C)
-+project(FreeGish C)
-
- set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake-extras/;${CMAKE_MODULE_PATH}")
--set(EXECUTABLE_OUTPUT_PATH "${PROJECT_SOURCE_DIR}")
-+
-+OPTION(INSTALL_FHS "Install into Linux FHS" OFF)
-+
-+#don't pollute source dir
-+if(NOT ${INSTALL_FHS})
-+ set(EXECUTABLE_OUTPUT_PATH "${PROJECT_SOURCE_DIR}")
-+endif(NOT ${INSTALL_FHS})
-
- # Uncomment this to hardcode the data path. On the command line, you
- # would actually give -DDATAPATH='"/usr/share/games/gish"' or similar
-@@ -141,7 +147,6 @@
- sdl/file.h
- sdl/sdl.h
- sdl/video.h
-- video/glext.h
- video/glfunc.h
- video/opengl.h
- video/text.h
-@@ -149,12 +154,49 @@
- config.h
- )
-
--add_executable(gish ${GISH_SRCS} ${GISH_H})
-+if(WIN32)
-+ list(append GISH_H video/glext.h)
-+endif(WIN32)
-+
-+add_executable(freegish ${GISH_SRCS} ${GISH_H})
-
--target_link_libraries(gish
-+target_link_libraries(freegish
- ${SDL_LIBRARY}
- ${OPENAL_LIBRARY}
- ${OPENGL_LIBRARIES}
- ${Vorbis_LIBRARIES}
- ${PNG_LIBRARIES}
-+ m
- )
-+
-+if(NOT BIN_DIR)
-+ if(UNIX)
-+ SET(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
-+ endif(UNIX)
-+endif(NOT BIN_DIR)
-+
-+if(NOT DATA_DIR)
-+ if(UNIX)
-+ SET(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/freegish")
-+ endif(UNIX)
-+endif(NOT DATA_DIR)
-+
-+if(${INSTALL_FHS})
-+ ADD_DEFINITIONS(-DDATAPATH="${DATA_DIR}")
-+endif(${INSTALL_FHS})
-+
-+install(TARGETS freegish DESTINATION ${BIN_DIR})
-+
-+install(FILES gish.bmp DESTINATION ${DATA_DIR})
-+
-+SET(DDIRS animation level sound texture)
-+
-+FOREACH(DIR_NAME ${DDIRS})
-+ install(DIRECTORY ${DIR_NAME}
-+ DESTINATION ${DATA_DIR}
-+ PATTERN .gitignore EXCLUDE
-+ PATTERN *.txt EXCLUDE
-+ PATTERN backup EXCLUDE
-+ )
-+ENDFOREACH(DIR_NAME ${DDIRS})
-+
Modified: packages/trunk/freegish/debian/patches/custom_level_loading.patch
===================================================================
--- packages/trunk/freegish/debian/patches/custom_level_loading.patch 2014-02-24 13:25:10 UTC (rev 14921)
+++ packages/trunk/freegish/debian/patches/custom_level_loading.patch 2014-02-24 13:52:40 UTC (rev 14922)
@@ -1,21 +1,21 @@
Loading custom levels from ~/.freegish/level/
-Index: freegish-1.53+git20101011+dfsg/game/custom.c
+Index: freegish-1.53+git20101011+dfsg/src/game/editor.c
===================================================================
---- freegish-1.53+git20101011+dfsg.orig/game/custom.c 2011-03-21 13:36:31.000000000 +0100
-+++ freegish-1.53+git20101011+dfsg/game/custom.c 2011-03-21 13:36:50.000000000 +0100
-@@ -234,7 +234,7 @@
+--- freegish-1.53+git20101011+dfsg.orig/src/game/editor.c 2014-02-23 23:06:53.000000000 +0100
++++ freegish-1.53+git20101011+dfsg/src/game/editor.c 2014-02-23 23:19:52.000000000 +0100
+@@ -420,7 +420,7 @@
{
- game.editing=0;
- game.levelnum=0;
-- loadlevel(levellist[pagenum+count-1]);
-+ loadlevelcustom(levellist[pagenum+count-1]);
- gameloop();
-
- joymenunum=count;
-Index: freegish-1.53+git20101011+dfsg/game/level.c
+ if (keyboard[SCAN_F7] && !prevkeyboard[SCAN_F7])
+ {
+- loadlevel(editor.filename);
++ loadlevelcustom(editor.filename);
+ setuplevel();
+ setupgame();
+ }
+Index: freegish-1.53+git20101011+dfsg/src/game/level.c
===================================================================
---- freegish-1.53+git20101011+dfsg.orig/game/level.c 2011-03-21 13:36:31.000000000 +0100
-+++ freegish-1.53+git20101011+dfsg/game/level.c 2011-03-21 13:36:50.000000000 +0100
+--- freegish-1.53+git20101011+dfsg.orig/src/game/level.c 2014-02-23 23:06:53.000000000 +0100
++++ freegish-1.53+git20101011+dfsg/src/game/level.c 2014-02-23 23:19:52.000000000 +0100
@@ -286,7 +286,51 @@
}
}
@@ -260,10 +260,10 @@
}
void createlevel(void)
-Index: freegish-1.53+git20101011+dfsg/game/level.h
+Index: freegish-1.53+git20101011+dfsg/src/game/level.h
===================================================================
---- freegish-1.53+git20101011+dfsg.orig/game/level.h 2011-03-21 13:36:31.000000000 +0100
-+++ freegish-1.53+git20101011+dfsg/game/level.h 2011-03-21 13:36:50.000000000 +0100
+--- freegish-1.53+git20101011+dfsg.orig/src/game/level.h 2014-02-23 23:06:53.000000000 +0100
++++ freegish-1.53+git20101011+dfsg/src/game/level.h 2014-02-23 23:19:52.000000000 +0100
@@ -21,9 +21,13 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
@@ -278,10 +278,10 @@
void createlevel(void);
void getlevellines(int objectnum);
void setuplevellines(int xstart,int ystart,int xend,int yend);
-Index: freegish-1.53+git20101011+dfsg/game/mappack.c
+Index: freegish-1.53+git20101011+dfsg/src/game/mappack.c
===================================================================
---- freegish-1.53+git20101011+dfsg.orig/game/mappack.c 2011-03-21 13:36:31.000000000 +0100
-+++ freegish-1.53+git20101011+dfsg/game/mappack.c 2011-03-21 13:36:50.000000000 +0100
+--- freegish-1.53+git20101011+dfsg.orig/src/game/mappack.c 2014-02-23 23:06:53.000000000 +0100
++++ freegish-1.53+git20101011+dfsg/src/game/mappack.c 2014-02-23 23:19:52.000000000 +0100
@@ -211,7 +211,7 @@
game.editing=0;
@@ -291,3 +291,16 @@
mappack.active=1;
+Index: freegish-1.53+git20101011+dfsg/src/game/custom.c
+===================================================================
+--- freegish-1.53+git20101011+dfsg.orig/src/game/custom.c 2014-02-23 23:23:23.000000000 +0100
++++ freegish-1.53+git20101011+dfsg/src/game/custom.c 2014-02-23 23:24:34.000000000 +0100
+@@ -234,7 +234,7 @@
+ {
+ game.editing=0;
+ game.levelnum=0;
+- loadlevel(levellist[pagenum+count-1]);
++ loadlevelcustom(levellist[pagenum+count-1]);
+ gameloop();
+
+ joymenunum=count;
Deleted: packages/trunk/freegish/debian/patches/fix_for_png15.patch
===================================================================
--- packages/trunk/freegish/debian/patches/fix_for_png15.patch 2014-02-24 13:25:10 UTC (rev 14921)
+++ packages/trunk/freegish/debian/patches/fix_for_png15.patch 2014-02-24 13:52:40 UTC (rev 14922)
@@ -1,50 +0,0 @@
-fix FTBFS for libpng 1.5
-Index: freegish-1.53+git20101011+dfsg/video/texture.c
-===================================================================
---- freegish-1.53+git20101011+dfsg.orig/video/texture.c 2011-11-26 18:10:31.000000000 +0100
-+++ freegish-1.53+git20101011+dfsg/video/texture.c 2011-11-26 18:11:43.000000000 +0100
-@@ -89,27 +89,27 @@
- png_read_info(png_ptr, info_ptr);
-
- /* expand paletted colors into true rgb */
-- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE)
- png_set_expand(png_ptr);
-
- /* expand grayscale images to the full 8 bits */
-- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY && info_ptr->bit_depth < 8)
-+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY && png_get_bit_depth(png_ptr, info_ptr) < 8)
- png_set_expand(png_ptr);
-
- /* expand images with transparency to full alpha channels */
-- if (info_ptr->valid & PNG_INFO_tRNS)
-+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
- png_set_expand(png_ptr);
-
- /* tell libpng to strip 16 bit depth files down to 8 bits */
-- if (info_ptr->bit_depth == 16)
-+ if (png_get_bit_depth(png_ptr, info_ptr) == 16)
- png_set_strip_16(png_ptr);
-
- /* fill upto 4 byte RGBA - we always want an alpha channel*/
-- if (info_ptr->bit_depth == 8 && info_ptr->color_type != PNG_COLOR_TYPE_RGB_ALPHA)
-+ if (png_get_bit_depth(png_ptr, info_ptr) == 8 && png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_RGB_ALPHA)
- png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
-
- // XXX: is this required? we're not handling interlaced PNGs ...
-- if (info_ptr->interlace_type)
-+ if (png_get_interlace_type(png_ptr, info_ptr))
- number_passes = png_set_interlace_handling(png_ptr);
- else
- number_passes = 1;
-@@ -125,8 +125,8 @@
- else
- {
- int w, h, y;
-- w = info_ptr->width;
-- h = info_ptr->height;
-+ w = png_get_image_width(png_ptr, info_ptr);
-+ h = png_get_image_height(png_ptr, info_ptr);
- *width = w;
- *height = h;
- *rgba = (unsigned int *) malloc(w*h*4);
Deleted: packages/trunk/freegish/debian/patches/fix_title_and_icon_text.patch
===================================================================
--- packages/trunk/freegish/debian/patches/fix_title_and_icon_text.patch 2014-02-24 13:25:10 UTC (rev 14921)
+++ packages/trunk/freegish/debian/patches/fix_title_and_icon_text.patch 2014-02-24 13:52:40 UTC (rev 14922)
@@ -1,14 +0,0 @@
-Rename window title text. Icon text is the same
-Index: freegish-1.53+git20101011+dfsg/main.c
-===================================================================
---- freegish-1.53+git20101011+dfsg.orig/main.c 2011-03-21 13:35:13.000000000 +0100
-+++ freegish-1.53+git20101011+dfsg/main.c 2011-03-21 13:35:23.000000000 +0100
-@@ -127,7 +127,7 @@
-
- listvideomodes();
-
-- SDL_WM_SetCaption("Gish","SDL");
-+ SDL_WM_SetCaption("FreeGish", NULL);
- SDL_WM_SetIcon(SDL_LoadBMP("gish.bmp"),iconmask);
-
- if (windowinfo.bitsperpixel==16)
Deleted: packages/trunk/freegish/debian/patches/ftbfs_freebsd_hurd.patch
===================================================================
--- packages/trunk/freegish/debian/patches/ftbfs_freebsd_hurd.patch 2014-02-24 13:25:10 UTC (rev 14921)
+++ packages/trunk/freegish/debian/patches/ftbfs_freebsd_hurd.patch 2014-02-24 13:52:40 UTC (rev 14922)
@@ -1,36 +0,0 @@
-fix FTBFS for kFreeBSD and Hurd
-Index: freegish-1.53+git20101011+dfsg/game/socket.c
-===================================================================
---- freegish-1.53+git20101011+dfsg.orig/game/socket.c 2011-04-01 12:56:46.000000000 +0200
-+++ freegish-1.53+git20101011+dfsg/game/socket.c 2011-11-28 13:11:55.336458392 +0100
-@@ -25,7 +25,7 @@
- #include <SDL.h>
- #include <windows.h>
- #endif
--#ifdef LINUX
-+#if defined(LINUX) || defined(__FreeBSD_kernel__) || defined(__GNU__)
- #include <SDL/SDL.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -75,7 +75,7 @@
- ICStop(inst);
- */
- #endif
--#ifdef LINUX
-+#if defined(LINUX) || defined(__FreeBSD_kernel__) || defined(__GNU__)
- char command[100] = "xdg-open http://";
- strcat(command, webpagename);
- SDL_WM_IconifyWindow();
-Index: freegish-1.53+git20101011+dfsg/video/opengl.h
-===================================================================
---- freegish-1.53+git20101011+dfsg.orig/video/opengl.h 2011-04-01 12:56:47.000000000 +0200
-+++ freegish-1.53+git20101011+dfsg/video/opengl.h 2011-11-28 13:12:15.397408664 +0100
-@@ -37,7 +37,7 @@
- #include "../video/glext.h"
- #endif
-
--#ifdef LINUX
-+#if defined(LINUX) || defined(__FreeBSD_kernel__) || defined(__GNU__)
- #include <GL/gl.h>
- #include <GL/glext.h>
- #endif
Deleted: packages/trunk/freegish/debian/patches/rename_config_dir.patch
===================================================================
--- packages/trunk/freegish/debian/patches/rename_config_dir.patch 2014-02-24 13:25:10 UTC (rev 14921)
+++ packages/trunk/freegish/debian/patches/rename_config_dir.patch 2014-02-24 13:52:40 UTC (rev 14922)
@@ -1,14 +0,0 @@
-Linux config dir is ~/.freegish
-Index: freegish-1.53+git20101011+dfsg/game/config.c
-===================================================================
---- freegish-1.53+git20101011+dfsg.orig/game/config.c 2011-03-21 13:36:59.000000000 +0100
-+++ freegish-1.53+git20101011+dfsg/game/config.c 2011-03-21 13:37:21.000000000 +0100
-@@ -48,7 +48,7 @@
- #if MAC
- #define USERPATH(X) "%s/Library/Application Support/Gish" X
- #else
--#define USERPATH(X) "%s/.gish" X
-+#define USERPATH(X) "%s/.freegish" X
- #endif
- #endif
- #ifdef WINDOWS
Modified: packages/trunk/freegish/debian/patches/series
===================================================================
--- packages/trunk/freegish/debian/patches/series 2014-02-24 13:25:10 UTC (rev 14921)
+++ packages/trunk/freegish/debian/patches/series 2014-02-24 13:52:40 UTC (rev 14922)
@@ -1,6 +1 @@
-cmake_installation.patch
-fix_title_and_icon_text.patch
-rename_config_dir.patch
custom_level_loading.patch
-ftbfs_freebsd_hurd.patch
-fix_for_png15.patch
More information about the Pkg-games-commits
mailing list