From 84ec6d0504c0302aecbe5554c29bddf8661e795d Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Tue, 31 Aug 2004 03:32:13 +0000
Subject: [PATCH] up to 1.1.2 - security fixes, some other fixed, ilbm loader

SVN revision: 11452
---
 ChangeLog       | 9 +++++++++
 configure.in    | 2 +-
 src/Makefile.am | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4123dad..b5c1a59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2996,3 +2996,12 @@ Fri Jul  2 14:39:46 EDT 2004
 Fixed build (again).
 
 _______________________________________________
+
+Tue Aug 31 11:46:49 JST 2004
+(Raster)
+
+Fixed bmp security issue.
+New IFF ILBM loader
+Up to 1.1.2
+
+_______________________________________________
diff --git a/configure.in b/configure.in
index aa38355..f726bbb 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(imlib2, 1.1.1)
+AM_INIT_AUTOMAKE(imlib2, 1.1.2)
 AM_CONFIG_HEADER(config.h)
 
 AC_C_BIGENDIAN	      
diff --git a/src/Makefile.am b/src/Makefile.am
index 1bf3273..59607bb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ libImlib2_la_SOURCES = scale.c image.c blend.c file.c rgbadraw.c api.c \
 EXTRA_libImlib2_la_SOURCES = rend.c ximage.c rgba.c color.c grab.c draw.c \
 			     context.c color.h context.h draw.h grab.h rend.h \
 			     rgba.h ximage.h $(MMX_SRCS)
-libImlib2_la_LDFLAGS      = -version-info 2:1:1
+libImlib2_la_LDFLAGS      = -version-info 2:2:1
 
 if HAVE_MMX
 libImlib2_la_LIBADD   = $(X_OBJS) @DLLDFLAGS@ $(MMX_OBJS) \