Author: fabian-guest
Date: 2009-06-29 08:02:44 +0000 (Mon, 29 Jun 2009)
New Revision: 9920
Removed:
packages/trunk/rott/debian/patches/01-gameover.patch
packages/trunk/rott/debian/patches/02-fix-end-level-display.patch
packages/trunk/rott/debian/patches/03-desktop-file.patch
packages/trunk/rott/debian/patches/10-german-eszett-as-backslash.patch
packages/trunk/rott/debian/patches/11-add-nosound-to-manpage.patch
Modified:
packages/trunk/rott/debian/changelog
packages/trunk/rott/debian/patches/series
packages/trunk/rott/debian/rules
Log:
* New upstream release.
* debian/patches/01-gameover.patch,
debian/patches/02-fix-end-level-display.patch,
debian/patches/03-desktop-file.patch,
debian/patches/10-german-eszett-as-backslash.patch,
debian/patches/11-add-nosound-to-manpage.patch:
+ Removed, applied upstream.
* debian/rules:
+ Added -Wno-pointer-sign to CFLAGS.
Modified: packages/trunk/rott/debian/changelog
===================================================================
--- packages/trunk/rott/debian/changelog 2009-06-29 07:53:46 UTC (rev
9919)
+++ packages/trunk/rott/debian/changelog 2009-06-29 08:02:44 UTC (rev
9920)
@@ -1,3 +1,17 @@
+rott (1.1.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches/01-gameover.patch,
+ debian/patches/02-fix-end-level-display.patch,
+ debian/patches/03-desktop-file.patch,
+ debian/patches/10-german-eszett-as-backslash.patch,
+ debian/patches/11-add-nosound-to-manpage.patch:
+ + Removed, applied upstream.
+ * debian/rules:
+ + Added -Wno-pointer-sign to CFLAGS.
+
+ -- Fabian Greffrath <[email protected]> Mon, 29 Jun 2009 09:57:07
+0200
+
rott (1.1-3) unstable; urgency=low
* debian/rott.postinst:
Deleted: packages/trunk/rott/debian/patches/01-gameover.patch
===================================================================
--- packages/trunk/rott/debian/patches/01-gameover.patch 2009-06-29
07:53:46 UTC (rev 9919)
+++ packages/trunk/rott/debian/patches/01-gameover.patch 2009-06-29
08:02:44 UTC (rev 9920)
@@ -1,86 +0,0 @@
-Applied rott-1.1-gameover.patch from Hans de Goede to fix corrupted "Game Over"
-screen in resolutions higher than 320x200.
-
---- rott-1.1.orig/rott/rt_vid.c
-+++ rott-1.1/rott/rt_vid.c
-@@ -1099,31 +1099,14 @@
-
- void VL_DecompressLBM (lbm_t *lbminfo, boolean flip)
- {
-- byte *screen = (byte *)bufferofs;
-- byte *orig;
-- int count;
-- byte b,
-- rept;
-+ int count;
-+ byte b, rept;
- byte *source = (byte *)&lbminfo->data;
- byte *buf;
- int ht = lbminfo->height;
--
-- int x = 0;
-- int y;
-- byte *origbuf;
- byte pal[768];
-
--
-- orig = screen;
--
-- if (iGLOBAL_SCREENWIDTH <= 320){
-- buf = (byte *) SafeMalloc (64000);
-- }else{
-- buf = (byte *) SafeMalloc
(iGLOBAL_SCREENWIDTH*iGLOBAL_SCREENHEIGHT);
-- }
-- origbuf = buf;
--
-- VL_ClearBuffer (displayofs, 0);
-+ EnableScreenStretch();
-
- memcpy(&pal[0],lbminfo->palette,768);
-
-@@ -1131,6 +1114,8 @@
-
- VW_MarkUpdateBlock (0, 0, 320, 200);
-
-+ buf = (byte *)bufferofs;
-+
- while (ht--)
- {
- count = 0;
-@@ -1163,36 +1148,7 @@
- buf += (iGLOBAL_SCREENWIDTH-320); //eg 800 - 320)
- }
- }
-- //SetTextMode ( ); //12345678
--
-- {
-- int cnt;
--
-- cnt = 0;
-- screen = orig;
-- buf = origbuf;
-- VGAMAPMASK (writemask);
--
-- //bna section start
-- if (iGLOBAL_SCREENWIDTH <= 320){
-- for (y = 0; y < (lbminfo->height*lbminfo->width); y++)
--
-- {
-- *screen++ = *(buf+y);
-- }
-- }else{
-- for (y = 0; y < (lbminfo->height); y++){
-- for (x = 0; x < iGLOBAL_SCREENWIDTH; x++){
-- *screen++ = *(buf++);
-- }
-- }
-- }
-- // bna section end
--
-- }
-
-- SafeFree(origbuf);
-- EnableScreenStretch();//bna++ shut on streech mode
- if (flip==true)
- VW_UpdateScreen ();
-
Deleted: packages/trunk/rott/debian/patches/02-fix-end-level-display.patch
===================================================================
--- packages/trunk/rott/debian/patches/02-fix-end-level-display.patch
2009-06-29 07:53:46 UTC (rev 9919)
+++ packages/trunk/rott/debian/patches/02-fix-end-level-display.patch
2009-06-29 08:02:44 UTC (rev 9920)
@@ -1,24 +0,0 @@
-Applied rott-1.1-fix-end-level-display.patch from Hans de Goede to fix
-empty game statistics screen after finishing a level in resolutions higher
-than 320x200.
-
---- rott-1.1.orig/rott/rt_game.c
-+++ rott-1.1/rott/rt_game.c
-@@ -3426,7 +3426,7 @@
- tmpPic = ( pic_t * )W_CacheLumpName( "mmbk", PU_CACHE, Cvt_pic_t, 1 );
- VWB_DrawPic( 0, 0, tmpPic );
- VW_UpdateScreen();
-- DisableScreenStretch();
-+// DisableScreenStretch();
-
- IN_StartAck();
- EndBonusVoice = 0;
-@@ -3759,7 +3759,7 @@
-
-
- //bna section
-- EnableScreenStretch();//bna++
-+// EnableScreenStretch();//bna++
- VW_UpdateScreen();//bna++
- // DisableScreenStretch();//bna++
- //bna section end
Deleted: packages/trunk/rott/debian/patches/03-desktop-file.patch
===================================================================
--- packages/trunk/rott/debian/patches/03-desktop-file.patch 2009-06-29
07:53:46 UTC (rev 9919)
+++ packages/trunk/rott/debian/patches/03-desktop-file.patch 2009-06-29
08:02:44 UTC (rev 9920)
@@ -1,13 +0,0 @@
-Added a generic rott.desktop file into the misc/ directory.
-
---- /dev/null
-+++ rott-1.1/misc/rott.desktop
-@@ -0,0 +1,8 @@
-+[Desktop Entry]
-+Type=Application
-+Name=Rise of the Triad
-+Comment=A high quality, fast scrolling first-person perspective 3D action game
-+Icon=rott
-+TryExec=rott
-+Exec=rott -fullscreen -resolution 800x600
-+Categories=Game;ActionGame;
Deleted: packages/trunk/rott/debian/patches/10-german-eszett-as-backslash.patch
===================================================================
--- packages/trunk/rott/debian/patches/10-german-eszett-as-backslash.patch
2009-06-29 07:53:46 UTC (rev 9919)
+++ packages/trunk/rott/debian/patches/10-german-eszett-as-backslash.patch
2009-06-29 08:02:44 UTC (rev 9920)
@@ -1,13 +0,0 @@
-Accept the German eszett as a backslash key.
-
---- rott-1.1.orig/rott/rt_in.c
-+++ rott-1.1/rott/rt_in.c
-@@ -1083,6 +1083,8 @@
- scancodes[SDLK_LSHIFT] = sc_RShift; /* sc_LShift */
-
- scancodes[SDLK_BACKSLASH] = 0x2B;
-+ /* Accept the German eszett as a backslash key */
-+ scancodes[SDLK_WORLD_63] = 0x2B;
- scancodes[SDLK_z] = sc_Z;
- scancodes[SDLK_x] = sc_X;
- scancodes[SDLK_c] = sc_C;
Deleted: packages/trunk/rott/debian/patches/11-add-nosound-to-manpage.patch
===================================================================
--- packages/trunk/rott/debian/patches/11-add-nosound-to-manpage.patch
2009-06-29 07:53:46 UTC (rev 9919)
+++ packages/trunk/rott/debian/patches/11-add-nosound-to-manpage.patch
2009-06-29 08:02:44 UTC (rev 9920)
@@ -1,17 +0,0 @@
-From: Evgeni Golov <[email protected]>
-Subject: Add the nosound option to the manpage
-Date: 2009-06-04 12:28:17 +0200
-License: GPL-2+
-===================================================================
---- rott-1.1.orig/doc/rott.6 2009-06-04 12:27:48.000000000 +0200
-+++ rott-1.1/doc/rott.6 2009-06-04 12:28:17.000000000 +0200
-@@ -36,6 +36,9 @@
- .BR nomouse
- Disable check for mouse.
- .TP
-+.BR nosound
-+Disable sound.
-+.TP
- .BR cyberman
- Enable check for Cyberman.
- .TP
Modified: packages/trunk/rott/debian/patches/series
===================================================================
--- packages/trunk/rott/debian/patches/series 2009-06-29 07:53:46 UTC (rev
9919)
+++ packages/trunk/rott/debian/patches/series 2009-06-29 08:02:44 UTC (rev
9920)
@@ -1,8 +1,3 @@
#00-disable-audiolib.patch
#00-ludicrous-gibs.patch
#00-registered-version.patch
-01-gameover.patch
-02-fix-end-level-display.patch
-03-desktop-file.patch
-10-german-eszett-as-backslash.patch
-11-add-nosound-to-manpage.patch
Modified: packages/trunk/rott/debian/rules
===================================================================
--- packages/trunk/rott/debian/rules 2009-06-29 07:53:46 UTC (rev 9919)
+++ packages/trunk/rott/debian/rules 2009-06-29 08:02:44 UTC (rev 9920)
@@ -5,5 +5,6 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
CFLAGS += -DDATADIR=\\\"/usr/share/games/rott/\\\"
+CFLAGS += -Wno-pointer-sign
DEB_BUILDDIR := rott
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
