r10507 - in packages/trunk/holotz-castle/debian: . patches

Fri Nov 13 14:50:47 UTC 2009

Author: bdefreese
Date: 2009-11-13 14:50:47 +0000 (Fri, 13 Nov 2009)
New Revision: 10507

Added:
   packages/trunk/holotz-castle/debian/README.source
   packages/trunk/holotz-castle/debian/patches/11_dirent64.patch
Modified:
   packages/trunk/holotz-castle/debian/changelog
   packages/trunk/holotz-castle/debian/control
   packages/trunk/holotz-castle/debian/patches/series
Log:
  * 11_dirent64.patch-JFS.cpp change dirent64 to dirent. (Closes: #552900).
  * Add README.source for quilt.
  * Bump Standards Version to 3.8.3. (No changes needed).


Added: packages/trunk/holotz-castle/debian/README.source
===================================================================

--- packages/trunk/holotz-castle/debian/README.source	                        (rev 0)
+++ packages/trunk/holotz-castle/debian/README.source	2009-11-13 14:50:47 UTC (rev 10507)
@@ -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/holotz-castle/debian/changelog
===================================================================
--- packages/trunk/holotz-castle/debian/changelog	2009-11-13 14:28:54 UTC (rev 10506)
+++ packages/trunk/holotz-castle/debian/changelog	2009-11-13 14:50:47 UTC (rev 10507)
@@ -1,3 +1,12 @@
+holotz-castle (1.3.14-2) unstable; urgency=low
+
+  [ Barry deFreese ]
+  * 11_dirent64.patch-JFS.cpp change dirent64 to dirent. (Closes: #552900).
+  * Add README.source for quilt.
+  * Bump Standards Version to 3.8.3. (No changes needed).
+
+ -- Barry deFreese <bdefreese at debian.org>  Fri, 13 Nov 2009 09:12:48 -0500
+
 holotz-castle (1.3.14-1) unstable; urgency=low
 
   [ Barry deFreese ]

Modified: packages/trunk/holotz-castle/debian/control
===================================================================
--- packages/trunk/holotz-castle/debian/control	2009-11-13 14:28:54 UTC (rev 10506)
+++ packages/trunk/holotz-castle/debian/control	2009-11-13 14:50:47 UTC (rev 10507)
@@ -5,7 +5,7 @@
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>
 Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.13.19), quilt,
  libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://www.mainreactor.net/holotzcastle/en/index_en.html
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/holotz-castle/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/holotz-castle/?op=log

Added: packages/trunk/holotz-castle/debian/patches/11_dirent64.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/11_dirent64.patch	                        (rev 0)
+++ packages/trunk/holotz-castle/debian/patches/11_dirent64.patch	2009-11-13 14:50:47 UTC (rev 10507)
@@ -0,0 +1,15 @@
+Index: holotz-castle-1.3.14/JLib/JLib/Util/JFS.cpp
+===================================================================
+--- holotz-castle-1.3.14.orig/JLib/JLib/Util/JFS.cpp	2009-11-13 09:12:02.000000000 -0500
++++ holotz-castle-1.3.14/JLib/JLib/Util/JFS.cpp	2009-11-13 09:12:29.000000000 -0500
+@@ -886,8 +886,8 @@
+ 		s32 n, k;
+ 
+ 		// Si es un directorio lo importa recursivamente
+-		struct dirent64 **namelist;
+-		n = scandir64(filename, &namelist, 0, alphasort);
++		struct dirent **namelist;
++		n = scandir(filename, &namelist, 0, alphasort);
+ 
+ 		if (n < 0)
+ 		{

Modified: packages/trunk/holotz-castle/debian/patches/series
===================================================================
--- packages/trunk/holotz-castle/debian/patches/series	2009-11-13 14:28:54 UTC (rev 10506)
+++ packages/trunk/holotz-castle/debian/patches/series	2009-11-13 14:50:47 UTC (rev 10507)
@@ -8,3 +8,4 @@
 08_jlib_jtree.patch -p1
 09_gcc-4.3.patch
 10_dont_hardcode_g++41.patch
+11_dirent64.patch


