diff options
40 files changed, 337 insertions, 11683 deletions
diff --git a/mk/mirrors.mk b/mk/mirrors.mk index f38bd7d40..d820a56b3 100644 --- a/mk/mirrors.mk +++ b/mk/mirrors.mk @@ -42,7 +42,6 @@ MASTER_SITE_GNU?= \ ftp://ftp.sunet.se/pub/gnu/ \ MASTER_SITE_SOURCEFORGE?= \ - http://easynews.dl.sourceforge.net/sourceforge/ \ http://puzzle.dl.sourceforge.net/sourceforge/ \ http://optusnet.dl.sourceforge.net/sourceforge/ \ http://heanet.dl.sourceforge.net/sourceforge/ \ @@ -55,6 +54,7 @@ MASTER_SITE_SOURCEFORGE?= \ http://ovh.dl.sourceforge.net/sourceforge/ \ http://surfnet.dl.sourceforge.net/sourceforge/ \ http://ufpr.dl.sourceforge.net/sourceforge/ \ + http://easynews.dl.sourceforge.net/sourceforge/ \ MASTER_SITE_MYSQL?= \ ftp://ftp.fu-berlin.de/unix/databases/mysql/ \ diff --git a/mk/vars.mk b/mk/vars.mk index 2b50b9e5a..43371edc2 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -69,7 +69,8 @@ TARGET_LD:= ${TARGET_COMPILER_PREFIX}ld TARGET_CPPFLAGS:= TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts TARGET_CXXFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -TARGET_LDFLAGS:= -Wl,-O2 -Wl,-rpath -Wl,/usr/lib \ +TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \ + -Wl,-O2 -Wl,-rpath -Wl,/usr/lib \ -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib ifneq ($(ADK_NATIVE),) @@ -198,7 +199,7 @@ QUIET:= else QUIET:= --quiet endif -FETCH_CMD?= wget --timeout=30 -t 3 $(QUIET) +FETCH_CMD?= wget --timeout=5 -t 3 $(QUIET) ifeq ($(ADK_HOST_CYGWIN),y) EXEEXT:= .exe diff --git a/package/bluez/patches/patch-tools_bccmd_c b/package/bluez/patches/patch-tools_bccmd_c new file mode 100644 index 000000000..8278a834c --- /dev/null +++ b/package/bluez/patches/patch-tools_bccmd_c @@ -0,0 +1,18 @@ +--- bluez-4.92.orig/tools/bccmd.c 2010-11-30 15:50:48.000000000 +0100 ++++ bluez-4.92/tools/bccmd.c 2011-05-17 18:19:30.856601139 +0200 +@@ -1183,6 +1183,7 @@ int main(int argc, char *argv[]) + case 115200: bcsp_rate = B115200; break; + case 230400: bcsp_rate = B230400; break; + case 460800: bcsp_rate = B460800; break; ++#if 0 + case 500000: bcsp_rate = B500000; break; + case 576000: bcsp_rate = B576000; break; + case 921600: bcsp_rate = B921600; break; +@@ -1202,6 +1203,7 @@ int main(int argc, char *argv[]) + #ifdef B4000000 + case 4000000: bcsp_rate = B4000000; break; + #endif ++#endif + default: + printf("Unknown BCSP baud rate specified, defaulting to 38400bps\n"); + bcsp_rate = B38400; diff --git a/package/bluez/patches/patch-tools_hciattach_c b/package/bluez/patches/patch-tools_hciattach_c new file mode 100644 index 000000000..45c8e2e7f --- /dev/null +++ b/package/bluez/patches/patch-tools_hciattach_c @@ -0,0 +1,18 @@ +--- bluez-4.92.orig/tools/hciattach.c 2010-11-30 15:50:48.000000000 +0100 ++++ bluez-4.92/tools/hciattach.c 2011-05-17 18:18:20.776610031 +0200 +@@ -107,6 +107,7 @@ static int uart_speed(int s) + return B230400; + case 460800: + return B460800; ++#if 0 + case 500000: + return B500000; + case 576000: +@@ -137,6 +138,7 @@ static int uart_speed(int s) + case 4000000: + return B4000000; + #endif ++#endif + default: + return B57600; + } diff --git a/package/cairo/Makefile b/package/cairo/Makefile index f25372af8..544586301 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -28,7 +28,7 @@ $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN $(eval $(call PKG_template,CAIRO_DEV,cairo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CAIRO_DEV},${PKGSC_CAIRO_DEV},${PKG_OPTS})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) -ifeq ($(TARGET_ARCH),arm) +ifeq (,$(filter arm,$(TARGET_ARCH))) TARGET_CFLAGS:= $(filter-out -Os,$(TARGET_CFLAGS)) endif CONFIGURE_ARGS+= --enable-ft=yes \ diff --git a/package/classpath/Makefile b/package/classpath/Makefile index fd5efa109..2a9199e55 100644 --- a/package/classpath/Makefile +++ b/package/classpath/Makefile @@ -14,7 +14,7 @@ PKG_DEPENDS:= libgtk gdk-pixbuf orbit2 gconf PKG_URL:= http://www.gnu.org/software/classpath/home.html PKG_SITES:= ${MASTER_SITE_GNU:=classpath/} -PKG_ARCH_DEPENDS:= !cris +PKG_ARCH_DEPENDS:= !cris !arm include $(TOPDIR)/mk/package.mk diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 211955af9..33b5b4519 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -13,7 +13,7 @@ PKG_DEPENDS:= libpthread PKG_URL:= http://collectd.org/ PKG_SITES:= http://collectd.org/files/ -PKG_FLAVOURS_COLLECD:= WITH_CPU WITH_LOAD WITH_MEMORY WITH_PING +PKG_FLAVOURS_COLLECTD:= WITH_CPU WITH_LOAD WITH_MEMORY WITH_PING PKGFD_WITH_CPU:= collect CPU statistics PKGFD_WITH_LOAD:= collect system load statistics PKGFD_WITH_MEMORY:= collect memory usage statistics diff --git a/package/dialog/patches/patch-configure b/package/dialog/patches/patch-configure new file mode 100644 index 000000000..4013b3f57 --- /dev/null +++ b/package/dialog/patches/patch-configure @@ -0,0 +1,10 @@ +--- dialog-1.1-20080819.orig/configure 2008-03-16 19:54:16.000000000 +0100 ++++ dialog-1.1-20080819/configure 2011-05-15 20:15:38.756610583 +0200 +@@ -9024,7 +9024,6 @@ fi + + ;; + linux*) # Suse Linux does not follow /usr/lib convention +- LIBS="$LIBS -L/lib" + ;; + sunos3*|sunos4*) + test -d /usr/5lib && \ diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile index 0039601c3..c5b732866 100644 --- a/package/dsniff/Makefile +++ b/package/dsniff/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= libnids openssl gdbm libpcap libnet PKG_URL:= http://www.monkey.org/~dugsong/dsniff/ PKG_SITES:= http://www.monkey.org/~dugsong/dsniff/beta/ +PKG_ARCH_DEPENDS:= !arm + WRKDIST= ${WRKDIR}/${PKG_NAME}-2.4 include ${TOPDIR}/mk/package.mk diff --git a/package/firefox/Makefile b/package/firefox/Makefile index c5271f249..a0d6e9eaa 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -19,7 +19,7 @@ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_ PKG_NOPARALLEL:= 1 PKG_NEED_CXX:= 1 -PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el native +PKG_ARCH_DEPENDS:= x86 x86_64 mips64 mips64el native PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 diff --git a/package/firefox/patches/patch-content_base_public_nsContentUtils_h b/package/firefox/patches/patch-content_base_public_nsContentUtils_h new file mode 100644 index 000000000..2cd2821c7 --- /dev/null +++ b/package/firefox/patches/patch-content_base_public_nsContentUtils_h @@ -0,0 +1,11 @@ +--- mozilla-2.0.orig/content/base/public/nsContentUtils.h 2011-03-19 00:33:33.000000000 +0100 ++++ mozilla-2.0/content/base/public/nsContentUtils.h 2011-06-15 20:05:44.538202220 +0200 +@@ -1942,7 +1942,7 @@ inline NS_HIDDEN_(PRBool) NS_FloatIsFini + #ifdef WIN32 + return _finite(f); + #else +- return finite(f); ++ return isfinite(f); + #endif + } + diff --git a/package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp b/package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp new file mode 100644 index 000000000..9a49b3cd6 --- /dev/null +++ b/package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp @@ -0,0 +1,11 @@ +--- mozilla-2.0.orig/content/canvas/src/nsCanvasRenderingContext2D.cpp 2011-03-19 00:33:34.000000000 +0100 ++++ mozilla-2.0/content/canvas/src/nsCanvasRenderingContext2D.cpp 2011-06-15 20:26:00.226952311 +0200 +@@ -159,7 +159,7 @@ DoubleIsFinite(double d) + // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800. + return !!_finite(d); + #else +- return finite(d); ++ return isfinite(d); + #endif + } + diff --git a/package/firefox/patches/patch-js_src_ctypes_CTypes_cpp b/package/firefox/patches/patch-js_src_ctypes_CTypes_cpp new file mode 100644 index 000000000..e7796d5d2 --- /dev/null +++ b/package/firefox/patches/patch-js_src_ctypes_CTypes_cpp @@ -0,0 +1,11 @@ +--- mozilla-2.0.orig/js/src/ctypes/CTypes.cpp 2011-03-19 00:33:47.000000000 +0100 ++++ mozilla-2.0/js/src/ctypes/CTypes.cpp 2011-06-15 05:56:10.076952202 +0200 +@@ -464,7 +464,7 @@ static inline bool FloatIsFinite(jsdoubl + #ifdef WIN32 + return _finite(f) != 0; + #else +- return finite(f); ++ return isfinite(f); + #endif + } + diff --git a/package/firefox/patches/patch-xpcom_threads_nsThread_cpp b/package/firefox/patches/patch-xpcom_threads_nsThread_cpp index 67ef28c26..ebe95827e 100644 --- a/package/firefox/patches/patch-xpcom_threads_nsThread_cpp +++ b/package/firefox/patches/patch-xpcom_threads_nsThread_cpp @@ -1,10 +1,17 @@ --- mozilla-2.0.orig/xpcom/threads/nsThread.cpp 2011-03-19 00:34:14.000000000 +0100 -+++ mozilla-2.0/xpcom/threads/nsThread.cpp 2011-04-24 08:56:39.000000000 +0200 -@@ -52,7 +52,6 @@ ++++ mozilla-2.0/xpcom/threads/nsThread.cpp 2011-06-15 19:51:07.078202253 +0200 +@@ -50,11 +50,13 @@ + _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) && \ + !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700) ++#include <features.h> #if defined(XP_UNIX) && !defined(ANDROID) && !defined(DEBUG) && HAVE_UALARM \ && defined(_GNU_SOURCE) -# define MOZ_CANARY # include <unistd.h> ++#if !defined(__UCLIBC__) # include <execinfo.h> ++#endif # include <signal.h> + # include <fcntl.h> + # include "nsXULAppAPI.h" diff --git a/package/gconf/Makefile b/package/gconf/Makefile index 6f449ec8e..84c33ee44 100644 --- a/package/gconf/Makefile +++ b/package/gconf/Makefile @@ -15,6 +15,8 @@ PKG_DEPENDS:= dbus dbus-glib orbit2 PKG_URL:= http://projects.gnome.org/gconf/ PKG_SITES:= ftp://ftp.gnome.org//pub/GNOME/sources/GConf/${PKG_EXTRAVER}/ +PKG_ARCH_DEPENDS:= !arm !cris + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,GCONF,gconf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/gkrellm/patches/patch-server_Makefile b/package/gkrellm/patches/patch-server_Makefile index 9f070e275..a1a8747e7 100644 --- a/package/gkrellm/patches/patch-server_Makefile +++ b/package/gkrellm/patches/patch-server_Makefile @@ -1,5 +1,5 @@ --- gkrellm-2.3.4.orig/server/Makefile 2008-10-03 23:52:48.000000000 +0200 -+++ gkrellm-2.3.4/server/Makefile 2011-01-15 18:37:40.000000000 +0100 ++++ gkrellm-2.3.4/server/Makefile 2011-05-17 11:34:14.926610183 +0200 @@ -26,7 +26,7 @@ SMANDIR ?= $(INSTALLROOT)/share/man/man1 MANMODE ?= 644 MANDIRMODE ?= 755 @@ -9,7 +9,7 @@ EXTRAOBJS = SHARED_PATH = ../shared -@@ -109,8 +109,8 @@ endif +@@ -109,15 +109,15 @@ endif override CC += -Wall $(FLAGS) @@ -20,3 +20,11 @@ OBJS = main.o monitor.o mail.o plugins.o glib.o utils.o sysdeps-unix.o log.o + all: gkrellmd + + gkrellmd: $(OBJS) $(EXTRAOBJS) +- $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LIBS) $(LINK_FLAGS) ++ $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LINK_FLAGS) $(LIBS) + + static: $(OBJS) $(EXTRAOBJS) + $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \ diff --git a/package/gmediaserver/patches/patch-src_Makefile_in b/package/gmediaserver/patches/patch-src_Makefile_in new file mode 100644 index 000000000..52cbf9afa --- /dev/null +++ b/package/gmediaserver/patches/patch-src_Makefile_in @@ -0,0 +1,12 @@ +--- gmediaserver-0.13.0.orig/src/Makefile.in 2007-11-10 16:01:34.000000000 +0100 ++++ gmediaserver-0.13.0/src/Makefile.in 2011-05-16 17:08:17.466610320 +0200 +@@ -452,9 +452,6 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/lib \ + $(ID3_CPPFLAGS) + +-AM_LDFLAGS = \ +- $(ID3_LDFLAGS) +- + gmediaserver_LDADD = \ + $(top_builddir)/lib/libgnu.a \ + $(UUID_LIBS) \ diff --git a/package/htop/Makefile b/package/htop/Makefile new file mode 100644 index 000000000..aa9bbfce3 --- /dev/null +++ b/package/htop/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= htop +PKG_VERSION:= 0.9 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 7c5507f35f363f3f40183a2ba3c561f8 +PKG_DESCR:= graphical process manager +PKG_SECTION:= utils +PKG_DEPENDS:= libncurses +PKG_BUILDDEP:= ncurses +PKG_URL:= http://sourceforge.net/projects/htop +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=htop/${PKG_VERSION}/} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,HTOP,htop,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS += ac_cv_file__proc_stat=yes \ + ac_cv_file__proc_meminfo=yes + +htop-install: + $(INSTALL_DIR) $(IDIR_HTOP)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/htop $(IDIR_HTOP)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/htop/patches/patch-configure_ac b/package/htop/patches/patch-configure_ac new file mode 100644 index 000000000..642939235 --- /dev/null +++ b/package/htop/patches/patch-configure_ac @@ -0,0 +1,10 @@ +--- htop-0.9.orig/configure.ac 2011-05-31 14:26:38.000000000 +0200 ++++ htop-0.9/configure.ac 2011-05-31 14:27:56.000000000 +0200 +@@ -25,6 +25,7 @@ + AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h],[:],[ + missing_headers="$missing_headers $ac_header" + ]) ++AC_CHECK_HEADERS([execinfo.h],[:],[:]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_HEADER_STDBOOL diff --git a/package/htop/patches/patch-crt_c b/package/htop/patches/patch-crt_c new file mode 100644 index 000000000..b88d2a1de --- /dev/null +++ b/package/htop/patches/patch-crt_c @@ -0,0 +1,30 @@ +--- htop-0.9.orig/CRT.c 2010-11-23 16:56:32.000000000 +0100 ++++ htop-0.9/CRT.c 2011-05-31 14:30:06.000000000 +0200 +@@ -11,7 +11,9 @@ + #include <signal.h> + #include <stdlib.h> + #include <stdbool.h> ++#ifdef HAVE_EXECINFO_H + #include <execinfo.h> ++#endif + + #include "String.h" + +@@ -125,12 +127,14 @@ + CRT_done(); + #if __linux + fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at http://htop.sf.net\n"); +- #else +- fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n"); +- #endif ++ #ifdef HAVE_EXECINFO_H + size_t size = backtrace(backtraceArray, sizeof(backtraceArray)); + fprintf(stderr, "Backtrace: \n"); + backtrace_symbols_fd(backtraceArray, size, 2); ++ #endif ++ #else ++ fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n"); ++ #endif + abort(); + } + diff --git a/package/htop/patches/patch-crt_h b/package/htop/patches/patch-crt_h new file mode 100644 index 000000000..17968fb69 --- /dev/null +++ b/package/htop/patches/patch-crt_h @@ -0,0 +1,12 @@ +--- htop-0.9.orig/CRT.h 2010-11-23 16:56:32.000000000 +0100 ++++ htop-0.9/CRT.h 2011-05-31 14:30:32.000000000 +0200 +@@ -14,7 +14,9 @@ + #include <signal.h> + #include <stdlib.h> + #include <stdbool.h> ++#ifdef HAVE_EXECINFO_H + #include <execinfo.h> ++#endif + + #include "String.h" + diff --git a/package/icecast/patches/autotool.patch b/package/icecast/patches/autotool.patch index 213ef0965..e8feb2e3a 100644 --- a/package/icecast/patches/autotool.patch +++ b/package/icecast/patches/autotool.patch @@ -1,6 +1,6 @@ diff -Nur icecast-2.3.2.orig/aclocal.m4 icecast-2.3.2/aclocal.m4 --- icecast-2.3.2.orig/aclocal.m4 2008-05-27 02:21:50.000000000 +0200 -+++ icecast-2.3.2/aclocal.m4 2010-02-18 21:27:36.308858757 +0100 ++++ icecast-2.3.2/aclocal.m4 2011-05-16 17:41:51.277851096 +0200 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- @@ -7233,7 +7233,7 @@ diff -Nur icecast-2.3.2.orig/aclocal.m4 icecast-2.3.2/aclocal.m4 m4_include([m4/theora.m4]) diff -Nur icecast-2.3.2.orig/admin/Makefile.in icecast-2.3.2/admin/Makefile.in --- icecast-2.3.2.orig/admin/Makefile.in 2008-05-30 01:58:57.000000000 +0200 -+++ icecast-2.3.2/admin/Makefile.in 2010-02-18 21:27:41.556853485 +0100 ++++ icecast-2.3.2/admin/Makefile.in 2011-05-16 17:41:51.296610263 +0200 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -7531,7 +7531,7 @@ diff -Nur icecast-2.3.2.orig/admin/Makefile.in icecast-2.3.2/admin/Makefile.in .NOEXPORT: diff -Nur icecast-2.3.2.orig/conf/Makefile.in icecast-2.3.2/conf/Makefile.in --- icecast-2.3.2.orig/conf/Makefile.in 2008-05-30 01:58:57.000000000 +0200 -+++ icecast-2.3.2/conf/Makefile.in 2010-02-18 21:27:41.872855443 +0100 ++++ icecast-2.3.2/conf/Makefile.in 2011-05-16 17:41:51.356602233 +0200 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -7832,7 +7832,7 @@ diff -Nur icecast-2.3.2.orig/conf/Makefile.in icecast-2.3.2/conf/Makefile.in .NOEXPORT: diff -Nur icecast-2.3.2.orig/config.h.in icecast-2.3.2/config.h.in --- icecast-2.3.2.orig/config.h.in 2008-04-29 06:54:28.000000000 +0200 -+++ icecast-2.3.2/config.h.in 2010-02-18 21:27:40.476856140 +0100 ++++ icecast-2.3.2/config.h.in 2011-05-16 17:41:51.416610152 +0200 @@ -93,7 +93,7 @@ /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H @@ -7865,7 +7865,7 @@ diff -Nur icecast-2.3.2.orig/config.h.in icecast-2.3.2/config.h.in diff -Nur icecast-2.3.2.orig/configure icecast-2.3.2/configure --- icecast-2.3.2.orig/configure 2008-05-27 02:21:57.000000000 +0200 -+++ icecast-2.3.2/configure 2010-02-18 21:27:38.596852163 +0100 ++++ icecast-2.3.2/configure 2011-05-16 17:41:51.446599626 +0200 @@ -1,62 +1,85 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. @@ -42577,7 +42577,7 @@ diff -Nur icecast-2.3.2.orig/configure icecast-2.3.2/configure diff -Nur icecast-2.3.2.orig/debian/Makefile.in icecast-2.3.2/debian/Makefile.in --- icecast-2.3.2.orig/debian/Makefile.in 2008-05-30 01:58:57.000000000 +0200 -+++ icecast-2.3.2/debian/Makefile.in 2010-02-18 21:27:41.980853846 +0100 ++++ icecast-2.3.2/debian/Makefile.in 2011-05-16 17:41:51.496601840 +0200 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -42816,7 +42816,7 @@ diff -Nur icecast-2.3.2.orig/debian/Makefile.in icecast-2.3.2/debian/Makefile.in .NOEXPORT: diff -Nur icecast-2.3.2.orig/doc/Makefile.in icecast-2.3.2/doc/Makefile.in --- icecast-2.3.2.orig/doc/Makefile.in 2008-05-30 01:58:57.000000000 +0200 -+++ icecast-2.3.2/doc/Makefile.in 2010-02-18 21:27:42.072851881 +0100 ++++ icecast-2.3.2/doc/Makefile.in 2011-05-16 17:41:51.536609889 +0200 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -43114,7 +43114,7 @@ diff -Nur icecast-2.3.2.orig/doc/Makefile.in icecast-2.3.2/doc/Makefile.in .NOEXPORT: diff -Nur icecast-2.3.2.orig/examples/Makefile.in icecast-2.3.2/examples/Makefile.in --- icecast-2.3.2.orig/examples/Makefile.in 2008-05-30 01:58:57.000000000 +0200 -+++ icecast-2.3.2/examples/Makefile.in 2010-02-18 21:27:42.160852195 +0100 ++++ icecast-2.3.2/examples/Makefile.in 2011-05-16 17:41:51.576610251 +0200 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -43353,7 +43353,7 @@ diff -Nur icecast-2.3.2.orig/examples/Makefile.in icecast-2.3.2/examples/Makefil .NOEXPORT: diff -Nur icecast-2.3.2.orig/ltmain.sh icecast-2.3.2/ltmain.sh --- icecast-2.3.2.orig/ltmain.sh 2007-08-29 14:28:46.000000000 +0200 -+++ icecast-2.3.2/ltmain.sh 2010-02-18 21:27:29.560857065 +0100 ++++ icecast-2.3.2/ltmain.sh 2011-05-16 17:41:51.596605253 +0200 @@ -1,52 +1,83 @@ -# ltmain.sh - Provide generalized library-building support services. -# NOTE: Changing this file will not affect anything until you rerun configure. @@ -57541,7 +57541,7 @@ diff -Nur icecast-2.3.2.orig/ltmain.sh icecast-2.3.2/ltmain.sh + diff -Nur icecast-2.3.2.orig/m4/libtool.m4 icecast-2.3.2/m4/libtool.m4 --- icecast-2.3.2.orig/m4/libtool.m4 1970-01-01 01:00:00.000000000 +0100 -+++ icecast-2.3.2/m4/libtool.m4 2010-02-18 21:27:29.616856377 +0100 ++++ icecast-2.3.2/m4/libtool.m4 2011-05-16 17:41:51.666726639 +0200 @@ -0,0 +1,7377 @@ +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# @@ -64922,7 +64922,7 @@ diff -Nur icecast-2.3.2.orig/m4/libtool.m4 icecast-2.3.2/m4/libtool.m4 +]) diff -Nur icecast-2.3.2.orig/m4/lt~obsolete.m4 icecast-2.3.2/m4/lt~obsolete.m4 --- icecast-2.3.2.orig/m4/lt~obsolete.m4 1970-01-01 01:00:00.000000000 +0100 -+++ icecast-2.3.2/m4/lt~obsolete.m4 2010-02-18 21:27:29.996853947 +0100 ++++ icecast-2.3.2/m4/lt~obsolete.m4 2011-05-16 17:41:51.676600869 +0200 @@ -0,0 +1,92 @@ +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# @@ -65018,7 +65018,7 @@ diff -Nur icecast-2.3.2.orig/m4/lt~obsolete.m4 icecast-2.3.2/m4/lt~obsolete.m4 +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) diff -Nur icecast-2.3.2.orig/m4/ltoptions.m4 icecast-2.3.2/m4/ltoptions.m4 --- icecast-2.3.2.orig/m4/ltoptions.m4 1970-01-01 01:00:00.000000000 +0100 -+++ icecast-2.3.2/m4/ltoptions.m4 2010-02-18 21:27:29.720856211 +0100 ++++ icecast-2.3.2/m4/ltoptions.m4 2011-05-16 17:41:51.736619821 +0200 @@ -0,0 +1,368 @@ +# Helper functions for option handling. -*- Autoconf -*- +# @@ -65390,7 +65390,7 @@ diff -Nur icecast-2.3.2.orig/m4/ltoptions.m4 icecast-2.3.2/m4/ltoptions.m4 + [m4_define([_LTDL_TYPE], [convenience])]) diff -Nur icecast-2.3.2.orig/m4/ltsugar.m4 icecast-2.3.2/m4/ltsugar.m4 --- icecast-2.3.2.orig/m4/ltsugar.m4 1970-01-01 01:00:00.000000000 +0100 -+++ icecast-2.3.2/m4/ltsugar.m4 2010-02-18 21:27:29.812854518 +0100 ++++ icecast-2.3.2/m4/ltsugar.m4 2011-05-16 17:41:51.776607116 +0200 @@ -0,0 +1,123 @@ +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- +# @@ -65517,7 +65517,7 @@ diff -Nur icecast-2.3.2.orig/m4/ltsugar.m4 icecast-2.3.2/m4/ltsugar.m4 +]) diff -Nur icecast-2.3.2.orig/m4/ltversion.m4 icecast-2.3.2/m4/ltversion.m4 --- icecast-2.3.2.orig/m4/ltversion.m4 1970-01-01 01:00:00.000000000 +0100 -+++ icecast-2.3.2/m4/ltversion.m4 2010-02-18 21:27:29.900855680 +0100 ++++ icecast-2.3.2/m4/ltversion.m4 2011-05-16 17:41:51.819110062 +0200 @@ -0,0 +1,23 @@ +# ltversion.m4 -- version numbers -*- Autoconf -*- +# @@ -65544,7 +65544,7 @@ diff -Nur icecast-2.3.2.orig/m4/ltversion.m4 icecast-2.3.2/m4/ltversion.m4 +]) diff -Nur icecast-2.3.2.orig/m4/xiph_curl.m4 icecast-2.3.2/m4/xiph_curl.m4 --- icecast-2.3.2.orig/m4/xiph_curl.m4 2008-04-19 03:54:26.000000000 +0200 -+++ icecast-2.3.2/m4/xiph_curl.m4 2010-02-18 21:27:17.216857590 +0100 ++++ icecast-2.3.2/m4/xiph_curl.m4 2011-05-16 17:41:51.856607453 +0200 @@ -52,7 +52,7 @@ AC_MSG_CHECKING(for libcurl) if test "$curl_ok" = "yes" @@ -65556,7 +65556,7 @@ diff -Nur icecast-2.3.2.orig/m4/xiph_curl.m4 icecast-2.3.2/m4/xiph_curl.m4 { diff -Nur icecast-2.3.2.orig/Makefile.in icecast-2.3.2/Makefile.in --- icecast-2.3.2.orig/Makefile.in 2008-05-30 01:58:59.000000000 +0200 -+++ icecast-2.3.2/Makefile.in 2010-02-18 21:27:43.484852142 +0100 ++++ icecast-2.3.2/Makefile.in 2011-05-16 17:41:51.886674860 +0200 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -66203,7 +66203,7 @@ diff -Nur icecast-2.3.2.orig/Makefile.in icecast-2.3.2/Makefile.in .NOEXPORT: diff -Nur icecast-2.3.2.orig/src/avl/Makefile.in icecast-2.3.2/src/avl/Makefile.in --- icecast-2.3.2.orig/src/avl/Makefile.in 2008-05-30 01:58:58.000000000 +0200 -+++ icecast-2.3.2/src/avl/Makefile.in 2010-02-18 21:27:42.448854807 +0100 ++++ icecast-2.3.2/src/avl/Makefile.in 2011-05-16 17:41:51.947265588 +0200 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -66558,7 +66558,7 @@ diff -Nur icecast-2.3.2.orig/src/avl/Makefile.in icecast-2.3.2/src/avl/Makefile. .NOEXPORT: diff -Nur icecast-2.3.2.orig/src/httpp/Makefile.in icecast-2.3.2/src/httpp/Makefile.in --- icecast-2.3.2.orig/src/httpp/Makefile.in 2008-05-30 01:58:58.000000000 +0200 -+++ icecast-2.3.2/src/httpp/Makefile.in 2010-02-18 21:27:42.572851611 +0100 ++++ icecast-2.3.2/src/httpp/Makefile.in 2011-05-16 17:41:51.986604412 +0200 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -66913,7 +66913,7 @@ diff -Nur icecast-2.3.2.orig/src/httpp/Makefile.in icecast-2.3.2/src/httpp/Makef .NOEXPORT: diff -Nur icecast-2.3.2.orig/src/log/Makefile.in icecast-2.3.2/src/log/Makefile.in --- icecast-2.3.2.orig/src/log/Makefile.in 2008-05-30 01:58:58.000000000 +0200 -+++ icecast-2.3.2/src/log/Makefile.in 2010-02-18 21:27:42.692851808 +0100 ++++ icecast-2.3.2/src/log/Makefile.in 2011-05-16 17:41:52.029105504 +0200 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -67252,7 +67252,7 @@ diff -Nur icecast-2.3.2.orig/src/log/Makefile.in icecast-2.3.2/src/log/Makefile. .NOEXPORT: diff -Nur icecast-2.3.2.orig/src/Makefile.in icecast-2.3.2/src/Makefile.in --- icecast-2.3.2.orig/src/Makefile.in 2008-05-30 01:58:58.000000000 +0200 -+++ icecast-2.3.2/src/Makefile.in 2010-02-18 21:27:42.308853999 +0100 ++++ icecast-2.3.2/src/Makefile.in 2011-05-16 17:42:11.207851020 +0200 @@ -1,8 +1,9 @@ -# Makefile.in generated by |