r10371 - in packages/trunk/pyracerz/debian: . patches

Barry deFreese bdefreese at alioth.debian.org
Fri Sep 25 20:23:27 UTC 2009


Author: bdefreese
Date: 2009-09-25 20:23:27 +0000 (Fri, 25 Sep 2009)
New Revision: 10371

Added:
   packages/trunk/pyracerz/debian/README.source
Modified:
   packages/trunk/pyracerz/debian/changelog
   packages/trunk/pyracerz/debian/control
   packages/trunk/pyracerz/debian/dirs
   packages/trunk/pyracerz/debian/patches/game.diff
   packages/trunk/pyracerz/debian/patches/misc.diff
   packages/trunk/pyracerz/debian/patches/series
Log:
  * Add myself to uploaders.
  * Move direct source changes to quilt patches.
  * Move docbook-to-man and quilt to build-depends-indep.
  * Bump Standards Version to 3.8.3.
    + Menu policy transition.


Added: packages/trunk/pyracerz/debian/README.source
===================================================================
--- packages/trunk/pyracerz/debian/README.source	                        (rev 0)
+++ packages/trunk/pyracerz/debian/README.source	2009-09-25 20:23:27 UTC (rev 10371)
@@ -0,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.

Modified: packages/trunk/pyracerz/debian/changelog
===================================================================
--- packages/trunk/pyracerz/debian/changelog	2009-09-25 16:50:17 UTC (rev 10370)
+++ packages/trunk/pyracerz/debian/changelog	2009-09-25 20:23:27 UTC (rev 10371)
@@ -1,17 +1,23 @@
-pyracerz (0.2-5) UNRELEASED; urgency=low
+pyracerz (0.2-5) unstable; urgency=low
 
+  [ Barry deFreese ]
+  * Add myself to uploaders.
+  * Move direct source changes to quilt patches.
+  * Move docbook-to-man and quilt to build-depends-indep.
+  * Bump Standards Version to 3.8.3.
+    + Menu policy transition.
+
   [ Carlos Galisteo ]
   * python-numeric dependence removed 
     (Windows-only dependence). (Closes: #478454)
   * Maintainer field changed. Joining Debian Games Team.
   * Uploaders field added
-  * Standards-Version updated to 3.7.3
 
   [ Ansgar Burchardt ]
   * debian/control: Add Vcs-* field
   * debian/control: Remove Homepage semi-field from description
 
- -- Carlos Galisteo <cgalisteo at k-rolus.net>  Wed, 07 May 2008 10:29:51 +0000
+ -- Barry deFreese <bdefreese at debian.org>  Fri, 25 Sep 2009 15:16:57 -0400
 
 pyracerz (0.2-4) unstable; urgency=low
 

Modified: packages/trunk/pyracerz/debian/control
===================================================================
--- packages/trunk/pyracerz/debian/control	2009-09-25 16:50:17 UTC (rev 10370)
+++ packages/trunk/pyracerz/debian/control	2009-09-25 20:23:27 UTC (rev 10371)
@@ -2,17 +2,17 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Carlos Galisteo <cgalisteo at k-rolus.net>
-Build-Depends: debhelper (>= 5.0.37.2), docbook-to-man, quilt (>= 0.39-2)
-Build-Depends-Indep: python-support (>= 0.5.3), python (>= 2.3.5-11)
-Standards-Version: 3.7.3
+Uploaders: Carlos Galisteo <cgalisteo at k-rolus.net>, Barry deFreese <bdefreese at debian.org>
+Build-Depends: debhelper (>= 5.0.37.2)
+Build-Depends-Indep: python-support (>= 0.5.3), python (>= 2.3.5-11), docbook-to-man, quilt (>= 0.39-2)
+Standards-Version: 3.8.3
 Homepage: http://pyracerz.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/pyracerz/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/pyracerz/?op=log
 
 Package: pyracerz
 Architecture: all
-Depends: ${python:Depends}, ${shlibs:Depends}, python-pygame (>= 1.7.0), libsdl-ttf2.0-0
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-pygame (>= 1.7.0), libsdl-ttf2.0-0
 Recommends: python-psyco
 Description: multiplayer top view 2D racing game
  It features multiplayer (on the same computer), tournaments, high scores,

Modified: packages/trunk/pyracerz/debian/dirs
===================================================================
--- packages/trunk/pyracerz/debian/dirs	2009-09-25 16:50:17 UTC (rev 10370)
+++ packages/trunk/pyracerz/debian/dirs	2009-09-25 20:23:27 UTC (rev 10371)
@@ -1,5 +1,6 @@
 usr/games
 usr/share/games/pyracerz
+usr/share/games/pyracerz/musics
 usr/share/pixmaps
 usr/share/applications
 var/games/pyracerz

Modified: packages/trunk/pyracerz/debian/patches/game.diff
===================================================================
--- packages/trunk/pyracerz/debian/patches/game.diff	2009-09-25 16:50:17 UTC (rev 10370)
+++ packages/trunk/pyracerz/debian/patches/game.diff	2009-09-25 20:23:27 UTC (rev 10371)
@@ -1,7 +1,7 @@
-Index: pyracerz-0.2/modules/game.py
+Index: pyRacerz-0.2/modules/game.py
 ===================================================================
---- pyracerz-0.2.orig/modules/game.py	2006-11-02 15:14:58.000000000 +0000
-+++ pyracerz-0.2/modules/game.py	2006-11-02 15:17:02.000000000 +0000
+--- pyRacerz-0.2.orig/modules/game.py	2009-09-25 16:09:02.000000000 -0400
++++ pyRacerz-0.2/modules/game.py	2009-09-25 16:09:51.000000000 -0400
 @@ -128,25 +128,25 @@
          bestRank.append(1)
  
@@ -32,7 +32,19 @@
        #misc.screen.blit(imgFireG, (10*misc.zoom,10*misc.zoom))
        #misc.screen.blit(imgFireG, (90*misc.zoom,10*misc.zoom))
        misc.screen.blit(imgFire, (170*misc.zoom,10*misc.zoom))
-@@ -591,7 +591,7 @@
+@@ -524,7 +524,10 @@
+         waitMenu = menu.SimpleTitleOnlyMenu(misc.titleFont, "recording Replay...")
+ 
+         if select2 != None and select2 != "":
+-          f = file(os.path.join("replays", select2 + ".rep"), "wb")
++	  rep_dir = os.path.join(os.getenv("HOME")+"/.pyracerz/replays")
++	  if not os.path.exists(rep_dir):
++	    os.makedirs(rep_dir)
++          f = file(os.path.join(rep_dir, select2 + ".rep"), "wb")
+ 
+           # TrackName Inv NbEnreg NbCar PlayerName1 PlayerCarColor1 PlayerCarLevel1...
+           f.write(str(misc.VERSION) + " " + currentTrack.name + " " + str(currentTrack.reverse) + " " + str(masterChrono) + " " + str(len(self.listPlayer)) + " ")
+@@ -588,7 +591,7 @@
            bestChrono = 0
            break
  
@@ -41,7 +53,7 @@
  
        # If it's a tournament, compute points
        if self.gameType == "tournament":
-@@ -643,7 +643,7 @@
+@@ -640,7 +643,7 @@
          if play.point < play2.point:
            self.rank = self.rank + 1
  

Modified: packages/trunk/pyracerz/debian/patches/misc.diff
===================================================================
--- packages/trunk/pyracerz/debian/patches/misc.diff	2009-09-25 16:50:17 UTC (rev 10370)
+++ packages/trunk/pyracerz/debian/patches/misc.diff	2009-09-25 20:23:27 UTC (rev 10371)
@@ -1,7 +1,7 @@
-Index: pyracerz-0.2/modules/misc.py
+Index: pyRacerz-0.2/modules/misc.py
 ===================================================================
---- pyracerz-0.2.orig/modules/misc.py	2006-11-02 15:30:52.000000000 +0000
-+++ pyracerz-0.2/modules/misc.py	2006-11-02 15:34:11.000000000 +0000
+--- pyRacerz-0.2.orig/modules/misc.py	2009-09-25 15:32:46.000000000 -0400
++++ pyRacerz-0.2/modules/misc.py	2009-09-25 15:33:25.000000000 -0400
 @@ -52,17 +52,17 @@
    global background
  
@@ -35,7 +35,7 @@
      for fileMusic in listFiles:
        if fileMusic.endswith(".ogg") or fileMusic.endswith(".OGG"):
          musics.append(fileMusic)
-@@ -100,7 +100,7 @@
+@@ -100,14 +100,16 @@
      if len(musics) > 0:
        rand = random.randint(0, len(musics)-1)
        try:
@@ -44,8 +44,18 @@
          pygame.mixer.music.play()
        except Exception, e:
          print "Music: %s unable to play..." % musics[rand] 
-@@ -159,16 +159,16 @@
+         print e
  
+ def stopMusic():
+-  pygame.mixer.music.fadeout(1000)
++  global music
++  if music == 1:
++    pygame.mixer.music.fadeout(1000)
+ 
+ class PopUp:
+   def __init__(self, track):
+@@ -157,16 +159,16 @@
+ 
    confFile=ConfigParser.SafeConfigParser() 
    try:
 -    confFile.readfp(file(".pyRacerz.conf", "r")) 
@@ -64,7 +74,7 @@
  
    # For the Inverse
    if track.reverse == 0:
-@@ -182,7 +182,7 @@
+@@ -180,7 +182,7 @@
      h.update(str("level" + str(level)))
      h.update(player.name)
      h.update(str(player.bestChrono))
@@ -73,7 +83,7 @@
      confFile.set("hi " + track.name, "level" + str(level), player.name + " " + str(player.bestChrono) + " " + h.hexdigest())
      confFile.write(fwrite)
      return 1
-@@ -198,7 +198,7 @@
+@@ -196,7 +198,7 @@
          h.update(str("level" + str(level)))
          h.update(player.name)
          h.update(str(player.bestChrono))
@@ -82,7 +92,7 @@
          confFile.set("hi " + track.name, "level" + str(level), player.name + " " + str(player.bestChrono) + " " + h.hexdigest())
          confFile.write(fwrite)
          return 1
-@@ -210,7 +210,7 @@
+@@ -208,7 +210,7 @@
        h.update(str("level" + str(level)))
        h.update(player.name)
        h.update(str(player.bestChrono))
@@ -91,7 +101,7 @@
        confFile.set("hi " + track.name, "level" + str(level), player.name + " " + str(player.bestChrono) + " " + h.hexdigest())
        confFile.write(fwrite)
        return 1
-@@ -219,7 +219,7 @@
+@@ -217,7 +219,7 @@
  
    confFile=ConfigParser.SafeConfigParser() 
    try:
@@ -100,7 +110,7 @@
    except Exception:
      return 0
  
-@@ -246,19 +246,19 @@
+@@ -244,20 +246,20 @@
  
    confFile=ConfigParser.SafeConfigParser() 
    try:
@@ -124,3 +134,5 @@
    confFile.set("unlockLevel", "key", str(lck) + " " + h.hexdigest())
    confFile.write(fwrite)
   
+-
++

Modified: packages/trunk/pyracerz/debian/patches/series
===================================================================
--- packages/trunk/pyracerz/debian/patches/series	2009-09-25 16:50:17 UTC (rev 10370)
+++ packages/trunk/pyracerz/debian/patches/series	2009-09-25 20:23:27 UTC (rev 10371)
@@ -1,7 +1,7 @@
 pyRacerz.diff
 car.diff
-game.diff
 menu.diff
 misc.diff
 replay.difff
 track.diff
+game.diff




More information about the Pkg-games-commits mailing list