r10380 - in packages/trunk/xmoto/debian: . patches

Sat Sep 26 14:30:52 UTC 2009

Author: bdefreese
Date: 2009-09-26 14:30:33 +0000 (Sat, 26 Sep 2009)
New Revision: 10380

Added:
   packages/trunk/xmoto/debian/README.source
Modified:
   packages/trunk/xmoto/debian/changelog
   packages/trunk/xmoto/debian/control
   packages/trunk/xmoto/debian/patches/fix_segfault.patch
   packages/trunk/xmoto/debian/patches/series
Log:
  * New upstream release.
    + Remove desktop and gcc-4.4 patches as they are fixed upstream.
  * Add README.source for quilt package.
  * Bump debhelper build-dep to 5 to match compat.
  * Bump Standards Version to 3.8.3. (No changes needed).


Added: packages/trunk/xmoto/debian/README.source
===================================================================

--- packages/trunk/xmoto/debian/README.source	                        (rev 0)
+++ packages/trunk/xmoto/debian/README.source	2009-09-26 14:30:33 UTC (rev 10380)
@@ -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/xmoto/debian/changelog
===================================================================
--- packages/trunk/xmoto/debian/changelog	2009-09-26 03:56:46 UTC (rev 10379)
+++ packages/trunk/xmoto/debian/changelog	2009-09-26 14:30:33 UTC (rev 10380)
@@ -1,3 +1,14 @@
+xmoto (0.5.2-1) unstable; urgency=low
+
+  [ Barry deFreese ]
+  * New upstream release.
+    + Remove desktop and gcc-4.4 patches as they are fixed upstream.
+  * Add README.source for quilt package.
+  * Bump debhelper build-dep to 5 to match compat.
+  * Bump Standards Version to 3.8.3. (No changes needed).
+
+ -- Barry deFreese <bdefreese at debian.org>  Sat, 26 Sep 2009 10:01:44 -0400
+
 xmoto (0.5.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/trunk/xmoto/debian/control
===================================================================
--- packages/trunk/xmoto/debian/control	2009-09-26 03:56:46 UTC (rev 10379)
+++ packages/trunk/xmoto/debian/control	2009-09-26 14:30:33 UTC (rev 10380)
@@ -5,11 +5,11 @@
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Samuel Mimram <smimram at debian.org>,
  Barry deFreese <bdefreese at debian.org>,
  Gonéri Le Bouder <goneri at rulezlan.org>
-Build-Depends: debhelper (>= 4.0.0), dpkg-dev (>= 1.13.19), autotools-dev, quilt,
+Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.13.19), autotools-dev, quilt,
  libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev,
  libjpeg62-dev, libpng12-dev, zlib1g-dev, libgl1-mesa-dev | libgl-dev,
  libode-dev, liblua5.1-0-dev, libcurl4-gnutls-dev, libbz2-dev, libsqlite3-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://xmoto.tuxfamily.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/xmoto/?op=log
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/xmoto/

Modified: packages/trunk/xmoto/debian/patches/fix_segfault.patch
===================================================================
--- packages/trunk/xmoto/debian/patches/fix_segfault.patch	2009-09-26 03:56:46 UTC (rev 10379)
+++ packages/trunk/xmoto/debian/patches/fix_segfault.patch	2009-09-26 14:30:33 UTC (rev 10380)
@@ -1,8 +1,8 @@
-Index: xmoto-0.5.0/src/states/StateMainMenu.cpp
+Index: xmoto-0.5.2/src/states/StateMainMenu.cpp
 ===================================================================
---- xmoto-0.5.0.orig/src/states/StateMainMenu.cpp	2008-11-23 10:30:46.000000000 +0100
-+++ xmoto-0.5.0/src/states/StateMainMenu.cpp	2008-12-10 10:58:22.000000000 +0100
-@@ -843,6 +843,7 @@
+--- xmoto-0.5.2.orig/src/states/StateMainMenu.cpp	2009-08-05 07:46:06.000000000 -0400
++++ xmoto-0.5.2/src/states/StateMainMenu.cpp	2009-09-26 10:10:50.000000000 -0400
+@@ -871,6 +871,7 @@
    int   v_nbDiffLevels    = 0;
    std::string v_level_name= "";
    xmDatabase* pDb = xmDatabase::instance("main");
@@ -10,7 +10,7 @@
    
    if(v_window != NULL){
      delete v_window;
-@@ -860,7 +861,8 @@
+@@ -888,7 +889,8 @@
      pDb->read_DB_free(v_result);
      return;
    }
@@ -20,7 +20,7 @@
    v_since           =      pDb->getResult(v_result, 2, 0, 1);  
    pDb->read_DB_free(v_result);
  
-@@ -876,11 +878,16 @@
+@@ -904,11 +906,16 @@
      pDb->read_DB_free(v_result);
      return;
    }
@@ -42,7 +42,7 @@
    pDb->read_DB_free(v_result);
  
    v_result = pDb->readDB("SELECT COUNT(DISTINCT(id_level)) "
-@@ -891,7 +898,8 @@
+@@ -919,7 +926,8 @@
      pDb->read_DB_free(v_result);
      return;
    }  
@@ -52,7 +52,7 @@
    pDb->read_DB_free(v_result);
  
    /* Per-player info */
-@@ -943,11 +951,16 @@
+@@ -971,11 +979,16 @@
      if(cy + 45 > nHeight) break; /* out of window */
      
      v_level_name      =      pDb->getResult(v_result, 6, i, 0);

Modified: packages/trunk/xmoto/debian/patches/series
===================================================================
--- packages/trunk/xmoto/debian/patches/series	2009-09-26 03:56:46 UTC (rev 10379)
+++ packages/trunk/xmoto/debian/patches/series	2009-09-26 14:30:33 UTC (rev 10380)
@@ -1,3 +1 @@
-gcc44-ftbfs.patch
 fix_segfault.patch
-desktop.patch


