Package: fenix
Version: 0.92a.dfsg1-4
Severity: minor
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu intrepid ubuntu-patch
Hi,
In Ubuntu, we've patched the fenix package to use libgif instead of
libungif as part of the transition. We thought you might like to do the
same, so have attached the patch here.
In Ubuntu, we've applied the attached patch to achieve the following:
* Merge from Debian unstable (LP: #243316). Remaining Ubuntu changes:
+ debian/patches/libgif.patch:
- Patch configure{,.in} to look for libgif instead of libungif.
- Patch {fpg,map}/Makefile{,.in,.ac} to link with -lgif.
+ debian/control: b-d on libgif-dev
* Modify Maintainer value to match the DebianMaintainerField
specification.
Thanks,
Iain
-- System Information:
Debian Release: lenny/sid
APT prefers hardy-updates
APT policy: (500, 'hardy-updates'), (500, 'hardy-security'), (500,
'hardy-backports'), (500, 'hardy')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.24-17-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u fenix-0.92a.dfsg1/debian/control fenix-0.92a.dfsg1/debian/control
--- fenix-0.92a.dfsg1/debian/control
+++ fenix-0.92a.dfsg1/debian/control
@@ -1,10 +1,10 @@
Source: fenix
Section: devel
Priority: extra
Maintainer: Debian Games Team <[EMAIL PROTECTED]>
Uploaders: Miriam Ruiz <[EMAIL PROTECTED]>
Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 5), quilt, autotools-dev,
- libsdl1.2-dev, libsdl-mixer1.2-dev, zlib1g-dev, libungif4-dev, libpng12-dev,
+ libsdl1.2-dev, libsdl-mixer1.2-dev, zlib1g-dev, libgif-dev, libpng12-dev,
libsmpeg-dev, libmikmod2-dev, libvorbis-dev
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/fenix/
diff -u fenix-0.92a.dfsg1/debian/changelog fenix-0.92a.dfsg1/debian/changelog
diff -u fenix-0.92a.dfsg1/debian/patches/series fenix-0.92a.dfsg1/debian/patches/series
--- fenix-0.92a.dfsg1/debian/patches/series
+++ fenix-0.92a.dfsg1/debian/patches/series
@@ -21,0 +22 @@
+libgif.patch
only in patch2:
unchanged:
--- fenix-0.92a.dfsg1.orig/debian/patches/libgif.patch
+++ fenix-0.92a.dfsg1/debian/patches/libgif.patch
@@ -0,0 +1,123 @@
+Index: fenix-0.92a.dfsg1/configure
+===================================================================
+--- fenix-0.92a.dfsg1.orig/configure 2008-01-14 14:14:15.000000000 +0100
++++ fenix-0.92a.dfsg1/configure 2008-01-14 14:14:16.000000000 +0100
+@@ -4454,13 +4454,13 @@
+ fi
+
+ if test "$map" = yes; then
+- echo "$as_me:$LINENO: checking for DGifOpenFileName in -lungif" >&5
+-echo $ECHO_N "checking for DGifOpenFileName in -lungif... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking for DGifOpenFileName in -lgif" >&5
++echo $ECHO_N "checking for DGifOpenFileName in -lgif... $ECHO_C" >&6
+ if test "${ac_cv_lib_ungif_DGifOpenFileName+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lungif $LIBS"
++LIBS="-lgif $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */
+@@ -4511,8 +4511,8 @@
+ if test $ac_cv_lib_ungif_DGifOpenFileName = yes; then
+ LIBS="$LIBS"
+ else
+- { { echo "$as_me:$LINENO: error: lungif library not found" >&5
+-echo "$as_me: error: lungif library not found" >&2;}
++ { { echo "$as_me:$LINENO: error: libgif library not found" >&5
++echo "$as_me: error: libgif library not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+Index: fenix-0.92a.dfsg1/configure.in
+===================================================================
+--- fenix-0.92a.dfsg1.orig/configure.in 2008-01-14 14:14:15.000000000 +0100
++++ fenix-0.92a.dfsg1/configure.in 2008-01-14 14:14:16.000000000 +0100
+@@ -115,7 +115,7 @@
+
+ dnl para map
+ if test "$map" = yes; then
+- AC_CHECK_LIB(ungif,DGifOpenFileName,LIBS="$LIBS",AC_MSG_ERROR(lungif library not found))
++ AC_CHECK_LIB(gif,DGifOpenFileName,LIBS="$LIBS",AC_MSG_ERROR(libgif library not found))
+ fi
+
+ dnl make these visible to all Makefiles
+Index: fenix-0.92a.dfsg1/fpg/Makefile
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fpg/Makefile 2008-01-14 14:15:33.000000000 +0100
++++ fenix-0.92a.dfsg1/fpg/Makefile 2008-01-14 14:15:43.000000000 +0100
+@@ -145,7 +145,7 @@
+
+ INCLUDES = $(COMMON_CFLAGS)
+
+-fpg_LDADD = $(COMMON_LIBS) -lz -lungif -lpng
++fpg_LDADD = $(COMMON_LIBS) -lz -lgif -lpng
+
+ SOURCE_FILES = fpg.c
+
+Index: fenix-0.92a.dfsg1/fpg/Makefile.am
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fpg/Makefile.am 2008-01-14 14:15:33.000000000 +0100
++++ fenix-0.92a.dfsg1/fpg/Makefile.am 2008-01-14 14:16:49.000000000 +0100
+@@ -5,7 +5,7 @@
+
+ INCLUDES = $(COMMON_CFLAGS)
+
+-fpg_LDADD=$(COMMON_LIBS) -lz -lungif -lpng
++fpg_LDADD=$(COMMON_LIBS) -lz -lgif -lpng
+
+ SOURCE_FILES=fpg.c
+
+Index: fenix-0.92a.dfsg1/fpg/Makefile.in
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fpg/Makefile.in 2008-01-14 14:15:33.000000000 +0100
++++ fenix-0.92a.dfsg1/fpg/Makefile.in 2008-01-14 14:16:22.000000000 +0100
+@@ -145,7 +145,7 @@
+
+ INCLUDES = $(COMMON_CFLAGS)
+
+-fpg_LDADD = $(COMMON_LIBS) -lz -lungif -lpng
++fpg_LDADD = $(COMMON_LIBS) -lz -lgif -lpng
+
+ SOURCE_FILES = fpg.c
+
+Index: fenix-0.92a.dfsg1/map/Makefile
+===================================================================
+--- fenix-0.92a.dfsg1.orig/map/Makefile 2008-01-14 14:17:24.000000000 +0100
++++ fenix-0.92a.dfsg1/map/Makefile 2008-01-14 14:17:35.000000000 +0100
+@@ -145,7 +145,7 @@
+
+ INCLUDES = $(COMMON_CFLAGS)
+
+-map_LDADD = $(COMMON_LIBS) -lz -lungif -lpng
++map_LDADD = $(COMMON_LIBS) -lz -lgif -lpng
+
+ SOURCE_FILES = map.c
+
+Index: fenix-0.92a.dfsg1/map/Makefile.am
+===================================================================
+--- fenix-0.92a.dfsg1.orig/map/Makefile.am 2008-01-14 14:17:24.000000000 +0100
++++ fenix-0.92a.dfsg1/map/Makefile.am 2008-01-14 14:17:47.000000000 +0100
+@@ -5,7 +5,7 @@
+
+ INCLUDES = $(COMMON_CFLAGS)
+
+-map_LDADD=$(COMMON_LIBS) -lz -lungif -lpng
++map_LDADD=$(COMMON_LIBS) -lz -lgif -lpng
+
+ SOURCE_FILES=map.c
+
+Index: fenix-0.92a.dfsg1/map/Makefile.in
+===================================================================
+--- fenix-0.92a.dfsg1.orig/map/Makefile.in 2008-01-14 14:17:24.000000000 +0100
++++ fenix-0.92a.dfsg1/map/Makefile.in 2008-01-14 14:17:41.000000000 +0100
+@@ -145,7 +145,7 @@
+
+ INCLUDES = $(COMMON_CFLAGS)
+
+-map_LDADD = $(COMMON_LIBS) -lz -lungif -lpng
++map_LDADD = $(COMMON_LIBS) -lz -lgif -lpng
+
+ SOURCE_FILES = map.c
+
