Author: steve-guest
Date: 2012-05-23 05:48:53 +0000 (Wed, 23 May 2012)
New Revision: 13604
Added:
packages/trunk/xmoto/debian/patches/remove-glext.patch
Modified:
packages/trunk/xmoto/debian/README.source
packages/trunk/xmoto/debian/changelog
packages/trunk/xmoto/debian/patches/series
Log:
Document the use of xmoto --unpack to access xmoto.bin, instead of repacking
the original tarball with the full bin folder. Update README.source, dropping
quilt info and adding glext.h and xmoto.bin instructions. Patch xm_OpenGL.h via
a quilt patch rather than in the repacked tarball.
Modified: packages/trunk/xmoto/debian/README.source
===================================================================
--- packages/trunk/xmoto/debian/README.source 2012-05-22 18:16:13 UTC (rev
13603)
+++ packages/trunk/xmoto/debian/README.source 2012-05-23 05:48:53 UTC (rev
13604)
@@ -1,57 +1,18 @@
-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.
+xmoto for Debian
+----------------
-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:
+The upstream source includes glext.h in a non-redistributable version,
+so the provided upstream tarball is repacked without that file.
+Building xmoto without glext.h required the remove-glext.patch
+provided in debian/patches (and automatically applied to the Debian
+package).
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- fi
- done
+The source includes an XML file, bin/xmoto.bin, which is built from a
+series of separate files. The original files can be extracted as
+follows:
+ cd bin
+ xmoto --unpack xmoto.bin .
+and repacked as follows:
+ xmoto --pack xmoto.bin .
-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.
+ -- Stephen Kitt <st...@sk2.org>, Wed, 23 May 2012 07:42:41 +0200
Modified: packages/trunk/xmoto/debian/changelog
===================================================================
--- packages/trunk/xmoto/debian/changelog 2012-05-22 18:16:13 UTC (rev
13603)
+++ packages/trunk/xmoto/debian/changelog 2012-05-23 05:48:53 UTC (rev
13604)
@@ -5,14 +5,13 @@
+ uses libxml2;
+ uses DejaVuSansMono (add link and make ttf-dejavu-core a dependency
of xmoto-data).
- * Repacked to avoid licensing problems:
- + remove src/glext.h, licensed under SGI License B version 1.1;
- + add the missing contents in bin (closes: #661340).
- (I'm hoping that both issues will be fixed upstream, so I haven't
- added a get-orig-source target to debian/rules. README.dfsg in the
- repacked source explains the changes.)
+ * Repacked to remove src/glext.h, licensed under SGI License B version
+ 1.1. (I'm hoping that this will be fixed upstream, so I haven't added
+ a get-orig-source target to debian/rules.)
* Update debian/watch accordingly.
* Update patches:
+ + remove-glext.patch: add (allows building without glext.h), forward
+ upstream;
+ fix_segfault.patch: refresh, add DEP-3 header, forward upstream;
+ desktop.patch: re-apply, add German translation (closes: #641822),
forward upstream;
@@ -20,7 +19,11 @@
+ manpage.patch: forward upstream;
+ gcc44-ftbfs.patch: no longer used, delete.
* Switch to dh 9 with simple rules.
- * Use source format "3.0 (quilt)".
+ * Use source format "3.0 (quilt)", drop explanations from
+ README.source.
+ * Update README.source to explain the removal of glext.h, and the use of
+ "xmoto --unpack" and "xmoto --pack" to manipulate xmoto.bin (closes:
+ #661340).
* Add ${misc:Depends} where appropriate.
* Patch the manpage to fix hyphens and a few spelling mistakes.
* Add myself to uploaders.
Added: packages/trunk/xmoto/debian/patches/remove-glext.patch
===================================================================
--- packages/trunk/xmoto/debian/patches/remove-glext.patch
(rev 0)
+++ packages/trunk/xmoto/debian/patches/remove-glext.patch 2012-05-23
05:48:53 UTC (rev 13604)
@@ -0,0 +1,19 @@
+--- xmoto-0.5.9+dfsg.orig/src/include/xm_OpenGL.h
++++ xmoto-0.5.9+dfsg/src/include/xm_OpenGL.h
+@@ -1,7 +1,6 @@
+ #ifdef ENABLE_OPENGL
+ /* Pull in OpenGL headers */
+ /* following scissored from SDL_opengl.h */
+-#define __glext_h_ /* Don't let gl.h include glext.h */
+ #ifdef HAVE_APPLE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h> /* Header File For The OpenGL Library */
+ #include <OpenGL/glu.h> /* Header File For The GLU Library */
+@@ -12,8 +11,5 @@
+ #include <GL/gl.h> /* Header File For The OpenGL Library */
+ #include <GL/glu.h> /* Header File For The GLU Library */
+ #endif
+-#undef __glext_h_
+-
+-#include "../glext.h"
+
+ #endif
Modified: packages/trunk/xmoto/debian/patches/series
===================================================================
--- packages/trunk/xmoto/debian/patches/series 2012-05-22 18:16:13 UTC (rev
13603)
+++ packages/trunk/xmoto/debian/patches/series 2012-05-23 05:48:53 UTC (rev
13604)
@@ -1,3 +1,4 @@
+remove-glext.patch
fix_segfault.patch
desktop.patch
manpage.patch
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
