diff -u ivtools-1.1.3/src/IV-common/regexp.c ivtools-1.1.3/src/IV-common/regexp.c --- ivtools-1.1.3/src/IV-common/regexp.c +++ ivtools-1.1.3/src/IV-common/regexp.c @@ -54,7 +54,7 @@ static void reginsert(char op, char* opnd); static void regtail(char* p, char* val); static void regoptail(char* p, char* val); -static void regerror(char* s); +static void regerror(const char* s); static int regexec(register regexp* prog, register char* string); static int regtry(regexp* prog, char* string); static int regmatch(char* prog); @@ -1203,7 +1203,7 @@ } static void -regerror(char* s) { +regerror(const char* s) { cerr << "regexp: " << s << "\n"; } diff -u ivtools-1.1.3/debian/control ivtools-1.1.3/debian/control --- ivtools-1.1.3/debian/control +++ ivtools-1.1.3/debian/control @@ -1,7 +1,7 @@ Source: ivtools Priority: optional Section: libs -Build-Depends: debhelper, xutils, libtiff4-dev, libjpeg62-dev, zlib1g-dev, libace-dev, autotools-dev, libx11-dev, libxext-dev, libxmu-dev, libxt-dev, x-dev +Build-Depends: debhelper, xutils, libtiff4-dev, libjpeg62-dev, zlib1g-dev, libace-dev, autotools-dev, libx11-dev, libxext-dev, libxmu-dev, libxt-dev, x-dev, xutils-dev Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Guenter Geiger Standards-Version: 3.7.0 diff -u ivtools-1.1.3/debian/changelog ivtools-1.1.3/debian/changelog --- ivtools-1.1.3/debian/changelog +++ ivtools-1.1.3/debian/changelog @@ -1,3 +1,14 @@ +ivtools (1.1.3-5.4ubuntu2) karmic; urgency=low + + * debian/control: + - Add xutils-dev to the Build-Depends, as imake was split out from + xutils into said -dev package. This fixes a FTBFS (LP: #444610). + * src/IV-common/regexp.c: + - Change function regerror to take a "const char*" instead of + a "char*", to fix an "invalid conversion" error. + + -- Siegfried-Angel Gevatter Pujals Sun, 25 Oct 2009 11:43:28 +0100 + ivtools (1.1.3-5.4ubuntu1) intrepid; urgency=low * Merge from Debian unstable, remaining Ubuntu changes: