On Fri, Jul 22, 2005 at 09:13:48PM +0100, Roger Leigh wrote:
> 
> Attached is a patch to fix this bug.  It's the same as the last, but
> replaces the use of defined so it will work with K&R compilers without
> support for defined().  Unless you intent to upload within the next
> few days, or have any objections to the patch, I'd like to NMU this RC
> bug.

An updated diff is attached.  This fixes the build-deps to
eliminate libreadline4.


-- 
Roger Leigh
                Printing on GNU/Linux?  http://gimp-print.sourceforge.net/
                Debian GNU/Linux        http://www.debian.org/
                GPG Public Key: 0x25BFB848.  Please sign and encrypt your mail.
diff -urN evolver-2.23.original/debian/changelog evolver-2.23/debian/changelog
--- evolver-2.23.original/debian/changelog      2005-07-22 21:02:51.000000000 
+0100
+++ evolver-2.23/debian/changelog       2005-07-22 21:16:33.939348920 +0100
@@ -1,3 +1,14 @@
+evolver (2.23-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * src/include.h: Don't prototype calloc() and friends when building
+    with an ANSI C compiler (Closes: 317404).  Based on a patch by
+    Karl Chen.
+  * debian/control: Build-Depend on libreadline5-dev, rather than
+    the old libreadline4-dev.
+
+ -- Roger Leigh <[EMAIL PROTECTED]>  Fri, 22 Jul 2005 21:16:12 +0100
+
 evolver (2.23-1) unstable; urgency=low
 
   * New upstream release.
diff -urN evolver-2.23.original/debian/control evolver-2.23/debian/control
--- evolver-2.23.original/debian/control        2005-07-22 21:02:51.000000000 
+0100
+++ evolver-2.23/debian/control 2005-07-22 21:16:07.752329952 +0100
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Adam C. Powell, IV <[EMAIL PROTECTED]>
 Standards-Version: 3.6.1.0
-Build-Depends: debhelper (>= 2.1.0), libx11-dev, libglut3-dev | libglut-dev, 
libreadline4-dev | libreadline-dev
+Build-Depends: debhelper (>= 2.1.0), libx11-dev, libglut3-dev | libglut-dev, 
libreadline5-dev | libreadline-dev
 
 Package: evolver
 Architecture: any
diff -urN evolver-2.23.original/src/include.h evolver-2.23/src/include.h
--- evolver-2.23.original/src/include.h 2005-07-22 21:02:51.000000000 +0100
+++ evolver-2.23/src/include.h  2005-07-22 21:05:34.360620128 +0100
@@ -139,11 +139,13 @@
 /* MAXALLOC is maximum size allocable by calloc() */
 #define    MAXALLOC 0x7FFFFFFFL
 /* Some don't declare calloc, getenv, and bsearch in header files */
+#ifndef __STDC__
 #ifndef MAC_OS_X
 char *calloc();
 char *getenv();
 char *bsearch();
 #endif
+#endif
 /* PATHCHAR is name-separating character in paths */
 #define PATHCHAR '/'
 /* ENVPATHCHAR is the path separating character in environment strings */

Attachment: signature.asc
Description: Digital signature

Reply via email to