[Pkg-sdl-commits] r249 - in unstable: . sdl-image1.2 sdl-image1.2/debian sdl-image1.2/debian/patches

Barry deFreese bdefreese at alioth.debian.org
Sun Nov 1 06:26:11 UTC 2009


Author: bdefreese
Date: 2009-11-01 18:26:10 +0000 (Sun, 01 Nov 2009)
New Revision: 249

Added:
   unstable/sdl-image1.2/
   unstable/sdl-image1.2/debian/
   unstable/sdl-image1.2/debian/Makefile
   unstable/sdl-image1.2/debian/changelog
   unstable/sdl-image1.2/debian/compat
   unstable/sdl-image1.2/debian/control
   unstable/sdl-image1.2/debian/copyright
   unstable/sdl-image1.2/debian/docs
   unstable/sdl-image1.2/debian/libsdl-image1.2-dev.examples
   unstable/sdl-image1.2/debian/libsdl-image1.2-dev.install
   unstable/sdl-image1.2/debian/libsdl-image1.2.install
   unstable/sdl-image1.2/debian/patches/
   unstable/sdl-image1.2/debian/patches/acinclude.diff
   unstable/sdl-image1.2/debian/patches/aclocal.diff
   unstable/sdl-image1.2/debian/patches/aclocal_post_aclocal.diff
   unstable/sdl-image1.2/debian/patches/bug256660.patch
   unstable/sdl-image1.2/debian/patches/bug267169.diff
   unstable/sdl-image1.2/debian/patches/bug378173.patch
   unstable/sdl-image1.2/debian/patches/configure.diff
   unstable/sdl-image1.2/debian/rules
   unstable/sdl-image1.2/debian/shlibs.local
   unstable/sdl-image1.2/debian/watch
Log:
Add sdl-image1.2 packge to SDL team repo.


Added: unstable/sdl-image1.2/debian/Makefile
===================================================================
--- unstable/sdl-image1.2/debian/Makefile	                        (rev 0)
+++ unstable/sdl-image1.2/debian/Makefile	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1,14 @@
+# Makefile for showimage
+
+CC = gcc
+CFLAGS = -Wall -O
+LIBS = -I/usr/include/SDL -lSDL_image
+EXE = showimage
+
+all: $(EXE)
+
+showimage: showimage.c Makefile
+	$(CC) -o $@ $@.c $(CFLAGS) $(LIBS)
+
+clean:
+	-rm *.o $(EXE)

Added: unstable/sdl-image1.2/debian/changelog
===================================================================
--- unstable/sdl-image1.2/debian/changelog	                        (rev 0)
+++ unstable/sdl-image1.2/debian/changelog	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1,248 @@
+sdl-image1.2 (1.2.8-1) unstable; urgency=low
+
+  * New upstream release.
+    - adds pkg-config support (Closes: #515123)
+
+ -- Michael Koch <konqueror at gmx.de>  Thu, 22 Oct 2009 23:09:13 +0200
+
+sdl-image1.2 (1.2.7-2) unstable; urgency=low
+
+  * debian/control:
+    - Added ${misc:Depends} to all Depends.
+    - Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de>  Mon, 31 Aug 2009 08:17:06 +0200
+
+sdl-image1.2 (1.2.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: Build-Depends on debhelper (>= 5).
+  * debian/control: Updated Standards-Version to 3.8.2.
+  * debian/control: Add Homepage field.
+  * debian/watch: Updated watch file for easier upstream updates.
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 21 Jul 2009 21:08:48 +0200
+
+sdl-image1.2 (1.2.6-3) unstable; urgency=low
+
+  * CVE-2008-0544: Fix heap based buffer overflow.
+  * Force library to link libjpeg and libtif and not dlopen them during
+    runtime.
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 05 Feb 2008 23:10:31 +0100
+
+sdl-image1.2 (1.2.6-2) unstable; urgency=high
+
+  * Fixed buffer overflow when reading GIFs. CVE pending.
+  * Updated Standards-Version to 3.7.3.
+
+ -- Michael Koch <konqueror at gmx.de>  Sun, 27 Jan 2008 23:44:23 +0100
+
+sdl-image1.2 (1.2.6-1) unstable; urgency=low
+
+  * New upstream release. Closes: #437005.
+  * Replaced obsolete ${Source-Version}.
+  * Handle errors better in clean target.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 11 Aug 2007 16:42:46 +0200
+
+sdl-image1.2 (1.2.5-3) unstable; urgency=low
+
+  * Updated config.guess and config.sub (Closes: #401526).
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 16 Jan 2007 08:38:19 +0100
+
+sdl-image1.2 (1.2.5-2) unstable; urgency=low
+
+  * Added patch to make SDL_image 1.2 less segfault. Thanks to Margarita
+    Manterola for the patch (Closes: #378173).
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 22 Jul 2006 04:30:39 +0000
+
+sdl-image1.2 (1.2.5-1) unstable; urgency=low
+
+  * New upstream release
+  * Updated Build-Depends and Depends to SDL 1.2.10
+  * Updated minimum shlibs version to 1.2.5
+  * Updated Standards-Version to 3.7.2
+  * Simplified watch file
+  * Fixed address of FSF in debian/copyright
+
+ -- Michael Koch <konqueror at gmx.de>  Fri,  9 Jun 2006 07:21:47 +0000
+
+sdl-image1.2 (1.2.4-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/copyright: Fixed header for license text (Closes: #290199)
+  * Updated config.guess and config.sub (Closes: #267493)
+  * debian/rules: Use dh_installman instead of dh_installmanpages
+
+ -- Michael Koch <konqueror at gmx.de>  Wed, 23 Feb 2005 10:44:58 +0000
+
+sdl-image1.2 (1.2.3-6) unstable; urgency=low
+
+  * Fixed download URL in debian/copyright
+  * Added debian/watch
+  * Add -ltiff before -ljpeg. Added debian/patches/bug267169.diff for this
+    (Closes: #267169)
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 16 Nov 2004 18:24:14 +0000
+
+sdl-image1.2 (1.2.3-5) unstable; urgency=low
+
+  * libsdl-image1.2-dev: Updated Depends to use libtiff4-dev (Closes: #262160)
+    Thanks to Jochen Friedrich.
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 30 Jul 2004 20:27:09 +0200
+
+sdl-image1.2 (1.2.3-4) unstable; urgency=low
+
+  * Build-Depend on libtiff4-dev.
+  * debian/copyright: Updated download URL, author mail address
+    and copyrigth notice.
+  * libsdl-image1.2-dev: Updated section to libdevel.
+
+ -- Michael Koch <konqueror at gmx.de>  Sun, 25 Jul 2004 20:44:14 +0200
+
+sdl-image1.2 (1.2.3-3) unstable; urgency=low
+
+  * Added patch from Ivo Danihelka <ivo.danihelka at rdc.cz>
+    (Closes: 256660).
+  * Updated Standards-Version to 3.6.1.
+  * Build depend on debhelper (>= 4.0.0).
+  * Use debian/compat instead of DH_COMPAT.
+  * Raised debhelper compat level to 4.
+  * Use dh_install instead of dh_movefiles.
+
+ -- Michael Koch <konqueror at gmx.de>  Thu,  8 Jul 2004 11:39:58 +0200
+
+sdl-image1.2 (1.2.3-2) unstable; urgency=low
+
+  * Build-Depends on libpng12-dev not libpng3-dev.
+  * libsdl-image1.2-dev: Depends on libpng12-dev instead of libpng3-dev.
+  * Bumped Standards-Version to 3.5.10.
+
+ -- Michael Koch <konqueror at gmx.de>  Mon, 23 Jun 2003 05:38:52 +0000
+
+sdl-image1.2 (1.2.3-1) unstable; urgency=low
+
+  * New upstream version.
+  * Conflicts with packages explicitely linking libpng2 (Closes: #178802).
+  * Bumped Standards-Version to 3.5.9.
+  * Fixed "noopt" handling in debian/rules.
+  * Changed debian/shlibs.local to fix libsdl1.2debian dependency. 
+
+ -- Michael Koch <konqueror at gmx.de>  Thu, 20 Mar 2003 12:48:26 +0100
+
+sdl-image1.2 (1.2.2-5) unstable; urgency=low
+
+  * Bumped Standards-Version to 3.5.8. 
+
+ -- Michael Koch <konqueror at gmx.de>  Thu, 12 Dec 2002 19:48:39 +0100
+
+sdl-image1.2 (1.2.2-4) unstable; urgency=low
+
+  * Support "noopt" option and dropped "debug".
+  * Enabled TIFF and XCF support.
+  * Cleaned up debian rules.
+
+ -- Michael Koch <konqueror at gmx.de>  Wed, 23 Oct 2002 17:07:37 +0200
+
+sdl-image1.2 (1.2.2-3) unstable; urgency=low
+
+  * Updated Standard-Version to 3.5.7. 
+
+ -- Michael Koch <konqueror at gmx.de>  Thu,  5 Sep 2002 16:59:08 +0200
+
+sdl-image1.2 (1.2.2-2) unstable; urgency=low
+
+  * New maintainer (Closes: #158940).
+  * Build-Depend on libpng3-dev (Closes: #153871, #156033).
+  * libsdl-image1.2-dev depend on libpng3-dev.
+  * added AM_MAINTAINER_MODE to configure.in to get rid of conflicts to
+    aclocal, autoconf, automake (Closes: #153851).
+  * use debhelper compat mode 3 (Build-Depend on debhelper >> 3.0).
+  * add support for DEB_HOST_GNU_TYPE, DEB_BUILD_GNU_TYPE and
+    DEB_BUILD_OPTIONS.
+  * removed postinst script. debhelper does all automatically.
+  * reworked debian/rules
+
+ -- Michael Koch <konqueror at gmx.de>  Wed,  4 Sep 2002 09:29:11 +0200
+
+sdl-image1.2 (1.2.2-1) unstable; urgency=low
+
+  * new upstream version (closes: #150670)
+  * build-depend on new SDL 1.2.4
+  * patch acinclude.m4, configure.in
+  * re-run libtoolize --force --copy; aclocal; patch aclocal.m4 to include
+    SDL_LIBS_FOR_LIBS, then run automake --foreign; autoconf
+  * depend on libpng-dev, not on (older) libpng2-dev (closes: #152302)
+
+ -- Christian T. Steigies <cts at debian.org>  Mon,  8 Jul 2002 23:03:25 -0400
+
+sdl-image1.2 (1.2.1-2) unstable; urgency=low
+
+  * libsdl-image1.2-dev should depend on -dev packages, thanks Junichi
+  * Ok, I've had enough. To make it build on slower arches as well we now
+    build-conflict with aclocal, autoconf, automake 
+  * "missing" has to be executable
+
+ -- Christian T. Steigies <cts at debian.org>  Sat, 13 Apr 2002 22:15:49 -0400
+
+sdl-image1.2 (1.2.1-1.1) unstable; urgency=low
+
+  * NMU
+  * built against libsdl1.2 1.2.2-3.3
+  * acinclude.m4: removed copy of sdl.m4
+  * configure.in: IMG_LIBS should use SDL_LIBS_FOR_LIBS, not SDL_LIBS
+  * re-ran libtoolize --force --copy; aclocal; automake --foreign; autoconf
+  * debian/control:
+    - updated Build-Depends and Depends on libsdl1.2 to 1.2.2-3.3
+    - tweaked package descriptions
+
+ -- Branden Robinson <branden at debian.org>  Tue, 25 Dec 2001 05:45:38 -0500
+
+sdl-image1.2 (1.2.1-1) unstable; urgency=low
+
+  * new upstream version
+  * tried to add Branden's fixes again in Makefile.am, aclocal.m4 and
+    configure.in
+  * re-ran libtoolize --force --copy; aclocal; automake --foreign; autoconf
+
+ -- Christian T. Steigies <cts at debian.org>  Tue, 18 Dec 2001 21:21:39 -0500
+
+sdl-image1.2 (1.2.0-2) unstable; urgency=low
+
+  * fix section in control file, libsdl-image1.2 goes in libs, -dev in devel
+
+ -- Christian T. Steigies <cts at debian.org>  Mon, 12 Nov 2001 21:15:11 -0500
+
+sdl-image1.2 (1.2.0-1.1) unstable; urgency=low
+
+  * NMU to fix the Big SDL and X Extension Library Problem (Closes: #115051)
+  * built against libsdl1.2 1.2.2-3.1
+  * Thanks to Eric Gillespie, Jr. for help preparing this solution.
+  * Makefile.am: use @SDL_LIBS_FOR_LIBS@ for the SDL image library itself,
+    and @SDL_LIBS@ for the sample program
+  * acinclude.m4: removed copy of sdl.m4
+  * configure.in: don't define LIBS here
+  * re-ran libtoolize --force --copy; aclocal; automake --foreign; autoconf
+  * debian/control:
+    - bumped Standards-Version
+    - add Build-Depends on zlib1g-dev
+    - add versioning of (>= 1.2.2-3.1) to Build-Dep on libsdl1.2-dev
+      (it contains the logic for @SDL_LIBS_FOR_LIBS@)
+    - add versioning of (>= 1.2.2-3.1) to libsdl-image1.2-dev's dependency on
+      libsdl1.2-dev
+  * debian/postinst: only run ldconfig if $1 = "configure"
+  * debian/rules:
+    - remove some crack-smoking file deletion from the build rule (it always
+      fails, and is taken care of in the install rule)
+
+ -- Branden Robinson <branden at debian.org>  Wed, 10 Oct 2001 12:33:40 -0500
+
+sdl-image1.2 (1.2.0-1) unstable; urgency=low
+
+  * sdl-image for SDL1.2. Initial Release. (closes: #94452)
+
+ -- Christian T. Steigies <cts at debian.org>  Fri, 20 Apr 2001 15:19:03 -0400

Added: unstable/sdl-image1.2/debian/compat
===================================================================
--- unstable/sdl-image1.2/debian/compat	                        (rev 0)
+++ unstable/sdl-image1.2/debian/compat	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1 @@
+5

Added: unstable/sdl-image1.2/debian/control
===================================================================
--- unstable/sdl-image1.2/debian/control	                        (rev 0)
+++ unstable/sdl-image1.2/debian/control	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1,30 @@
+Source: sdl-image1.2
+Section: libs
+Priority: optional
+Maintainer: Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 5), libsdl1.2-dev (>= 1.2.10), libjpeg62-dev, libpng12-dev, libtiff4-dev, zlib1g-dev
+Standards-Version: 3.8.3
+Homepage: http://www.libsdl.org/projects/SDL_image/
+
+Package: libsdl-image1.2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: criticalmass (<< 0.97-2), libsdl-perl (<< 1.16-2), burgerspace (<< 1.6.1-1), armagetron (<< 0.1.4.9-5), libparagui1.0 (<= 0.1.0-1)
+Section: libs
+Description: image loading library for Simple DirectMedia Layer 1.2
+ This is a simple library to load images of various formats as SDL surfaces.
+ This library currently supports BMP, PPM, PCX, GIF, JPEG, PNG, TIFF, and XPM
+ formats.
+
+Package: libsdl-image1.2-dev
+Architecture: any
+Depends: libsdl-image1.2 (= ${binary:Version}), libc6-dev, libsdl1.2-dev (>= 1.2.10), libjpeg62-dev, libpng12-dev, libtiff4-dev, zlib1g-dev, ${misc:Depends}
+Section: libdevel
+Conflicts: libsdl-image-dev, libsdl-image1.0-dev, libsdl-image1.1-dev
+Description: development files for SDL 1.2 image loading libray
+ This is a simple library to load images of various formats as SDL surfaces.
+ This library currently supports BMP, PPM, PCX, GIF, JPEG, PNG, TIFF, and XPM
+ formats.
+ .
+ This package contains the include files and static libraries required to
+ support development using the SDL 1.2 image loading library.

Added: unstable/sdl-image1.2/debian/copyright
===================================================================
--- unstable/sdl-image1.2/debian/copyright	                        (rev 0)
+++ unstable/sdl-image1.2/debian/copyright	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1,28 @@
+This package was debianized by Christian T. Steigies <cts at debian.org> on
+Fri, 20 Apr 2001 15:22:49 -0400
+
+It was downloaded from http://www.libsdl.org/projects/SDL_image/
+
+Upstream Author: Sam Lantinga <slouken at libsdl.org>
+
+Copyright: (c) 1997-2009 Sam Lantinga
+
+License:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+On Debian GNU/Linux systems, the complete text of the GNU Library General 
+Public License is found in `/usr/share/common-licenses/LGPL-2.1'.
+

Added: unstable/sdl-image1.2/debian/docs
===================================================================
--- unstable/sdl-image1.2/debian/docs	                        (rev 0)
+++ unstable/sdl-image1.2/debian/docs	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1 @@
+README

Added: unstable/sdl-image1.2/debian/libsdl-image1.2-dev.examples
===================================================================
--- unstable/sdl-image1.2/debian/libsdl-image1.2-dev.examples	                        (rev 0)
+++ unstable/sdl-image1.2/debian/libsdl-image1.2-dev.examples	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1,2 @@
+debian/Makefile
+showimage.c

Added: unstable/sdl-image1.2/debian/libsdl-image1.2-dev.install
===================================================================
--- unstable/sdl-image1.2/debian/libsdl-image1.2-dev.install	                        (rev 0)
+++ unstable/sdl-image1.2/debian/libsdl-image1.2-dev.install	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1,5 @@
+usr/include/SDL
+usr/lib/libSDL_image.a
+usr/lib/libSDL_image.la
+usr/lib/libSDL_image.so
+usr/lib/pkgconfig

Added: unstable/sdl-image1.2/debian/libsdl-image1.2.install
===================================================================
--- unstable/sdl-image1.2/debian/libsdl-image1.2.install	                        (rev 0)
+++ unstable/sdl-image1.2/debian/libsdl-image1.2.install	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1 @@
+usr/lib/libSDL_image-1.2*

Added: unstable/sdl-image1.2/debian/patches/acinclude.diff
===================================================================
--- unstable/sdl-image1.2/debian/patches/acinclude.diff	                        (rev 0)
+++ unstable/sdl-image1.2/debian/patches/acinclude.diff	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1,180 @@
+--- SDL_image-1.2.2/acinclude.m4	Fri Nov  2 15:39:05 2001
++++ sdl-image1.2-1.2.2/acinclude.m4	Tue Jun 25 22:58:51 2002
+@@ -1,177 +1,3 @@
+-# Configure paths for SDL
+-# Sam Lantinga 9/21/99
+-# stolen from Manish Singh
+-# stolen back from Frank Belew
+-# stolen from Manish Singh
+-# Shamelessly stolen from Owen Taylor
+-
+-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
+-dnl
+-AC_DEFUN(AM_PATH_SDL,
+-[dnl 
+-dnl Get the cflags and libraries from the sdl-config script
+-dnl
+-AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
+-            sdl_prefix="$withval", sdl_prefix="")
+-AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
+-            sdl_exec_prefix="$withval", sdl_exec_prefix="")
+-AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
+-		    , enable_sdltest=yes)
+-
+-  if test x$sdl_exec_prefix != x ; then
+-     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
+-     if test x${SDL_CONFIG+set} != xset ; then
+-        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+-     fi
+-  fi
+-  if test x$sdl_prefix != x ; then
+-     sdl_args="$sdl_args --prefix=$sdl_prefix"
+-     if test x${SDL_CONFIG+set} != xset ; then
+-        SDL_CONFIG=$sdl_prefix/bin/sdl-config
+-     fi
+-  fi
+-
+-  AC_REQUIRE([AC_CANONICAL_TARGET])
+-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+-  min_sdl_version=ifelse([$1], ,0.11.0,$1)
+-  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+-  no_sdl=""
+-  if test "$SDL_CONFIG" = "no" ; then
+-    no_sdl=yes
+-  else
+-    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
+-    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+-
+-    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-    if test "x$enable_sdltest" = "xyes" ; then
+-      ac_save_CFLAGS="$CFLAGS"
+-      ac_save_LIBS="$LIBS"
+-      CFLAGS="$CFLAGS $SDL_CFLAGS"
+-      LIBS="$LIBS $SDL_LIBS"
+-dnl
+-dnl Now check if the installed SDL is sufficiently new. (Also sanity
+-dnl checks the results of sdl-config to some extent
+-dnl
+-      rm -f conf.sdltest
+-      AC_TRY_RUN([
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include "SDL.h"
+-
+-char*
+-my_strdup (char *str)
+-{
+-  char *new_str;
+-  
+-  if (str)
+-    {
+-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+-      strcpy (new_str, str);
+-    }
+-  else
+-    new_str = NULL;
+-  
+-  return new_str;
+-}
+-
+-int main (int argc, char *argv[])
+-{
+-  int major, minor, micro;
+-  char *tmp_version;
+-
+-  /* This hangs on some systems (?)
+-  system ("touch conf.sdltest");
+-  */
+-  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+-
+-  /* HP/UX 9 (%@#!) writes to sscanf strings */
+-  tmp_version = my_strdup("$min_sdl_version");
+-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+-     printf("%s, bad version string\n", "$min_sdl_version");
+-     exit(1);
+-   }
+-
+-   if (($sdl_major_version > major) ||
+-      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+-      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
+-    {
+-      return 0;
+-    }
+-  else
+-    {
+-      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+-      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+-      printf("*** best to upgrade to the required version.\n");
+-      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
+-      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+-      printf("*** config.cache before re-running configure\n");
+-      return 1;
+-    }
+-}
+-
+-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+-       CFLAGS="$ac_save_CFLAGS"
+-       LIBS="$ac_save_LIBS"
+-     fi
+-  fi
+-  if test "x$no_sdl" = x ; then
+-     AC_MSG_RESULT(yes)
+-     ifelse([$2], , :, [$2])     
+-  else
+-     AC_MSG_RESULT(no)
+-     if test "$SDL_CONFIG" = "no" ; then
+-       echo "*** The sdl-config script installed by SDL could not be found"
+-       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
+-       echo "*** your path, or set the SDL_CONFIG environment variable to the"
+-       echo "*** full path to sdl-config."
+-     else
+-       if test -f conf.sdltest ; then
+-        :
+-       else
+-          echo "*** Could not run SDL test program, checking why..."
+-          CFLAGS="$CFLAGS $SDL_CFLAGS"
+-          LIBS="$LIBS $SDL_LIBS"
+-          AC_TRY_LINK([
+-#include <stdio.h>
+-#include "SDL.h"
+-
+-int main(int argc, char *argv[])
+-{ return 0; }
+-#undef  main
+-#define main K_and_R_C_main
+-],      [ return 0; ],
+-        [ echo "*** The test program compiled, but did not run. This usually means"
+-          echo "*** that the run-time linker is not finding SDL or finding the wrong"
+-          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
+-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+-          echo "*** is required on your system"
+-	  echo "***"
+-          echo "*** If you have an old version installed, it is best to remove it, although"
+-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+-          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+-          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+-          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
+-          CFLAGS="$ac_save_CFLAGS"
+-          LIBS="$ac_save_LIBS"
+-       fi
+-     fi
+-     SDL_CFLAGS=""
+-     SDL_LIBS=""
+-     ifelse([$3], , :, [$3])
+-  fi
+-  AC_SUBST(SDL_CFLAGS)
+-  AC_SUBST(SDL_LIBS)
+-  rm -f conf.sdltest
+-])
+ ## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
+ ## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996

Added: unstable/sdl-image1.2/debian/patches/aclocal.diff
===================================================================
--- unstable/sdl-image1.2/debian/patches/aclocal.diff	                        (rev 0)
+++ unstable/sdl-image1.2/debian/patches/aclocal.diff	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1,377 @@
+--- sdl-image1.2-1.2.2.orig/aclocal.m4	Mon Jul  8 23:10:15 2002
++++ sdl-image1.2-1.2.2/aclocal.m4	Sat Apr 13 22:05:49 2002
+@@ -1,4 +1,4 @@
+-dnl aclocal.m4 generated automatically by aclocal 1.4
++dnl aclocal.m4 generated automatically by aclocal 1.4-p4
+ 
+ dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+@@ -10,180 +10,6 @@
+ dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ dnl PARTICULAR PURPOSE.
+ 
+-# Configure paths for SDL
+-# Sam Lantinga 9/21/99
+-# stolen from Manish Singh
+-# stolen back from Frank Belew
+-# stolen from Manish Singh
+-# Shamelessly stolen from Owen Taylor
+-
+-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
+-dnl
+-AC_DEFUN(AM_PATH_SDL,
+-[dnl 
+-dnl Get the cflags and libraries from the sdl-config script
+-dnl
+-AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
+-            sdl_prefix="$withval", sdl_prefix="")
+-AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
+-            sdl_exec_prefix="$withval", sdl_exec_prefix="")
+-AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
+-		    , enable_sdltest=yes)
+-
+-  if test x$sdl_exec_prefix != x ; then
+-     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
+-     if test x${SDL_CONFIG+set} != xset ; then
+-        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+-     fi
+-  fi
+-  if test x$sdl_prefix != x ; then
+-     sdl_args="$sdl_args --prefix=$sdl_prefix"
+-     if test x${SDL_CONFIG+set} != xset ; then
+-        SDL_CONFIG=$sdl_prefix/bin/sdl-config
+-     fi
+-  fi
+-
+-  AC_REQUIRE([AC_CANONICAL_TARGET])
+-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+-  min_sdl_version=ifelse([$1], ,0.11.0,$1)
+-  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+-  no_sdl=""
+-  if test "$SDL_CONFIG" = "no" ; then
+-    no_sdl=yes
+-  else
+-    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
+-    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+-
+-    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-    if test "x$enable_sdltest" = "xyes" ; then
+-      ac_save_CFLAGS="$CFLAGS"
+-      ac_save_LIBS="$LIBS"
+-      CFLAGS="$CFLAGS $SDL_CFLAGS"
+-      LIBS="$LIBS $SDL_LIBS"
+-dnl
+-dnl Now check if the installed SDL is sufficiently new. (Also sanity
+-dnl checks the results of sdl-config to some extent
+-dnl
+-      rm -f conf.sdltest
+-      AC_TRY_RUN([
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include "SDL.h"
+-
+-char*
+-my_strdup (char *str)
+-{
+-  char *new_str;
+-  
+-  if (str)
+-    {
+-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+-      strcpy (new_str, str);
+-    }
+-  else
+-    new_str = NULL;
+-  
+-  return new_str;
+-}
+-
+-int main (int argc, char *argv[])
+-{
+-  int major, minor, micro;
+-  char *tmp_version;
+-
+-  /* This hangs on some systems (?)
+-  system ("touch conf.sdltest");
+-  */
+-  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+-
+-  /* HP/UX 9 (%@#!) writes to sscanf strings */
+-  tmp_version = my_strdup("$min_sdl_version");
+-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+-     printf("%s, bad version string\n", "$min_sdl_version");
+-     exit(1);
+-   }
+-
+-   if (($sdl_major_version > major) ||
+-      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+-      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
+-    {
+-      return 0;
+-    }
+-  else
+-    {
+-      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+-      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+-      printf("*** best to upgrade to the required version.\n");
+-      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
+-      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+-      printf("*** config.cache before re-running configure\n");
+-      return 1;
+-    }
+-}
+-
+-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+-       CFLAGS="$ac_save_CFLAGS"
+-       LIBS="$ac_save_LIBS"
+-     fi
+-  fi
+-  if test "x$no_sdl" = x ; then
+-     AC_MSG_RESULT(yes)
+-     ifelse([$2], , :, [$2])     
+-  else
+-     AC_MSG_RESULT(no)
+-     if test "$SDL_CONFIG" = "no" ; then
+-       echo "*** The sdl-config script installed by SDL could not be found"
+-       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
+-       echo "*** your path, or set the SDL_CONFIG environment variable to the"
+-       echo "*** full path to sdl-config."
+-     else
+-       if test -f conf.sdltest ; then
+-        :
+-       else
+-          echo "*** Could not run SDL test program, checking why..."
+-          CFLAGS="$CFLAGS $SDL_CFLAGS"
+-          LIBS="$LIBS $SDL_LIBS"
+-          AC_TRY_LINK([
+-#include <stdio.h>
+-#include "SDL.h"
+-
+-int main(int argc, char *argv[])
+-{ return 0; }
+-#undef  main
+-#define main K_and_R_C_main
+-],      [ return 0; ],
+-        [ echo "*** The test program compiled, but did not run. This usually means"
+-          echo "*** that the run-time linker is not finding SDL or finding the wrong"
+-          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
+-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+-          echo "*** is required on your system"
+-	  echo "***"
+-          echo "*** If you have an old version installed, it is best to remove it, although"
+-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+-          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+-          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+-          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
+-          CFLAGS="$ac_save_CFLAGS"
+-          LIBS="$ac_save_LIBS"
+-       fi
+-     fi
+-     SDL_CFLAGS=""
+-     SDL_LIBS=""
+-     ifelse([$3], , :, [$3])
+-  fi
+-  AC_SUBST(SDL_CFLAGS)
+-  AC_SUBST(SDL_LIBS)
+-  rm -f conf.sdltest
+-])
+ 
+ # serial 40 AC_PROG_LIBTOOL
+ AC_DEFUN(AC_PROG_LIBTOOL,
+@@ -688,4 +514,187 @@
+    AC_MSG_RESULT(missing)
+ fi
+ AC_SUBST($1)])
++
++# Configure paths for SDL
++# Sam Lantinga 9/21/99
++# stolen from Manish Singh
++# stolen back from Frank Belew
++# stolen from Manish Singh
++# Shamelessly stolen from Owen Taylor
++
++# hacked on by Branden Robinson and Eric Gillespie, Jr. to add
++# SDL_LIBS_FOR_LIBS variable, because it is not legal to link static
++# objects into shared ones on several architectures, including PowerPC,
++# PA-RISC, IA64, MIPS, ...
++
++dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for SDL, and define SDL_CFLAGS, SDL_LIBS, and SDL_LIBS_FOR_LIBS
++dnl
++AC_DEFUN(AM_PATH_SDL,
++[dnl 
++dnl Get the cflags and libraries from the sdl-config script
++dnl
++AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
++            sdl_prefix="$withval", sdl_prefix="")
++AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
++            sdl_exec_prefix="$withval", sdl_exec_prefix="")
++AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
++		    , enable_sdltest=yes)
++
++  if test x$sdl_exec_prefix != x ; then
++     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
++     if test x${SDL_CONFIG+set} != xset ; then
++        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
++     fi
++  fi
++  if test x$sdl_prefix != x ; then
++     sdl_args="$sdl_args --prefix=$sdl_prefix"
++     if test x${SDL_CONFIG+set} != xset ; then
++        SDL_CONFIG=$sdl_prefix/bin/sdl-config
++     fi
++  fi
++
++  AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
++  min_sdl_version=ifelse([$1], ,0.11.0,$1)
++  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
++  no_sdl=""
++  if test "$SDL_CONFIG" = "no" ; then
++    no_sdl=yes
++  else
++    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
++    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
++    SDL_LIBS_FOR_LIBS=`$SDL_CONFIG $sdlconf_args --library-libs`
++    SDL_LIBS_FOR_PLUGINS=`$SDL_CONFIG $sdlconf_args --plugin-libs`
++
++    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++    if test "x$enable_sdltest" = "xyes" ; then
++      ac_save_CFLAGS="$CFLAGS"
++      ac_save_LIBS="$LIBS"
++      CFLAGS="$CFLAGS $SDL_CFLAGS"
++      LIBS="$LIBS $SDL_LIBS"
++dnl
++dnl Now check if the installed SDL is sufficiently new. (Also sanity
++dnl checks the results of sdl-config to some extent
++dnl
++      rm -f conf.sdltest
++      AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include "SDL.h"
++
++char*
++my_strdup (char *str)
++{
++  char *new_str;
++  
++  if (str)
++    {
++      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
++      strcpy (new_str, str);
++    }
++  else
++    new_str = NULL;
++  
++  return new_str;
++}
++
++int main (int argc, char *argv[])
++{
++  int major, minor, micro;
++  char *tmp_version;
++
++  /* This hangs on some systems (?)
++  system ("touch conf.sdltest");
++  */
++  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
++
++  /* HP/UX 9 (%@#!) writes to sscanf strings */
++  tmp_version = my_strdup("$min_sdl_version");
++  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++     printf("%s, bad version string\n", "$min_sdl_version");
++     exit(1);
++   }
++
++   if (($sdl_major_version > major) ||
++      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
++      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
++    {
++      return 0;
++    }
++  else
++    {
++      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
++      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
++      printf("*** best to upgrade to the required version.\n");
++      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
++      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
++      printf("*** config.cache before re-running configure\n");
++      return 1;
++    }
++}
++
++],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++       CFLAGS="$ac_save_CFLAGS"
++       LIBS="$ac_save_LIBS"
++     fi
++  fi
++  if test "x$no_sdl" = x ; then
++     AC_MSG_RESULT(yes)
++     ifelse([$2], , :, [$2])     
++  else
++     AC_MSG_RESULT(no)
++     if test "$SDL_CONFIG" = "no" ; then
++       echo "*** The sdl-config script installed by SDL could not be found"
++       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
++       echo "*** your path, or set the SDL_CONFIG environment variable to the"
++       echo "*** full path to sdl-config."
++     else
++       if test -f conf.sdltest ; then
++        :
++       else
++          echo "*** Could not run SDL test program, checking why..."
++          CFLAGS="$CFLAGS $SDL_CFLAGS"
++          LIBS="$LIBS $SDL_LIBS"
++          AC_TRY_LINK([
++#include <stdio.h>
++#include "SDL.h"
++
++int main(int argc, char *argv[])
++{ return 0; }
++#undef  main
++#define main K_and_R_C_main
++],      [ return 0; ],
++        [ echo "*** The test program compiled, but did not run. This usually means"
++          echo "*** that the run-time linker is not finding SDL or finding the wrong"
++          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
++          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
++          echo "*** is required on your system"
++	  echo "***"
++          echo "*** If you have an old version installed, it is best to remove it, although"
++          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++        [ echo "*** The test program failed to compile or link. See the file config.log for the"
++          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
++          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
++          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
++          CFLAGS="$ac_save_CFLAGS"
++          LIBS="$ac_save_LIBS"
++       fi
++     fi
++     SDL_CFLAGS=""
++     SDL_LIBS=""
++     ifelse([$3], , :, [$3])
++  fi
++  AC_SUBST(SDL_CFLAGS)
++  AC_SUBST(SDL_LIBS)
++  AC_SUBST(SDL_LIBS_FOR_LIBS)
++  AC_SUBST(SDL_LIBS_FOR_PLUGINS)
++  rm -f conf.sdltest
++])
+ 

Added: unstable/sdl-image1.2/debian/patches/aclocal_post_aclocal.diff
===================================================================
--- unstable/sdl-image1.2/debian/patches/aclocal_post_aclocal.diff	                        (rev 0)
+++ unstable/sdl-image1.2/debian/patches/aclocal_post_aclocal.diff	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1,43 @@
+--- sdl-image1.2-1.2.2/aclocal.m4	Fri Jul 19 01:05:13 2002
++++ sdl-image1.2-1.2.2/aclocal.m4.patched	Fri Jul 19 00:59:42 2002
+@@ -522,8 +522,13 @@
+ # stolen from Manish Singh
+ # Shamelessly stolen from Owen Taylor
+ 
++# hacked on by Branden Robinson and Eric Gillespie, Jr. to add
++# SDL_LIBS_FOR_LIBS variable, because it is not legal to link static
++# objects into shared ones on several architectures, including PowerPC,
++# PA-RISC, IA64, MIPS, ...
++
+ dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
++dnl Test for SDL, and define SDL_CFLAGS, SDL_LIBS, and SDL_LIBS_FOR_LIBS
+ dnl
+ AC_DEFUN(AM_PATH_SDL,
+ [dnl 
+@@ -549,7 +554,6 @@
+      fi
+   fi
+ 
+-  AC_REQUIRE([AC_CANONICAL_TARGET])
+   AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+   min_sdl_version=ifelse([$1], ,0.11.0,$1)
+   AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+@@ -559,6 +563,8 @@
+   else
+     SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
+     SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
++    SDL_LIBS_FOR_LIBS=`$SDL_CONFIG $sdlconf_args --library-libs`
++    SDL_LIBS_FOR_PLUGINS=`$SDL_CONFIG $sdlconf_args --plugin-libs`
+ 
+     sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
+            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+@@ -687,6 +693,8 @@
+   fi
+   AC_SUBST(SDL_CFLAGS)
+   AC_SUBST(SDL_LIBS)
++  AC_SUBST(SDL_LIBS_FOR_LIBS)
++  AC_SUBST(SDL_LIBS_FOR_PLUGINS)
+   rm -f conf.sdltest
+ ])
+ 

Added: unstable/sdl-image1.2/debian/patches/bug256660.patch
===================================================================
--- unstable/sdl-image1.2/debian/patches/bug256660.patch	                        (rev 0)
+++ unstable/sdl-image1.2/debian/patches/bug256660.patch	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1,42 @@
+--- sdl-image1.2-1.2.3.orig/IMG_tif.c
++++ sdl-image1.2-1.2.3/IMG_tif.c
+@@ -63,6 +63,21 @@
+ 	return 0;
+ }
+ 
++/*
++ * Dummy function to fill the unused client procedures.
++ */
++static int tiff_map(thandle_t fd, tdata_t* pbase, toff_t* psize)
++{
++       return 0;
++}
++
++/*
++ * Dummy function to fill the unused client procedures.
++ */
++static void tiff_unmap(thandle_t fd, tdata_t base, toff_t size)
++{
++}
++
+ static toff_t tiff_size(thandle_t fd)
+ {
+ 	Uint32 save_pos;
+@@ -86,7 +101,7 @@
+ 	/* Attempt to process the given file data */
+ 	/* turn off memory mapped access with the m flag */
+ 	tiff = TIFFClientOpen("SDL_image", "rm", (thandle_t)src, 
+-		tiff_read, tiff_write, tiff_seek, tiff_close, tiff_size, NULL, NULL);
++	        tiff_read, tiff_write, tiff_seek, tiff_close, tiff_size, tiff_map, tiff_unmap);
+ 
+ 	/* Reset the default error handler, since it can be useful for info */
+ 	TIFFSetErrorHandler(prev_handler);
+@@ -113,7 +128,7 @@
+ 
+ 	/* turn off memory mapped access with the m flag */
+ 	tiff = TIFFClientOpen("SDL_image", "rm", (thandle_t)src, 
+-		tiff_read, tiff_write, tiff_seek, tiff_close, tiff_size, NULL, NULL);
++	        tiff_read, tiff_write, tiff_seek, tiff_close, tiff_size, tiff_map, tiff_unmap);
+ 	if(!tiff)
+ 		return NULL;
+ 

Added: unstable/sdl-image1.2/debian/patches/bug267169.diff
===================================================================
--- unstable/sdl-image1.2/debian/patches/bug267169.diff	                        (rev 0)
+++ unstable/sdl-image1.2/debian/patches/bug267169.diff	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1,11 @@
+--- configure.orig	2004-11-16 18:22:45.000000000 +0000
++++ configure	2004-11-16 18:23:33.000000000 +0000
+@@ -2685,7 +2685,7 @@
+ 
+     if test x$have_libtiff = xyes; then
+         CFLAGS="$CFLAGS -DLOAD_TIF"
+-        IMG_LIBS="$IMG_LIBS -ltiff"
++        IMG_LIBS="-ltiff $IMG_LIBS"
+     else
+         echo "configure: warning: 
+ *** Unable to find Tiff library (ftp://ftp.sgi.com/graphics/tiff/)

Added: unstable/sdl-image1.2/debian/patches/bug378173.patch
===================================================================
--- unstable/sdl-image1.2/debian/patches/bug378173.patch	                        (rev 0)
+++ unstable/sdl-image1.2/debian/patches/bug378173.patch	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1,164 @@
+diff -u sdl-image1.2-1.2.5/IMG_bmp.c sdl-image1.2-marga/IMG_bmp.c
+--- sdl-image1.2-1.2.5/IMG_bmp.c	2006-05-14 17:57:03.000000000 -0300
++++ sdl-image1.2-marga/IMG_bmp.c	2006-07-21 20:34:29.193015440 -0300
+@@ -36,6 +36,8 @@
+ 	int is_BMP;
+ 	char magic[2];
+ 
++	if ( !src )
++		return 0;
+ 	start = SDL_RWtell(src);
+ 	is_BMP = 0;
+ 	if ( SDL_RWread(src, magic, sizeof(magic), 1) ) {
+diff -u sdl-image1.2-1.2.5/IMG_gif.c sdl-image1.2-marga/IMG_gif.c
+--- sdl-image1.2-1.2.5/IMG_gif.c	2006-05-14 16:54:24.000000000 -0300
++++ sdl-image1.2-marga/IMG_gif.c	2006-07-21 20:33:22.437423410 -0300
+@@ -36,6 +36,8 @@
+ 	int is_GIF;
+ 	char magic[6];
+ 
++	if ( !src )
++		return 0;
+ 	start = SDL_RWtell(src);
+ 	is_GIF = 0;
+ 	if ( SDL_RWread(src, magic, sizeof(magic), 1) ) {
+diff -u sdl-image1.2-1.2.5/IMG_jpg.c sdl-image1.2-marga/IMG_jpg.c
+--- sdl-image1.2-1.2.5/IMG_jpg.c	2006-05-14 16:54:24.000000000 -0300
++++ sdl-image1.2-marga/IMG_jpg.c	2006-07-21 20:22:29.386350188 -0300
+@@ -179,6 +179,8 @@
+ 	/* Blame me, not Sam, if this doesn't work right. */
+ 	/* And don't forget to report the problem to the the sdl list too! */
+ 
++	if ( !src )
++		return 0;
+ 	start = SDL_RWtell(src);
+ 	is_JPG = 0;
+ 	in_scan = 0;
+diff -u sdl-image1.2-1.2.5/IMG_lbm.c sdl-image1.2-marga/IMG_lbm.c
+--- sdl-image1.2-1.2.5/IMG_lbm.c	2006-05-12 00:02:44.000000000 -0300
++++ sdl-image1.2-marga/IMG_lbm.c	2006-07-21 20:33:14.278818049 -0300
+@@ -65,6 +65,8 @@
+ 	int   is_LBM;
+ 	Uint8 magic[4+4+4];
+ 
++	if ( !src ) 
++		return 0;
+ 	start = SDL_RWtell(src);
+ 	is_LBM = 0;
+ 	if ( SDL_RWread( src, magic, sizeof(magic), 1 ) )
+diff -u sdl-image1.2-1.2.5/IMG_pcx.c sdl-image1.2-marga/IMG_pcx.c
+--- sdl-image1.2-1.2.5/IMG_pcx.c	2006-05-01 04:25:51.000000000 -0300
++++ sdl-image1.2-marga/IMG_pcx.c	2006-07-21 20:25:15.919749204 -0300
+@@ -69,6 +69,8 @@
+ 	const int PCX_RunLength_Encoding = 1;
+ 	struct PCXheader pcxh;
+ 
++	if ( !src )
++		return 0;
+ 	start = SDL_RWtell(src);
+ 	is_PCX = 0;
+ 	if ( SDL_RWread(src, &pcxh, sizeof(pcxh), 1) == 1 ) {
+diff -u sdl-image1.2-1.2.5/IMG_png.c sdl-image1.2-marga/IMG_png.c
+--- sdl-image1.2-1.2.5/IMG_png.c	2006-05-14 16:54:24.000000000 -0300
++++ sdl-image1.2-marga/IMG_png.c	2006-07-21 20:25:07.367217023 -0300
+@@ -273,6 +273,8 @@
+ 	if ( IMG_InitPNG() < 0 ) {
+ 		return 0;
+ 	}
++	if ( !src )
++		return 0;
+ 	start = SDL_RWtell(src);
+ 	is_PNG = 0;
+ 	if ( SDL_RWread(src, buf, 1, PNG_BYTES_TO_CHECK) == PNG_BYTES_TO_CHECK ) {
+diff -u sdl-image1.2-1.2.5/IMG_pnm.c sdl-image1.2-marga/IMG_pnm.c
+--- sdl-image1.2-1.2.5/IMG_pnm.c	2006-05-01 04:25:51.000000000 -0300
++++ sdl-image1.2-marga/IMG_pnm.c	2006-07-21 20:26:06.881005273 -0300
+@@ -44,6 +44,8 @@
+ 	int is_PNM;
+ 	char magic[2];
+ 
++	if ( !src )
++		return 0;
+ 	start = SDL_RWtell(src);
+ 	is_PNM = 0;
+ 	if ( SDL_RWread(src, magic, sizeof(magic), 1) ) {
+diff -u sdl-image1.2-1.2.5/IMG_tif.c sdl-image1.2-marga/IMG_tif.c
+--- sdl-image1.2-1.2.5/IMG_tif.c	2006-07-21 20:31:17.000000000 -0300
++++ sdl-image1.2-marga/IMG_tif.c	2006-07-21 20:27:09.959187601 -0300
+@@ -189,6 +189,8 @@
+ 	if ( IMG_InitTIF() < 0 ) {
+ 		return 0;
+ 	}
++	if ( !src )
++		return 0;
+ 	start = SDL_RWtell(src);
+ 	is_TIF = 0;
+ 
+diff -u sdl-image1.2-1.2.5/IMG_xcf.c sdl-image1.2-marga/IMG_xcf.c
+--- sdl-image1.2-1.2.5/IMG_xcf.c	2006-05-01 04:25:51.000000000 -0300
++++ sdl-image1.2-marga/IMG_xcf.c	2006-07-21 20:28:49.113194657 -0300
+@@ -213,6 +213,8 @@
+ 	int is_XCF;
+ 	char magic[14];
+ 
++	if ( !src )
++		return 0;
+ 	start = SDL_RWtell(src);
+ 	is_XCF = 0;
+ 	if ( SDL_RWread(src, magic, sizeof(magic), 1) ) {
+diff -u sdl-image1.2-1.2.5/IMG_xpm.c sdl-image1.2-marga/IMG_xpm.c
+--- sdl-image1.2-1.2.5/IMG_xpm.c	2006-05-12 00:02:44.000000000 -0300
++++ sdl-image1.2-marga/IMG_xpm.c	2006-07-21 20:33:29.517213256 -0300
+@@ -59,6 +59,8 @@
+ 	int is_XPM;
+ 	char magic[9];
+ 
++	if ( !src )
++		return 0;
+ 	start = SDL_RWtell(src);
+ 	is_XPM = 0;
+ 	if ( SDL_RWread(src, magic, sizeof(magic), 1) ) {
+@@ -326,7 +328,8 @@
+ 	linebuf = NULL;
+ 	buflen = 0;
+ 
+-	start = SDL_RWtell(src);
++	if ( src ) 
++		start = SDL_RWtell(src);
+ 
+ 	if(xpm)
+ 		xpmlines = &xpm;
+@@ -453,7 +456,8 @@
+ 
+ done:
+ 	if(error) {
+-		SDL_RWseek(src, start, SEEK_SET);
++		if ( src )
++			SDL_RWseek(src, start, SEEK_SET);
+ 		if ( image ) {
+ 			SDL_FreeSurface(image);
+ 			image = NULL;
+diff -u sdl-image1.2-1.2.5/IMG_xv.c sdl-image1.2-marga/IMG_xv.c
+--- sdl-image1.2-1.2.5/IMG_xv.c	2006-05-01 04:25:51.000000000 -0300
++++ sdl-image1.2-marga/IMG_xv.c	2006-07-21 20:29:16.504502815 -0300
+@@ -89,6 +89,8 @@
+ 	int is_XV;
+ 	int w, h;
+ 
++	if ( !src )
++		return 0;
+ 	start = SDL_RWtell(src);
+ 	is_XV = 0;
+ 	if ( get_header(src, &w, &h) == 0 ) {
+diff -u sdl-image1.2-1.2.5/IMG_xxx.c sdl-image1.2-marga/IMG_xxx.c
+--- sdl-image1.2-1.2.5/IMG_xxx.c	2006-05-01 04:25:51.000000000 -0300
++++ sdl-image1.2-marga/IMG_xxx.c	2006-07-21 20:29:57.169539262 -0300
+@@ -34,6 +34,8 @@
+ 	int start;
+ 	int is_XXX;
+ 
++	if ( !src )
++		return 0;
+ 	start = SDL_RWtell(src);
+ 	is_XXX = 0;
+ 

Added: unstable/sdl-image1.2/debian/patches/configure.diff
===================================================================
--- unstable/sdl-image1.2/debian/patches/configure.diff	                        (rev 0)
+++ unstable/sdl-image1.2/debian/patches/configure.diff	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1,12 @@
+--- SDL_image-1.2.2/configure.in	Sat Apr 13 10:58:08 2002
++++ sdl-image1.2-1.2.2/configure.in	Tue Jun 25 22:58:51 2002
+@@ -80,8 +80,7 @@
+ 	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
+ )
+ CFLAGS="$CFLAGS $SDL_CFLAGS"
+-IMG_LIBS="$IMG_LIBS $SDL_LIBS"
+-LIBS="$SDL_LIBS $LIBS"
++IMG_LIBS="$IMG_LIBS $SDL_LIBS_FOR_LIBS"
+ 
+ dnl Check command-line options
+ AC_ARG_ENABLE(bmp,

Added: unstable/sdl-image1.2/debian/rules
===================================================================
--- unstable/sdl-image1.2/debian/rules	                        (rev 0)
+++ unstable/sdl-image1.2/debian/rules	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1,77 @@
+#!/usr/bin/make -f
+
+#export DH_VERBOSE=1
+
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS=-g -Wall
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  CFLAGS += -O2
+else
+  CFLAGS += -O0
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+  INSTALL_PROGRAM += -s
+endif
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	LDFLAGS=-lpthread CFLAGS="$(CFLAGS)" ./configure \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--enable-tif \
+		--disable-jpg-shared \
+		--disable-tif-shared \
+		--enable-xcf
+	$(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	-rm -rf debian/libsdl-image-dev/*
+
+	[ ! -f Makefile ] || $(MAKE) distclean
+	-chmod +x missing
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) install prefix=`pwd`/debian/tmp/usr
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_install --sourcedir=debian/tmp --fail-missing
+	dh_installdocs
+	dh_installexamples
+	dh_installman
+	dh_installinfo
+	dh_installchangelogs CHANGES
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs -V 'libsdl-image1.2 (>= 1.2.5)'
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install


Property changes on: unstable/sdl-image1.2/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: unstable/sdl-image1.2/debian/shlibs.local
===================================================================
--- unstable/sdl-image1.2/debian/shlibs.local	                        (rev 0)
+++ unstable/sdl-image1.2/debian/shlibs.local	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1,3 @@
+libvga		1	svgalibg1 | svgalib-dummyg1
+libvgagl	1	svgalibg1 | svgalib-dummyg1
+libSDL-1.2	0	libsdl1.2debian (>> 1.2.4)

Added: unstable/sdl-image1.2/debian/watch
===================================================================
--- unstable/sdl-image1.2/debian/watch	                        (rev 0)
+++ unstable/sdl-image1.2/debian/watch	2009-11-01 18:26:10 UTC (rev 249)
@@ -0,0 +1,2 @@
+version=3
+http://www.libsdl.org/projects/SDL_image/release/ (?:.*/)?SDL_image-?_?([\w+\d+\.]+|\d+)\.tar\.gz debian uupdate




More information about the pkg-sdl-commits mailing list