Hi,
Please find attached the diff of the NMU of orange.
Bye,
Aurelien
--
.''`. Aurelien Jarno | GPG: 1024D/F1BCDB73
: :' : Debian GNU/Linux developer | Electrical Engineer
`. `' [EMAIL PROTECTED] | [EMAIL PROTECTED]
`- people.debian.org/~aurel32 | www.aurel32.net
diff -u orange-0.2/lib/tomtom.c orange-0.2/lib/tomtom.c
--- orange-0.2/lib/tomtom.c
+++ orange-0.2/lib/tomtom.c
@@ -282,7 +282,7 @@
}
synce_trace("Writing '%s'", entries[i].filename);
- orange_write(buffer, entries[i].size, output_directory,
entries[i].filename);
+ orange_write((unsigned char*)buffer, entries[i].size, output_directory,
entries[i].filename);
}
success = true;
diff -u orange-0.2/debian/changelog orange-0.2/debian/changelog
--- orange-0.2/debian/changelog
+++ orange-0.2/debian/changelog
@@ -1,3 +1,12 @@
+orange (0.2-3.1) unstable; urgency=low
+
+ * 0-day NMU (BSP).
+ * Applied patch from Andreas Jochen to make orange buildable with gcc-4.0
+ (closes: bug#287882).
+ * Libtool update (closes: bug#306817).
+
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Fri, 5 Aug 2005 17:31:50 +0200
+
orange (0.2-3) unstable; urgency=low
* Added --version-info to dh_makeshlibs
diff -u orange-0.2/debian/control orange-0.2/debian/control
--- orange-0.2/debian/control
+++ orange-0.2/debian/control
@@ -2,7 +2,7 @@
Section: utils
Priority: optional
Maintainer: Volker Christian <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), zlib1g (>= 1.2.1), zlib1g-dev (>= 1.2.1),
libdynamite (>= 0.1), libdynamite-dev (>= 0.1), libunshield (>= 0.3),
libunshield-dev (>= 0.3), librapi2 (>= 0.8.9), librapi2-dev (>= 0.8.9),
libsynce0 (>= 0.8.9), libsynce0-dev (>= 0.8.9)
+Build-Depends: debhelper (>= 4.0.0), zlib1g (>= 1.2.1), zlib1g-dev (>= 1.2.1),
libdynamite (>= 0.1), libdynamite-dev (>= 0.1), libunshield (>= 0.3),
libunshield-dev (>= 0.3), librapi2 (>= 0.8.9), librapi2-dev (>= 0.8.9),
libsynce0 (>= 0.8.9), libsynce0-dev (>= 0.8.9), autotools-dev, autoconf,
automake1.6, libtool
Standards-Version: 3.6.1
Package: orange
diff -u orange-0.2/debian/rules orange-0.2/debian/rules
--- orange-0.2/debian/rules
+++ orange-0.2/debian/rules
@@ -24,9 +24,12 @@
INSTALL_PROGRAM += -s
endif
-config.status: configure
+config.status: configure.ac
dh_testdir
# Add here commands to configure the package.
+ libtoolize -c -f
+ aclocal-1.6
+ autoconf
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
--mandir=\$${prefix}/share/man \
@@ -50,13 +53,7 @@
# Add here commands to clean up after the build process.
-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
+ rm -f config.{guess,sub} configure aclocal.m4 ltmain.sh
dh_clean
--- orange-0.2.orig/acinclude.m4
+++ orange-0.2/acinclude.m4
@@ -0,0 +1,169 @@
+dnl $Id: libsynce.m4,v 1.1.1.1 2003/08/17 12:06:40 twogood Exp $ vim:
syntax=config
+dnl Check for libsynce
+
+AC_DEFUN(AM_PATH_LIBSYNCE, [
+
+ AC_ARG_WITH(libsynce,
+ AC_HELP_STRING(
+ [--with-libsynce[=DIR]],
+ [Search for libsynce in DIR/include and DIR/lib]),
+ [
+ CPPFLAGS="$CPPFLAGS -I${withval}/include"
+ LDFLAGS="$LDFLAGS -L${withval}/lib"
+ ]
+ )
+
+ AC_ARG_WITH(libsynce-include,
+ AC_HELP_STRING(
+ [--with-libsynce-include[=DIR]],
+ [Search for libsynce header files in DIR]),
+ [
+ CPPFLAGS="$CPPFLAGS -I${withval}"
+ ]
+ )
+
+ AC_ARG_WITH(libsynce-lib,
+ AC_HELP_STRING(
+ [--with-libsynce-lib[=DIR]],
+ [Search for libsynce library files in DIR]),
+ [
+ LDFLAGS="$LDFLAGS -L${withval}"
+ ]
+ )
+
+ AC_CHECK_LIB(synce,main,,[
+ AC_MSG_ERROR([Can't find synce library])
+ ])
+ AC_CHECK_HEADERS(synce.h,,[
+ AC_MSG_ERROR([Can't find synce.h])
+ ])
+
+])
+
+dnl $Id: librapi2.m4,v 1.1.1.1 2003/08/17 12:06:40 twogood Exp $ vim:
syntax=config
+dnl Check for librapi2
+
+AC_DEFUN(AM_PATH_LIBRAPI2, [
+
+ AC_ARG_WITH(librapi2,
+ AC_HELP_STRING(
+ [--with-librapi2[=DIR]],
+ [Search for librapi2 in DIR/include and DIR/lib]),
+ [
+ CPPFLAGS="$CPPFLAGS -I${withval}/include"
+ LDFLAGS="$LDFLAGS -L${withval}/lib"
+ ]
+ )
+
+ AC_ARG_WITH(librapi2-include,
+ AC_HELP_STRING(
+ [--with-librapi2-include[=DIR]],
+ [Search for librapi2 header files in DIR]),
+ [
+ CPPFLAGS="$CPPFLAGS -I${withval}"
+ ]
+ )
+
+ AC_ARG_WITH(librapi2-lib,
+ AC_HELP_STRING(
+ [--with-librapi2-lib[=DIR]],
+ [Search for librapi2 library files in DIR]),
+ [
+ LDFLAGS="$LDFLAGS -L${withval}"
+ ]
+ )
+
+
+ AC_CHECK_LIB(rapi,CeRapiInit,,[
+ AC_MSG_ERROR([Can't find RAPI library])
+ ])
+ AC_CHECK_HEADERS(rapi.h,,[
+ AC_MSG_ERROR([Can't find rapi.h])
+ ])
+
+])
+
+dnl $Id: dynamite.m4,v 1.1 2003/08/22 12:32:26 twogood Exp $ vim: syntax=config
+dnl Check for libdynamite
+
+AC_DEFUN(AM_PATH_LIBDYNAMITE, [
+
+ AC_ARG_WITH(libdynamite,
+ AC_HELP_STRING(
+ [--with-libdynamite[=DIR]],
+ [Search for libdynamite in DIR/include and DIR/lib]),
+ [
+ CPPFLAGS="$CPPFLAGS -I${withval}/include"
+ LDFLAGS="$LDFLAGS -L${withval}/lib"
+ ]
+ )
+
+ AC_ARG_WITH(libdynamite-include,
+ AC_HELP_STRING(
+ [--with-libdynamite-include[=DIR]],
+ [Search for libdynamite header files in DIR]),
+ [
+ CPPFLAGS="$CPPFLAGS -I${withval}"
+ ]
+ )
+
+ AC_ARG_WITH(libdynamite-lib,
+ AC_HELP_STRING(
+ [--with-libdynamite-lib[=DIR]],
+ [Search for libdynamite library files in DIR]),
+ [
+ LDFLAGS="$LDFLAGS -L${withval}"
+ ]
+ )
+
+ AC_CHECK_LIB(dynamite,dynamite_explode,,[
+ AC_MSG_ERROR([Can't find dynamite library])
+ ])
+ AC_CHECK_HEADERS(libdynamite.h,,[
+ AC_MSG_ERROR([Can't find dynamite.h])
+ ])
+
+])
+
+dnl $Id: unshield.m4,v 1.2 2003/09/13 09:25:33 twogood Exp $ vim: syntax=config
+dnl Check for libunshield
+
+AC_DEFUN(AM_PATH_LIBUNSHIELD, [
+
+ AC_ARG_WITH(libunshield,
+ AC_HELP_STRING(
+ [--with-libunshield[=DIR]],
+ [Search for libunshield in DIR/include and DIR/lib]),
+ [
+ CPPFLAGS="$CPPFLAGS -I${withval}/include"
+ LDFLAGS="$LDFLAGS -L${withval}/lib"
+ ]
+ )
+
+ AC_ARG_WITH(libunshield-include,
+ AC_HELP_STRING(
+ [--with-libunshield-include[=DIR]],
+ [Search for libunshield header files in DIR]),
+ [
+ CPPFLAGS="$CPPFLAGS -I${withval}"
+ ]
+ )
+
+ AC_ARG_WITH(libunshield-lib,
+ AC_HELP_STRING(
+ [--with-libunshield-lib[=DIR]],
+ [Search for libunshield library files in DIR]),
+ [
+ LDFLAGS="$LDFLAGS -L${withval}"
+ ]
+ )
+
+ AC_CHECK_LIB(unshield,unshield_open,,[
+ AC_MSG_ERROR([Can't find unshield library])
+ ])
+ AC_CHECK_HEADERS(libunshield.h,,[
+ AC_MSG_ERROR([Can't find libunshield.h])
+ ])
+
+])
+
--- orange-0.2.orig/lib/suf.c
+++ orange-0.2/lib/suf.c
@@ -208,7 +208,7 @@
char* result;
size_t length = **p;
(*p)++;
- result = orange_strndup(*p, length);
+ result = orange_strndup((char *)*p, length);
*p += length;
return result;
}/*}}}*/
@@ -217,7 +217,7 @@
{
char* result;
size_t length = orange_read_uint16(p);
- result = orange_strndup(*p, length);
+ result = orange_strndup((char *)*p, length);
*p += length;
return result;
}/*}}}*/
