r2538 - in packages/trunk/chromium/debian: . patches

Samuel Hocevar sho at alioth.debian.org
Fri Apr 6 21:11:28 UTC 2007 

Author: sho
Date: 2007-04-06 21:11:27 +0000 (Fri, 06 Apr 2007)
New Revision: 2538

Added:
   packages/trunk/chromium/debian/chromium.desktop
   packages/trunk/chromium/debian/patches/05_wall_flag.diff
   packages/trunk/chromium/debian/patches/35_powerup_crash.diff
   packages/trunk/chromium/debian/patches/40_sdl_quit.diff
   packages/trunk/chromium/debian/patches/series
Removed:
   packages/trunk/chromium/debian/patches/00list
Modified:
   packages/trunk/chromium/debian/changelog
   packages/trunk/chromium/debian/compat
   packages/trunk/chromium/debian/control
   packages/trunk/chromium/debian/patches/10_buildfixes.dpatch
   packages/trunk/chromium/debian/patches/30_new_openAL.dpatch
   packages/trunk/chromium/debian/rules
Log:
chromium (0.9.12-13) unstable; urgency=low

  * New maintainer (Closes: #417805).
  * Use quilt instead of dpatch.
  * debian/control:
    + Set maintainer to the Debian Games Team.
    + Set policy to 3.7.2.
    + Added Vcs fields.
    + Uncapitalised short description.
  * debian/compat:
    + Set level to 5.
  * debian/chromium.desktop:
    + Added Ubuntu’s .desktop, thanks to Reinhard Tartler (Closes: #364276).

  * 05_wall_flag.diff:
    + New patch. Add -Wall -W -g to the build flags.

  * debian/patches/35_powerup_crash.diff:
    + Fix a crash in the powerhup handling, courtesy of Brandon Barne
      (Closes: #411614).

  * debian/patches/40_sdl_quit.diff:
    + Honour SDL_QUIT, courtesy of Thue Janus Kristensen (Closes: #390313).

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri, 06 Apr 2007 21:05:35 +0200


Modified: packages/trunk/chromium/debian/changelog
===================================================================
--- packages/trunk/chromium/debian/changelog	2007-04-06 16:54:35 UTC (rev 2537)
+++ packages/trunk/chromium/debian/changelog	2007-04-06 21:11:27 UTC (rev 2538)
@@ -1,3 +1,29 @@
+chromium (0.9.12-13) unstable; urgency=low
+
+  * New maintainer (Closes: #417805).
+  * Use quilt instead of dpatch.
+  * debian/control:
+    + Set maintainer to the Debian Games Team.
+    + Set policy to 3.7.2.
+    + Added Vcs fields.
+    + Uncapitalised short description.
+  * debian/compat:
+    + Set level to 5.
+  * debian/chromium.desktop:
+    + Added Ubuntu’s .desktop, thanks to Reinhard Tartler (Closes: #364276).
+
+  * 05_wall_flag.diff:
+    + New patch. Add -Wall -W -g to the build flags.
+
+  * debian/patches/35_powerup_crash.diff:
+    + Fix a crash in the powerhup handling, courtesy of Brandon Barne
+      (Closes: #411614).
+
+  * debian/patches/40_sdl_quit.diff:
+    + Honour SDL_QUIT, courtesy of Thue Janus Kristensen (Closes: #390313).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri, 06 Apr 2007 21:05:35 +0200
+
 chromium (0.9.12-12) unstable; urgency=low
 
   * Rebuild for new openal

Added: packages/trunk/chromium/debian/chromium.desktop
===================================================================
--- packages/trunk/chromium/debian/chromium.desktop	2007-04-06 16:54:35 UTC (rev 2537)
+++ packages/trunk/chromium/debian/chromium.desktop	2007-04-06 21:11:27 UTC (rev 2538)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Chromium
+Comment=Scrolling space shooter
+Exec=chromium
+Icon=chromium
+Terminal=false
+Type=Application
+Categories=Application;Game;
+StartupNotify=false

Modified: packages/trunk/chromium/debian/compat
===================================================================
--- packages/trunk/chromium/debian/compat	2007-04-06 16:54:35 UTC (rev 2537)
+++ packages/trunk/chromium/debian/compat	2007-04-06 21:11:27 UTC (rev 2538)
@@ -1 +1 @@
-4
+5

Modified: packages/trunk/chromium/debian/control
===================================================================
--- packages/trunk/chromium/debian/control	2007-04-06 16:54:35 UTC (rev 2537)
+++ packages/trunk/chromium/debian/control	2007-04-06 21:11:27 UTC (rev 2538)
@@ -1,14 +1,17 @@
 Source: chromium
 Section: games
 Priority: optional
-Maintainer: Mike Furr <mfurr at debian.org>
-Build-Depends: debhelper (>> 3.0.0), libsdl1.2-dev (>= 1.2.2-3.1), libsmpeg-dev, libopenal-dev (>= 0.2005080600-1), libalut-dev, libglpng-dev, libglu1-mesa-dev | libglu1-xorg-dev, dpatch
-Standards-Version: 3.6.2.0
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
+Build-Depends: debhelper (>= 5.0), quilt, libsdl1.2-dev (>= 1.2.2-3.1), libsmpeg-dev, libopenal-dev (>= 0.2005080600-1), libalut-dev, libglpng-dev, libglu1-mesa-dev | libglu1-xorg-dev
+Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/pkg-games/packages/trunk/vegastrike-data
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/vegastrike-data/
 
 Package: chromium
 Architecture: any
 Depends: ${shlibs:Depends}, chromium-data (>= 0.9.12)
-Description: Fast paced, arcade-style, scrolling space shooter
+Description: fast paced, arcade-style, scrolling space shooter
  Chromium is a top down fast paced high action scrolling space shooter
  which uses the SDL libs. In this game you are the captain of the
  cargo  ship Chromium B.S.U., and responsible for

Deleted: packages/trunk/chromium/debian/patches/00list
===================================================================
--- packages/trunk/chromium/debian/patches/00list	2007-04-06 16:54:35 UTC (rev 2537)
+++ packages/trunk/chromium/debian/patches/00list	2007-04-06 21:11:27 UTC (rev 2538)
@@ -1,5 +0,0 @@
-10_buildfixes
-15_soundfix
-20_badcode
-25_gcc4
-30_new_openAL

Added: packages/trunk/chromium/debian/patches/05_wall_flag.diff
===================================================================
--- packages/trunk/chromium/debian/patches/05_wall_flag.diff	2007-04-06 16:54:35 UTC (rev 2537)
+++ packages/trunk/chromium/debian/patches/05_wall_flag.diff	2007-04-06 21:11:27 UTC (rev 2538)
@@ -0,0 +1,15 @@
+Index: chromium-0.9.12/src/Makefile
+===================================================================
+--- chromium-0.9.12.orig/src/Makefile	2007-04-06 22:52:03.000000000 +0200
++++ chromium-0.9.12/src/Makefile	2007-04-06 22:53:10.000000000 +0200
+@@ -10,8 +10,8 @@
+ 
+ CC	=	gcc
+ CXX	=	g++
+-CFLAGS	=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
+-CXXFLAGS=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
++CFLAGS	=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
++CXXFLAGS=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
+ INCPATH	=	-I../support/include -I../support/glpng/include -I/usr/X11R6/include
+ LINK	=	g++
+ LFLAGS	=	

Modified: packages/trunk/chromium/debian/patches/10_buildfixes.dpatch
===================================================================
--- packages/trunk/chromium/debian/patches/10_buildfixes.dpatch	2007-04-06 16:54:35 UTC (rev 2537)
+++ packages/trunk/chromium/debian/patches/10_buildfixes.dpatch	2007-04-06 21:11:27 UTC (rev 2538)
@@ -53,11 +53,11 @@
 +DATA	=	/usr/share/games/chromium/
  CC	=	gcc
  CXX	=	g++
--CFLAGS	=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
--CXXFLAGS=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
+-CFLAGS	=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
+-CXXFLAGS=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
 -INCPATH	=	-I../support/include -I../support/glpng/include -I/usr/X11R6/include
-+CFLAGS	=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DAUDIO_OPENAL -D_REENTRANT -DPKGDATADIR=\"$(DATA)\"
-+CXXFLAGS=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DAUDIO_OPENAL -D_REENTRANT -DPKGDATADIR=\"$(DATA)\"
++CFLAGS	=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -O2 -DAUDIO_OPENAL -D_REENTRANT -DPKGDATADIR=\"$(DATA)\"
++CXXFLAGS=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -O2 -DAUDIO_OPENAL -D_REENTRANT -DPKGDATADIR=\"$(DATA)\"
 +INCPATH	=	-I/usr/X11R6/include
  LINK	=	g++
  LFLAGS	=	

Modified: packages/trunk/chromium/debian/patches/30_new_openAL.dpatch
===================================================================
--- packages/trunk/chromium/debian/patches/30_new_openAL.dpatch	2007-04-06 16:54:35 UTC (rev 2537)
+++ packages/trunk/chromium/debian/patches/30_new_openAL.dpatch	2007-04-06 21:11:27 UTC (rev 2538)
@@ -5,9 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad chromium-0.9.12~/src/AudioOpenAL.cpp chromium-0.9.12/src/AudioOpenAL.cpp
---- chromium-0.9.12~/src/AudioOpenAL.cpp	2006-03-18 16:41:04.068208147 -0500
-+++ chromium-0.9.12/src/AudioOpenAL.cpp	2006-03-18 16:41:21.455038047 -0500
+Index: chromium-0.9.12/src/AudioOpenAL.cpp
+===================================================================
+--- chromium-0.9.12.orig/src/AudioOpenAL.cpp	2007-04-06 22:26:45.000000000 +0200
++++ chromium-0.9.12/src/AudioOpenAL.cpp	2007-04-06 22:26:45.000000000 +0200
 @@ -52,8 +52,8 @@
  	//try to use OpenAL alc[GS]etAudioChannel extensions in linux...
  	#ifdef __linux__ 
@@ -59,9 +60,10 @@
  	}
  	return retVal;
  #endif//USE_PLAYLIST
-diff -urNad chromium-0.9.12~/src/AudioOpenAL.h chromium-0.9.12/src/AudioOpenAL.h
---- chromium-0.9.12~/src/AudioOpenAL.h	2006-03-18 16:41:03.165372759 -0500
-+++ chromium-0.9.12/src/AudioOpenAL.h	2006-03-18 16:41:04.531123744 -0500
+Index: chromium-0.9.12/src/AudioOpenAL.h
+===================================================================
+--- chromium-0.9.12.orig/src/AudioOpenAL.h	2001-03-20 16:11:07.000000000 +0100
++++ chromium-0.9.12/src/AudioOpenAL.h	2007-04-06 22:26:45.000000000 +0200
 @@ -16,6 +16,7 @@
  #include <openal.h>
  #else //macintosh

Added: packages/trunk/chromium/debian/patches/35_powerup_crash.diff
===================================================================
--- packages/trunk/chromium/debian/patches/35_powerup_crash.diff	2007-04-06 16:54:35 UTC (rev 2537)
+++ packages/trunk/chromium/debian/patches/35_powerup_crash.diff	2007-04-06 21:11:27 UTC (rev 2538)
@@ -0,0 +1,19 @@
+Index: chromium-0.9.12/src/HeroAircraft.cpp
+===================================================================
+--- chromium-0.9.12.orig/src/HeroAircraft.cpp	2007-04-06 22:27:23.000000000 +0200
++++ chromium-0.9.12/src/HeroAircraft.cpp	2007-04-06 22:28:08.000000000 +0200
+@@ -663,12 +663,12 @@
+ 			}
+ 			game->explosions->addExplo(Explosions::PowerBurst, pwrUp->pos);
+ 			delUp = pwrUp;
+-			pwrUp = powerUps->getNext();
++			pwrUp = pwrUp->next;
+ 			powerUps->remove(delUp);
+ 		}
+ 		else
+ 		{
+-			pwrUp = powerUps->getNext();
++			pwrUp = pwrUp->next;
+ 		}
+ 	}
+ }

Added: packages/trunk/chromium/debian/patches/40_sdl_quit.diff
===================================================================
--- packages/trunk/chromium/debian/patches/40_sdl_quit.diff	2007-04-06 16:54:35 UTC (rev 2537)
+++ packages/trunk/chromium/debian/patches/40_sdl_quit.diff	2007-04-06 21:11:27 UTC (rev 2538)
@@ -0,0 +1,13 @@
+Index: chromium-0.9.12/src/MainSDL_Event.cpp
+===================================================================
+--- chromium-0.9.12.orig/src/MainSDL_Event.cpp	2007-04-06 22:28:46.000000000 +0200
++++ chromium-0.9.12/src/MainSDL_Event.cpp	2007-04-06 22:29:28.000000000 +0200
+@@ -71,6 +71,8 @@
+ 		case SDL_JOYBUTTONUP:
+ 			joystickButtonUp(event);
+ 			break;
++		case SDL_QUIT:
++			return true;
+ 		default:
+ 			break;
+ 	}

Copied: packages/trunk/chromium/debian/patches/series (from rev 2533, packages/trunk/chromium/debian/patches/00list)
===================================================================
--- packages/trunk/chromium/debian/patches/00list	2007-04-05 20:50:43 UTC (rev 2533)
+++ packages/trunk/chromium/debian/patches/series	2007-04-06 21:11:27 UTC (rev 2538)
@@ -0,0 +1,8 @@
+05_wall_flag.diff
+10_buildfixes.dpatch
+15_soundfix.dpatch
+20_badcode.dpatch
+25_gcc4.dpatch
+30_new_openAL.dpatch
+35_powerup_crash.diff
+40_sdl_quit.diff

Modified: packages/trunk/chromium/debian/rules
===================================================================
--- packages/trunk/chromium/debian/rules	2007-04-06 16:54:35 UTC (rev 2537)
+++ packages/trunk/chromium/debian/rules	2007-04-06 21:11:27 UTC (rev 2538)
@@ -4,12 +4,11 @@
 #export DH_VERBOSE=1
 
 PACKAGE=chromium
-include /usr/share/dpatch/dpatch.make
 
 configure: configure-stamp
-
-configure-stamp: patch-stamp
+configure-stamp:
 	dh_testdir
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	./configure  --disable-setup
 	touch configure-stamp
 
@@ -19,13 +18,12 @@
 	$(MAKE)
 	touch build-stamp
 
-clean: patch clean1 unpatch
-
-clean1:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	-$(MAKE) distclean
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	dh_clean
 
 install: build
@@ -35,6 +33,7 @@
 	dh_installdirs
 	dh_install bin/chromium usr/games
 	dh_install debian/chromium.xpm usr/share/pixmaps
+	dh_install debian/chromium.desktop usr/share/applications
 
 binary-indep:
 
@@ -45,6 +44,7 @@
 	dh_installmenu
 	dh_installman debian/chromium.6
 	dh_installchangelogs CHANGES
+	dh_desktop
 	dh_strip
 	dh_compress
 	dh_fixperms

More information about the Pkg-games-commits mailing list