[adonthell] 13/65: * 10_ftbfs_with_gcc-4.4.diff. Fix FTBFS with gcc-4.4. (Closes: #546356). + Thanks to Ilya Barygin for the patch! * Add README.source for quilt. * Bump Standards Version to 3.8.3. (No changes needed).

Tue Jul 12 19:53:51 UTC 2016

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository adonthell.

commit 2d8768380a84fa4648b06aff56859845a813c06c
Author: Barry deFreese <bdefreese at debian.org>
Date:   Sat Dec 12 14:13:26 2009 +0000

      * 10_ftbfs_with_gcc-4.4.diff. Fix FTBFS with gcc-4.4. (Closes: #546356).
        + Thanks to Ilya Barygin for the patch!
      * Add README.source for quilt.
      * Bump Standards Version to 3.8.3. (No changes needed).
---
 debian/README.source                      | 58 +++++++++++++++++++++++++++++++
 debian/changelog                          | 10 ++++++
 debian/control                            |  2 +-
 debian/patches/10_ftbfs_with_gcc-4.4.diff | 25 +++++++++++++
 debian/patches/series                     |  1 +
 5 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..5dde0bf
--- /dev/null
+++ b/debian/README.source
@@ -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.
diff --git a/debian/changelog b/debian/changelog
index 15c8e06..31cc6f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+adonthell (0.3.5-3) unstable; urgency=low
+
+  [ Barry deFreese ]
+  * 10_ftbfs_with_gcc-4.4.diff. Fix FTBFS with gcc-4.4. (Closes: #546356).
+    + Thanks to Ilya Barygin for the patch!
+  * 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 09:01:51 -0500
+
 adonthell (0.3.5-2) unstable; urgency=low
 
   [ Barry deFreese ]
diff --git a/debian/control b/debian/control
index 3d34011..f0f23c8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bdefreese at debian.org>, Iain Lane <laney at ubuntu.com>
 Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, libsdl1.2-dev, libvorbis-dev, zlib1g-dev, swig1.3 (>= 1.3.14), libfreetype6-dev, libaa1-dev, python-dev (>= 2.3.5-11), python-support (>= 0.4.0), libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, quilt (>= 0.40), python2.4-dev [arm armel]
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://adonthell.linuxgames.com/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/adonthell/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/adonthell/?op=log
diff --git a/debian/patches/10_ftbfs_with_gcc-4.4.diff b/debian/patches/10_ftbfs_with_gcc-4.4.diff
new file mode 100644
index 0000000..2960891
--- /dev/null
+++ b/debian/patches/10_ftbfs_with_gcc-4.4.diff
@@ -0,0 +1,25 @@
+Patch backported from http://github.com/ksterker/adonthell/tree/master,
+commit c620028d36510103d15efe15fed11532a4cd4a71
+Index: adonthell-0.3.5/src/dialog.cc
+===================================================================
+--- adonthell-0.3.5.orig/src/dialog.cc	2009-09-12 09:35:25.000000000 +0400
++++ adonthell-0.3.5/src/dialog.cc	2009-09-12 09:49:58.000000000 +0400
+@@ -265,7 +265,8 @@
+ {
+     u_int32 begin, end, len;
+     PyObject *result;
+-    char *tmp, *start, *mid, *str = NULL;
++    char *tmp, *mid, *str = NULL;
++    const char *start;
+     character *the_player = data::the_player;
+     string newstr (s); 
+ 
+@@ -318,7 +319,7 @@
+ 
+         // Error!
+         cout << "\n*** Error, unknown macro " << start << flush;
+-        start[0] = ' ';
++        newstr[newstr.length () - strlen (start)] = ' ';
+     }
+     
+     // execute python functions
diff --git a/debian/patches/series b/debian/patches/series
index 39e74e9..012cf82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 04_do_not_ship_pyc.diff
+10_ftbfs_with_gcc-4.4.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/adonthell.git

