r10613 - in packages/trunk/hex-a-hop/debian: . patches

[Barry deFreese]

Author: bdefreese
Date: 2009-12-12 16:47:38 +0000 (Sat, 12 Dec 2009)
New Revision: 10613

Added:
   packages/trunk/hex-a-hop/debian/README.source
   packages/trunk/hex-a-hop/debian/patches/gcc_4.4.patch
Modified:
   packages/trunk/hex-a-hop/debian/changelog
   packages/trunk/hex-a-hop/debian/control
   packages/trunk/hex-a-hop/debian/patches/series
Log:
  * gcc_4.4.patch - Fix invalid char * conversions. (Closes: #560483).
  * Add README.source for quilt.
  * Bump Standards Version to 3.8.3. (No changes needed).


Added: packages/trunk/hex-a-hop/debian/README.source
===================================================================
--- packages/trunk/hex-a-hop/debian/README.source	                        (rev 0)
+++ packages/trunk/hex-a-hop/debian/README.source	2009-12-12 16:47:38 UTC (rev 10613)
@@ -0,0 +1,58 @@
+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
+                break
+        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/hex-a-hop/debian/changelog
===================================================================
--- packages/trunk/hex-a-hop/debian/changelog	2009-12-12 16:29:29 UTC (rev 10612)
+++ packages/trunk/hex-a-hop/debian/changelog	2009-12-12 16:47:38 UTC (rev 10613)
@@ -1,3 +1,12 @@
+hex-a-hop (0.0.20070315-8) unstable; urgency=low
+
+  [ Barry deFreese ]
+  * gcc_4.4.patch - Fix invalid char * conversions. (Closes: #560483).
+  * Add README.source for quilt.
+  * Bump Standards Version to 3.8.3. (No changes needed).
+
+ -- Barry deFreese <bdefreese at debian.org>  Sat, 12 Dec 2009 11:31:53 -0500
+
 hex-a-hop (0.0.20070315-7) unstable; urgency=low
 
   [ Jens Seidel ]

Modified: packages/trunk/hex-a-hop/debian/control
===================================================================
--- packages/trunk/hex-a-hop/debian/control	2009-12-12 16:29:29 UTC (rev 10612)
+++ packages/trunk/hex-a-hop/debian/control	2009-12-12 16:47:38 UTC (rev 10613)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Jens Seidel <jensseidel at users.sf.net>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Barry deFreese <bdefreese at debian.org>
 Build-Depends: debhelper (>= 5), quilt, gettext, libsdl1.2-dev, libsdl-pango-dev, po4a
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://www.aceinternet.co.uk/~mokona/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/hex-a-hop/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/hex-a-hop/?op=log

Added: packages/trunk/hex-a-hop/debian/patches/gcc_4.4.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/gcc_4.4.patch	                        (rev 0)
+++ packages/trunk/hex-a-hop/debian/patches/gcc_4.4.patch	2009-12-12 16:47:38 UTC (rev 10613)
@@ -0,0 +1,27 @@
+Description: Fix invalid conversions from char * to const char *.
+Index: hex-a-hop-0.0.20070315/menus.h
+===================================================================
+--- hex-a-hop-0.0.20070315.orig/menus.h	2009-12-12 11:34:42.000000000 -0500
++++ hex-a-hop-0.0.20070315/menus.h	2009-12-12 11:35:06.000000000 -0500
+@@ -192,7 +192,7 @@
+ 	{
+ 		state = 0; time = 0;
+ 		memset(title, 0, sizeof(title));
+-		char * x = strstr(m, "|");
++		const char * x = strstr(m, "|");
+ 		if (!x)
+ 		{
+ 			msg = m;
+Index: hex-a-hop-0.0.20070315/savestate.h
+===================================================================
+--- hex-a-hop-0.0.20070315.orig/savestate.h	2009-12-12 11:35:15.000000000 -0500
++++ hex-a-hop-0.0.20070315/savestate.h	2009-12-12 11:35:31.000000000 -0500
+@@ -278,7 +278,7 @@
+ 
+ 	LevelSave* GetLevel(const char * name, bool create)
+ 	{
+-		char * l = strstr(name, "Levels");
++		const char * l = strstr(name, "Levels");
+ 		if (l)
+ 			name = l;
+ 

Modified: packages/trunk/hex-a-hop/debian/patches/series
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/series	2009-12-12 16:29:29 UTC (rev 10612)
+++ packages/trunk/hex-a-hop/debian/patches/series	2009-12-12 16:47:38 UTC (rev 10613)
@@ -15,3 +15,4 @@
 mouse-wheel-support.patch
 segfault_443822.patch
 remove_confirmation.patch
+gcc_4.4.patch