diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-05-03 23:39:03 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-05-03 23:39:03 +0200 |
| commit | 34ef590d3c0b0dfb9b35d6c6c63f5304132c19ad (patch) | |
| tree | f33932752c591d00081c2d997c9a10f41c9ffd49 /patches | |
| parent | 267644edbb7ea62f521d0e871e47bfda985d58d2 (diff) | |
| parent | d712649061e5ad7d99381203de8f68673c0c8004 (diff) | |
| download | ptxdist-34ef590d3c0b0dfb9b35d6c6c63f5304132c19ad.tar.gz ptxdist-34ef590d3c0b0dfb9b35d6c6c63f5304132c19ad.tar.xz | |
Merge branch 'cleanup' of ssh://git.pengutronix.de/git-private/rsc/ptxdist
Diffstat (limited to 'patches')
56 files changed, 382 insertions, 2144 deletions
diff --git a/patches/DirectFB-examples-1.2.0/use_ptx_logo.diff b/patches/DirectFB-examples-1.2.0/use_ptx_logo.diff index c3c4bc2c4..a0082b185 100644 --- a/patches/DirectFB-examples-1.2.0/use_ptx_logo.diff +++ b/patches/DirectFB-examples-1.2.0/use_ptx_logo.diff @@ -1,3 +1,8 @@ +From: Wolfram Sang <w.sang@pengutronix.de> +Subject: Add Pengutronix logo + +Signed-off-by: (not for upstream) + --- src/df_andi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/TraceToolkit-0.9.5/TraceToolkit-0.9.5a-gds1.diff b/patches/TraceToolkit-0.9.5/TraceToolkit-0.9.5a-gds1.diff index 64385ccc0..406fba377 100644 --- a/patches/TraceToolkit-0.9.5/TraceToolkit-0.9.5a-gds1.diff +++ b/patches/TraceToolkit-0.9.5/TraceToolkit-0.9.5a-gds1.diff @@ -1,3 +1,10 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> + +(no idea where this patch comes from, needs review) + +Signed-off-by: (none) +--- + diff -ru --new-file TraceToolkit-0.9.5/Daemon/TraceDaemon.c /home/kub/src/TraceToolkit-0.9.5/Daemon/TraceDaemon.c --- TraceToolkit-0.9.5/Daemon/TraceDaemon.c Mon Apr 15 22:49:10 2002 +++ /home/kub/src/TraceToolkit-0.9.5/Daemon/TraceDaemon.c Wed Aug 20 12:58:21 2003 diff --git a/patches/TraceToolkit-0.9.5/series b/patches/TraceToolkit-0.9.5/series new file mode 100644 index 000000000..47416b9f6 --- /dev/null +++ b/patches/TraceToolkit-0.9.5/series @@ -0,0 +1 @@ +TraceToolkit-0.9.5a-gds1.diff diff --git a/patches/cvs-1.11.22/remove_zlib.patch b/patches/cvs-1.11.22/cvs-1.11.22-use-system-zlib.patch index 15c9cebce..28013207c 100644 --- a/patches/cvs-1.11.22/remove_zlib.patch +++ b/patches/cvs-1.11.22/cvs-1.11.22-use-system-zlib.patch @@ -1,3 +1,65 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: [cvs] link against system zlib + +Instead of building our own internal zlib, link against the variant +provided by the system. + +This patch was taken from linux-from-scratch: + + Submitted By: Matthew Burgess <matthew@linuxfromscratch.org> + Date: 2004-11-12 + Initial Package Version: 1.11.2 + Upstream Status: Not submitted + Origin: BLFS Dev Post + Description: Links against system zlib instead of the + internal zlib. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + +--- + +diff -Naur cvs-1.11.18.orig/src/Makefile.in cvs-1.11.18/src/Makefile.in +--- cvs-1.11.18.orig/src/Makefile.in 2004-11-11 18:17:20.000000000 +0000 ++++ cvs-1.11.18/src/Makefile.in 2004-11-12 19:58:14.962293296 +0000 +@@ -86,7 +86,7 @@ + version.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \ + wrapper.$(OBJEXT) zlib.$(OBJEXT) + cvs_OBJECTS = $(am_cvs_OBJECTS) +-cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a ++cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a + binSCRIPT_INSTALL = $(INSTALL_SCRIPT) + SCRIPTS = $(bin_SCRIPTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -199,7 +199,7 @@ + # some namespace hackery going on that maybe shouldn't be. Long term fix is to + # try and remove naming ocnflicts and fix Automake to allow particular includes + # to be attached only to particular object files. Short term fix is either or. +-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt) ++INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt) + bin_SCRIPTS = cvsbug + + # The cvs executable +@@ -278,7 +278,7 @@ + cvs_LDADD = \ + ../diff/libdiff.a \ + ../lib/libcvs.a \ +- ../zlib/libz.a ++ -lz + + + # extra clean targets +diff -Naur cvs-1.11.18.orig/src/zlib.c cvs-1.11.18/src/zlib.c +--- cvs-1.11.18.orig/src/zlib.c 2004-03-19 19:18:57.000000000 +0000 ++++ cvs-1.11.18/src/zlib.c 2004-11-12 19:58:55.531125896 +0000 +@@ -22,7 +22,7 @@ + + #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT) + +-#include "zlib.h" ++#include <zlib.h> + + /* OS/2 doesn't have EIO. FIXME: this whole notion of turning + a different error into EIO strikes me as pretty dubious. */ --- cvs-1.11.22/Makefile.in.orig +++ cvs-1.11.22/Makefile.in @@ -53,7 +53,7 @@ diff --git a/patches/cvs-1.11.22/cvs-1.11.22-zlib-1.patch b/patches/cvs-1.11.22/cvs-1.11.22-zlib-1.patch deleted file mode 100644 index 869a3645e..000000000 --- a/patches/cvs-1.11.22/cvs-1.11.22-zlib-1.patch +++ /dev/null @@ -1,53 +0,0 @@ -Submitted By: Matthew Burgess <matthew@linuxfromscratch.org> -Date: 2004-11-12 -Initial Package Version: 1.11.2 -Upstream Status: Not submitted -Origin: BLFS Dev Post -Description: Links against system zlib instead of the - internal zlib. - -$LastChangedBy: igor $ -$Date: 2005-10-28 09:20:09 -0500 (Fri, 28 Oct 2005) $ - -diff -Naur cvs-1.11.18.orig/src/Makefile.in cvs-1.11.18/src/Makefile.in ---- cvs-1.11.18.orig/src/Makefile.in 2004-11-11 18:17:20.000000000 +0000 -+++ cvs-1.11.18/src/Makefile.in 2004-11-12 19:58:14.962293296 +0000 -@@ -86,7 +86,7 @@ - version.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \ - wrapper.$(OBJEXT) zlib.$(OBJEXT) - cvs_OBJECTS = $(am_cvs_OBJECTS) --cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a -+cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a - binSCRIPT_INSTALL = $(INSTALL_SCRIPT) - SCRIPTS = $(bin_SCRIPTS) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -199,7 +199,7 @@ - # some namespace hackery going on that maybe shouldn't be. Long term fix is to - # try and remove naming ocnflicts and fix Automake to allow particular includes - # to be attached only to particular object files. Short term fix is either or. --INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt) -+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt) - bin_SCRIPTS = cvsbug - - # The cvs executable -@@ -278,7 +278,7 @@ - cvs_LDADD = \ - ../diff/libdiff.a \ - ../lib/libcvs.a \ -- ../zlib/libz.a -+ -lz - - - # extra clean targets -diff -Naur cvs-1.11.18.orig/src/zlib.c cvs-1.11.18/src/zlib.c ---- cvs-1.11.18.orig/src/zlib.c 2004-03-19 19:18:57.000000000 +0000 -+++ cvs-1.11.18/src/zlib.c 2004-11-12 19:58:55.531125896 +0000 -@@ -22,7 +22,7 @@ - - #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT) - --#include "zlib.h" -+#include <zlib.h> - - /* OS/2 doesn't have EIO. FIXME: this whole notion of turning - a different error into EIO strikes me as pretty dubious. */ diff --git a/patches/cvs-1.11.22/series b/patches/cvs-1.11.22/series index 52f7c9406..675a2b6d2 100644 --- a/patches/cvs-1.11.22/series +++ b/patches/cvs-1.11.22/series @@ -1,3 +1 @@ -cvs-1.11.22-zlib-1.patch -remove_zlib.patch - +cvs-1.11.22-use-system-zlib.patch diff --git a/patches/dejagnu-1.4.3/series b/patches/dejagnu-1.4.3/series new file mode 100644 index 000000000..608577171 --- /dev/null +++ b/patches/dejagnu-1.4.3/series @@ -0,0 +1,2 @@ +dejagnu-quiet.patch +rsh-background.patch diff --git a/patches/efax-0.9/efax-0.9-config.patch b/patches/efax-0.9/efax-0.9-config.patch deleted file mode 100644 index 8a874036d..000000000 --- a/patches/efax-0.9/efax-0.9-config.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- - Makefile | 2 +- - fax | 14 +++++++------- - 2 files changed, 8 insertions(+), 8 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -8,7 +8,7 @@ CC=gcc - # Compile/load options. Add -DNO_STRERROR to CFLAGS if _strerror - # is undefined - --CFLAGS= -+CFLAGS= $(RPM_OPT_FLAGS) - LDFLAGS= - - # Change the following to the destination directories for ---- a/fax -+++ b/fax -@@ -17,9 +17,9 @@ - # The names of the fax script, efax and efix, including full path - # if necessary. - --FAX=fax --EFAX=efax --EFIX=efix -+FAX=/usr/bin/fax -+EFAX=/usr/bin/efax -+EFIX=/usr/bin/efix - - # The device to which the fax modem is connected (e.g. ttya for - # /dev/ttya). Use a dial-out (cua) device if available. If -@@ -28,16 +28,16 @@ EFIX=efix - # /dev/modem is a link to /dev/cua1, then getty, uucp, kermit, - # pppd, dip, etc. must *all* use either /dev/modem or /dev/cua1. - --DEV=cua1 -+DEV=modem - - # Your fax number in international format, 20 characters maximum. - # Use only digits, spaces, and the "+" character. - --FROM="+1 800 555 5555" -+FROM="+0 000 000 0000" - - # Your name as it should appear on the page header. - --NAME="Put Your Name Here" -+NAME="from a Red Hat Linux system" - - # The preferred page size for creating and printing faxes. - # Allowed values are "letter", "legal", and "a4". -@@ -67,7 +67,7 @@ VIEWCMD="xloadimage stdin" # best - # The name of the Ghostscript executable including full path if - # necessary. Only required if faxing Postscript files. - --GS=gs -+GS=/usr/bin/gs - - # Dial string prefix and suffix such as T for tone dialing, P for - # pulse dialing, 9 to get an external line, commas for delays or diff --git a/patches/efax-0.9/efax-0.9-manpage.patch b/patches/efax-0.9/efax-0.9-manpage.patch deleted file mode 100644 index b747954fd..000000000 --- a/patches/efax-0.9/efax-0.9-manpage.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - efax.1 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/efax.1 -+++ b/efax.1 -@@ -791,8 +791,8 @@ locking will only work if all programs u - - efax will lock the modem device before opening it if one or more - UUCP lock file names are given with \fB-x\fP options. Most --programs place their lock files in the \fR/usr/spool/uucp\fP or --\fR/var/lock\fP directories and use the name \fRLCK..\fP\fIdev\fP -+programs place their lock files in the \fB/usr/spool/uucp\fP or -+\fB/var/lock\fP directories and use the name \fBLCK..\fP\fIdev\fP - where \fIdev\fP is the name of the device file in the /dev - directory that is to be locked. - diff --git a/patches/efax-0.9/efax-0.9-misc.patch b/patches/efax-0.9/efax-0.9-misc.patch index 7c218746c..34ae3cf85 100644 --- a/patches/efax-0.9/efax-0.9-misc.patch +++ b/patches/efax-0.9/efax-0.9-misc.patch @@ -1,3 +1,10 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: [efax] fix rd_state + +Patch taken from redhat. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + --- efax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/efax-0.9/efax-0.9-nullptr.patch b/patches/efax-0.9/efax-0.9-nullptr.patch index 67cdf852d..9820248ce 100644 --- a/patches/efax-0.9/efax-0.9-nullptr.patch +++ b/patches/efax-0.9/efax-0.9-nullptr.patch @@ -1,3 +1,10 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: [efax] add nullpointer check + +Patch taken from redhat. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + --- efax.c | 1 + efaxos.c | 4 ++-- diff --git a/patches/efax-0.9/efax-0.9-numlines.patch b/patches/efax-0.9/efax-0.9-numlines.patch index 3fdd13041..5162de46a 100644 --- a/patches/efax-0.9/efax-0.9-numlines.patch +++ b/patches/efax-0.9/efax-0.9-numlines.patch @@ -1,7 +1,14 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: [efax] fix -l option in efix + This patch fixes the '-l' option in efix 0.3 which is part of efax 0.9. Without this patch, lines on page 2 and subsequent are missing if the specified number of lines per page is lower than the default (66). -<mschwendt@yahoo.com> + +This patch was taken from redhat, probably first written by +mschwendt@yahoo.com. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- efix.c | 6 +++--- diff --git a/patches/efax-0.9/efax08a-time.patch b/patches/efax-0.9/efax08a-time.patch index ae06875a4..c35c1773d 100644 --- a/patches/efax-0.9/efax08a-time.patch +++ b/patches/efax-0.9/efax08a-time.patch @@ -1,3 +1,8 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: [efax] add missing include file + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + --- efaxio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/patches/efax-0.9/series b/patches/efax-0.9/series index 6f2ed413b..a47b12485 100644 --- a/patches/efax-0.9/series +++ b/patches/efax-0.9/series @@ -1,5 +1,3 @@ -efax-0.9-config.patch -efax-0.9-manpage.patch efax-0.9-misc.patch efax-0.9-nullptr.patch efax-0.9-numlines.patch diff --git a/patches/eggdbus-0.6/eggdbus-0.6-autotools.diff b/patches/eggdbus-0.6/eggdbus-0.6-autotools.diff index 417ad5b9d..2cc89973e 100644 --- a/patches/eggdbus-0.6/eggdbus-0.6-autotools.diff +++ b/patches/eggdbus-0.6/eggdbus-0.6-autotools.diff @@ -1,3 +1,9 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Subject: update autotoolization + +This patch updates the autotool-infrastructure for recent tools. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- Makefile.am | 2 ++ configure.ac | 15 ++++++++------- diff --git a/patches/flash-0.9.5/nc_about.c.patch b/patches/flash-0.9.5/nc_about.c.patch deleted file mode 100644 index bf867c50a..000000000 --- a/patches/flash-0.9.5/nc_about.c.patch +++ /dev/null @@ -1,1710 +0,0 @@ ---- flash-0.9.5/screens/nc_about.c.orig 2004-09-08 13:35:52.000000000 +0200 -+++ flash-0.9.5/screens/nc_about.c 2004-09-08 13:37:00.000000000 +0200 -@@ -86,857 +86,856 @@ - */ - - struct anim A[]= --{{"\ -- -- ________ ___ _____ __ __ -- / ____/ / / | / ___// / / / -- / /_ / / / /| | \\__ \\/ /_/ / -- / __/ / /___/ ___ |___/ / __ / --/_/ /_____/_/ |_/____/_/ /_/ -- --",1500},{"\ -- -- -- -- /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",40},{"\ -- -- -- -- /\\ -- / \\/\\ -- ` _ ' /`/ / \\ ----------------------------------- --",40},{"\ -- -- -- -- /\\ -- ` _ ' / \\/\\ -- - (_) - /`/ / \\ ----------------------------------- --",40},{"\ -- -- -- -- ` _ ' /\\ -- - (_) - / \\/\\ -- ' ` /`/ / \\ ----------------------------------- --",40},{"\ -- -- -- ` _ ' -- - (_) - /\\ -- ' ` / \\/\\ -- /`/ / \\ ----------------------------------- --",40},{"\ -- -- ` _ ' -- - (_) - -- ' ` /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",100},{"\ -- -- ` _ ' --) - (_) - --_) ' ` /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- --_ ` _ ' -- ) - (_) - --__) ' ` /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- --__ ` _ ' -- ) - (_) - --___) ' ` /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- --___ ` _ ' -- ) - (_) - --____) ' ` /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ___ ` _ ' --( ) - (_) - --_____) ' ` /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ___ ` _ ' --_( ) - (_) - --______) ' ` /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ___ ` _ ' --__( ) - (_) - --_______) ' ` /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ___ ` _ ' -- __( ) - (_) - --(_______) ' ` /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ___ ` _ ' -- __( ) - (_) - -- (_______) ' ` /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ___ ` _ ' -- __( )- (_) - -- (_______) ' ` /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ___ ` _ ' -- __( ) (_) - -- (_______)' ` /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ___` _ ' -- __( ) (_) - -- (_______) ` /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ___ _ ' -- __( )(_) - -- (_______) ` /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ___ _ ' -- __( )_) - -- (_______) ` /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ____ ' -- __( )) - -- (_______)` /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- `___ ' -- __( ) - -- (_______) /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ` ___ ' -- __( ) - -- (_______) /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ` ___' -- -__( )- -- (_______) /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ` ___ -- - _(( ) -- (_______) /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ` _ ___ -- - (_( ) -- (_______) /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ` _ ___ -- - (_)( ) -- '(_______) /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ` _ '___ -- - (_)_( ) -- ' (_______) /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ` _ ' ___ -- - (_)__( ) -- ' (_______) /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ` _ ' ___ -- - (_) __( ) -- ' (_______) /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ` _ ' ___ -- - (_) __( ) -- ' `(_______)/\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ` _ ' ___ -- - (_) -__( ) -- ' ` (_______/\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ` _ ' ___ -- - (_) - __( ) -- ' ` (______/\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ` _ ' ___ -- - (_) - __( ) -- ' ` (_____/\\) -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ` _ ' ___ -- - (_) - __( ) -- ' ` (____/\\_) -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ` _ ' ___ -- - (_) - __( ) -- ' ` (___/\\__) -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ` _ ' ___ -- - (_) - __( ) -- ' ` (__/\\___) -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ` _ ' ___ -- - (_) - __( ) -- ' ` (_/\\____) -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ___ -- ` _ ' __( ) -- - (_) - (_/\\____) -- ' ` / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ___ -- ` _ ' __( ) -- - (_) - (/\\_____ -- ' ` / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- ___ -- __( -- ` _ ' /\\_____ -- - (_) - / \\/\\ -- ' ` /`/ / \\ ----------------------------------- --",20},{"\ -- -- __ -- __( -- ` _ ' /\\_____ -- - (_) - / \\/\\ -- ' ` /`/ / \\ ----------------------------------- --",20},{"\ -- -- _ -- __( -- /\\(____ -- ` _ ' / \\/\\ -- - (_) - /`/ / \\ ----------------------------------- --",20},{"\ -- -- -- __( -- /\\ (___ -- ` _ ' / \\/\\ -- - (_) - /`/ / \\ ----------------------------------- --",20},{"\ -- -- -- __ -- /\\ (__ -- / \\/\\ -- ` _ ' /`/ / \\ ----------------------------------- --",20},{"\ -- -- -- _ -- /\\ (_ -- / \\/\\ -- ` _ ' /`/ / \\ ----------------------------------- --",20},{"\ -- -- -- -- /\\ ( -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- -- -- -- /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",150},{"\ -- -- -- -- /\\ -- / \\/\\ -- _ /`/ / \\ ----------------------------------- --",20},{"\ -- -- -- -- /\\ -- _ / \\/\\ -- _|_|_ /`/ / \\ ----------------------------------- --",20},{"\ -- -- -- -- _ /\\ -- _|_|_ / \\/\\ -- (o o) /`/ / \\ ----------------------------------- --",10},{"\ -- -- -- -- _ /\\ -- _|_|_ / \\/\\ -- (o o) /`/ / \\ ------ooO--(_)--Ooo---------------- --",300},{"\ -- `.________'`__| -- -- -- _ /\\ -- _|_|_ / \\/\\ -- (o o) /`/ / \\ ------ooO--(_)--Ooo---------------- --",20},{"\ -- ,' | -- `.________'`__| -- -- _ /\\ -- _|_|_ / \\/\\ -- (o o) /`/ / \\ ------ooO--(_)--Ooo---------------- --",20},{"\ -- ________,' ` -- ,' | -- `.________'`__| -- _ /\\ -- _|_|_ / \\/\\ -- (o o) /`/ / \\ ------ooO--(_)--Ooo---------------- --",20},{"\ -- | | -- ________,' ` -- ,' | -- `.________'`__| /\\ -- _|_|_ / \\/\\ -- (o o) /`/ / \\ ------ooO--(_)--Ooo---------------- --",20},{"\ -- | | -- | | -- ________,' ` -- ,' | /\\ -- `.________'`__| / \\/\\ -- (o o) /`/ / \\ ------ooO--(_)--Ooo---------------- --",20},{"\ -- | | -- | | -- | | -- ________,' ` /\\ -- ,' | / \\/\\ -- `.________'`__| /`/ / \\ ------ooO--(_)--Ooo---------------- --",20},{"\ -- | | -- | | -- | | -- | | /\\ -- ________,' ` / \\/\\ -- ,' | /`/ / \\ -----`.________'`__|--------------- --",50},{"\ -- | | -- | | -- | | -- ________,' ` /\\ -- ,' | / \\/\\ -- `.________'`__| /`/ / \\ ----------------------------------- --",20},{"\ -- | | -- | | -- ________,' ` -- ,' | /\\ -- `.________'`__| / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- | | -- ________,' ` -- ,' | -- `.________'`__| /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- ________,' ` -- ,' | -- `.________'`__| -- /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- ,' | -- `.________'`__| -- -- /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- `.________'`__| -- -- -- /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- `.________'`__| -- -- -- /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- `.________'`__| -- -- -- /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- `.________'`__| -- -- -- /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- `.________'`__| -- -- -- /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- ,' | -- `.________'`__| -- -- /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- ________,' ` -- ,' | -- `.________'`__| -- /\\ -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- | | -- ________,' ` -- ,' | -- `.________'`__| -- / \\/\\ -- /`/ / \\ ----------------------------------- --",20},{"\ -- | | -- | | -- ________,' ` -- ,' | -- `.________'`__| -- /`/ / \\ ----------------------------------- --",20},{"\ -- | | -- | | -- | | -- ________,' ` -- ,' | -- `.________'`__| ----------------------------------- --",20},{"\ -- | | -- | | -- | | -- | | -- ________,' ` -- ,' | --------------------`.________'`__| --",100},{"\ -- | | -- | | -- | | -- | | -- ________,' ` -- ` _ ' ,' | --------------------`.________'`__| --",40},{"\ -- | | -- | | -- | | -- | | -- ` _ ' ________,' ` -- - (_) - ,' | --------------------`.________'`__| --",40},{"\ -- | | -- | | -- | | -- ` _ ' | | -- - (_) - ________,' ` -- ' ` ,' | --------------------`.________'`__| --",40},{"\ -- | | -- | | -- ` _ ' | | -- - (_) - | | -- ' ` ________,' ` -- ,' | --------------------`.________'`__| --",20},{"\ -- | | -- | | -- ` _ ' | | -- - (_) - ________,' ` -- ' ` ,' | -- `.________'`__| ----------------------------------- --",20},{"\ -- | | -- ` _ ' | | -- - (_) - ________,' ` -- ' ` ,' | -- `.________'`__| -- ----------------------------------- --",20},{"\ -- | | -- ` _ ' ________,' ` -- - (_) ,' | -- ' ` `.________'`__| -- -- ----------------------------------- --",20},{"\ -- | | -- ` _ '________,' ` -- - (_),' | -- ' `.________'`__| -- -- ----------------------------------- --",20},{"\ -- ` _ ' | | -- - (_) -________,' ` -- ' `,' | -- `.________'`__| -- -- ----------------------------------- --",20},{"\ --- (_) - | | -- ' ` ________,' ` -- ,' | -- `.________'`__| -- -- ----------------------------------- --",20},{"\ --' ` ________,' ` -- ,' | -- `.________'`__| -- -- -- ----------------------------------- --",20},{"\ -- ,' | -- `.________'`__| -- -- -- -- ----------------------------------- --",20},{"\ -- `.________'`__| -- -- -- -- -- ----------------------------------- --",20},{"\ -- -- -- -- -- -- ----------------------------------- --",150},{"\ -- -- -- -- -- ----------------------------------- --",20},{"\ -- -- -- -- ----------------------------------- -- -- Written and Directed by --",20},{"\ -- -- -- ----------------------------------- -- -- Written and Directed by --",20},{"\ -- -- ----------------------------------- -- -- Written and Directed by -- -- Stephen Fegan --",20},{"\ -- ----------------------------------- -- -- Written and Directed by -- -- Stephen Fegan --",20},{"\ ----------------------------------- -- -- Written and Directed by -- -- Stephen Fegan --",20},{"\ -- -- Written and Directed by -- -- Stephen Fegan -- -- -- With --",20},{"\ -- Written and Directed by -- -- Stephen Fegan -- -- -- With --",20},{"\ -- -- Stephen Fegan -- -- -- With -- -- The EFTIWALL fonts --",20},{"\ -- Stephen Fegan -- -- -- With -- -- The EFTIWALL fonts --",20},{"\ -- -- -- With -- -- The EFTIWALL fonts -- -- by --",20},{"\ -- -- With -- -- The EFTIWALL fonts -- -- by --",20},{"\ -- With -- -- The EFTIWALL fonts -- -- by -- -- Michel Eftimakis (c) 1995 --",20},{"\ -- -- The EFTIWALL fonts -- -- by -- -- Michel Eftimakis (c) 1995 --",20},{"\ -- The EFTIWALL fonts -- -- by -- -- Michel Eftimakis (c) 1995 --",20},{"\ -- -- by -- -- Michel Eftimakis (c) 1995 --",20},{"\ -- by -- -- Michel Eftimakis (c) 1995 --",20},{"\ -- -- Michel Eftimakis (c) 1995 --",20},{"\ -- Michel Eftimakis (c) 1995 --",20},{"\ -- --",200},{"\ -- -- --Oh and eh.. --",4} --}; -+{{"\n\ -+\n\ -+ ________ ___ _____ __ __\n\ -+ / ____/ / / | / ___// / / /\n\ -+ / /_ / / / /| | \\__ \\/ /_/ / \n\ -+ / __/ / /___/ ___ |___/ / __ / \n\ -+/_/ /_____/_/ |_/____/_/ /_/ \n\ -+\n",1500}, -+{"\n\ -+\n\ -+ \n\ -+\n\ -+ /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",40}, -+{"\n\ -+\n\ -+\n\ -+ \n\ -+ /\\ \n\ -+ / \\/\\ \n\ -+ ` _ ' /`/ / \\ \n\ -+--------------------------------- \n",40}, -+{"\n\ -+\n\ -+ \n\ -+ \n\ -+ /\\ \n\ -+ ` _ ' / \\/\\ \n\ -+ - (_) - /`/ / \\ \n\ -+--------------------------------- \n",40}, -+{"\n\ -+\n\ -+\n\ -+\n\ -+ ` _ ' /\\ \n\ -+ - (_) - / \\/\\\n\ -+ ' ` /`/ / \\ \n\ -+--------------------------------- \n",40}, -+{"\n\ -+\n\ -+\n\ -+ ` _ ' \n\ -+ - (_) - /\\\n\ -+ ' ` / \\/\\\n\ -+ /`/ / \\\n\ -+--------------------------------- \n",40}, -+{"\n\ -+\n\ -+ ` _ ' \n\ -+ - (_) - \n\ -+ ' ` /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",100}, -+{"\n\ -+\n\ -+ ` _ ' \n\ -+) - (_) - \n\ -+_) ' ` /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+_ ` _ ' \n\ -+ ) - (_) - \n\ -+__) ' ` /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+__ ` _ ' \n\ -+ ) - (_) - \n\ -+___) ' ` /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+___ ` _ ' \n\ -+ ) - (_) - \n\ -+____) ' ` /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ___ ` _ ' \n\ -+( ) - (_) - \n\ -+_____) ' ` /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ___ ` _ ' \n\ -+_( ) - (_) - \n\ -+______) ' ` /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ___ ` _ ' \n\ -+__( ) - (_) - \n\ -+_______) ' ` /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ___ ` _ ' \n\ -+ __( ) - (_) - \n\ -+(_______) ' ` /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ___ ` _ ' \n\ -+ __( ) - (_) - \n\ -+ (_______) ' ` /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ___ ` _ ' \n\ -+ __( )- (_) - \n\ -+ (_______) ' ` /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ___ ` _ ' \n\ -+ __( ) (_) - \n\ -+ (_______)' ` /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ___` _ ' \n\ -+ __( ) (_) - \n\ -+ (_______) ` /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ___ _ ' \n\ -+ __( )(_) - \n\ -+ (_______) ` /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+---------------------------------\n",20}, -+{"\n\ -+\n\ -+ ___ _ ' \n\ -+ __( )_) - \n\ -+ (_______) ` /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ____ ' \n\ -+ __( )) - \n\ -+ (_______)` /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ `___ ' \n\ -+ __( ) - \n\ -+ (_______) /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ` ___ ' \n\ -+ __( ) - \n\ -+ (_______) /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ` ___' \n\ -+ -__( )- \n\ -+ (_______) /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ` ___ \n\ -+ - _(( ) \n\ -+ (_______) /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ` _ ___ \n\ -+ - (_( ) \n\ -+ (_______) /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ` _ ___ \n\ -+ - (_)( ) \n\ -+ '(_______) /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ` _ '___ \n\ -+ - (_)_( ) \n\ -+ ' (_______) /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ` _ ' ___ \n\ -+ - (_)__( ) \n\ -+ ' (_______) /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ` _ ' ___ \n\ -+ - (_) __( ) \n\ -+ ' (_______) /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ` _ ' ___ \n\ -+ - (_) __( ) \n\ -+ ' `(_______)/\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ` _ ' ___ \n\ -+ - (_) -__( )\n\ -+ ' ` (_______/\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ` _ ' ___ \n\ -+ - (_) - __( ) \n\ -+ ' ` (______/\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ` _ ' ___ \n\ -+ - (_) - __( ) \n\ -+ ' ` (_____/\\) \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ` _ ' ___ \n\ -+ - (_) - __( ) \n\ -+ ' ` (____/\\_) \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ` _ ' ___ \n\ -+ - (_) - __( ) \n\ -+ ' ` (___/\\__) \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ` _ ' ___ \n\ -+ - (_) - __( ) \n\ -+ ' ` (__/\\___) \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ` _ ' ___ \n\ -+ - (_) - __( ) \n\ -+ ' ` (_/\\____) \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ___ \n\ -+ ` _ ' __( ) \n\ -+ - (_) - (_/\\____) \n\ -+ ' ` / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ___ \n\ -+ ` _ ' __( ) \n\ -+ - (_) - (/\\_____ \n\ -+ ' ` / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ ___ \n\ -+ __( \n\ -+ ` _ ' /\\_____ \n\ -+ - (_) - / \\/\\ \n\ -+ ' ` /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ __ \n\ -+ __( \n\ -+ ` _ ' /\\_____ \n\ -+ - (_) - / \\/\\ \n\ -+ ' ` /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ _ \n\ -+ __( \n\ -+ /\\(____ \n\ -+ ` _ ' / \\/\\ \n\ -+ - (_) - /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ \n\ -+ __( \n\ -+ /\\ (___ \n\ -+ ` _ ' / \\/\\ \n\ -+ - (_) - /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ \n\ -+ __ \n\ -+ /\\ (__ \n\ -+ / \\/\\ \n\ -+ ` _ ' /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ \n\ -+\n\ -+ _ \n\ -+ /\\ (_ \n\ -+ / \\/\\ \n\ -+ ` _ ' /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ \n\ -+ \n\ -+ /\\ ( \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+\n\ -+ \n\ -+ \n\ -+ /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",150}, -+{"\n\ -+\n\ -+ \n\ -+ \n\ -+ /\\ \n\ -+ / \\/\\ \n\ -+ _ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ \n\ -+\n\ -+ \n\ -+ /\\ \n\ -+ _ / \\/\\ \n\ -+ _|_|_ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ \n\ -+\n\ -+ \n\ -+ _ /\\ \n\ -+ _|_|_ / \\/\\ \n\ -+ (o o) /`/ / \\ \n\ -+--------------------------------- \n",10}, -+{"\n\ -+ \n\ -+\n\ -+ \n\ -+ _ /\\ \n\ -+ _|_|_ / \\/\\ \n\ -+ (o o) /`/ / \\ \n\ -+----ooO--(_)--Ooo---------------- \n",300}, -+{"\n\ -+ `.________'`__| \n\ -+\n\ -+ \n\ -+ _ /\\ \n\ -+ _|_|_ / \\/\\ \n\ -+ (o o) /`/ / \\ \n\ -+----ooO--(_)--Ooo---------------- \n",20}, -+{"\n\ -+ ,' |\n\ -+ `.________'`__| \n\ -+\n\ -+ _ /\\ \n\ -+ _|_|_ / \\/\\ \n\ -+ (o o) /`/ / \\ \n\ -+----ooO--(_)--Ooo---------------- \n",20}, -+{"\n\ -+ ________,' `\n\ -+ ,' |\n\ -+ `.________'`__| \n\ -+ _ /\\ \n\ -+ _|_|_ / \\/\\ \n\ -+ (o o) /`/ / \\ \n\ -+----ooO--(_)--Ooo---------------- \n",20}, -+{"\n\ -+ | |\n\ -+ ________,' `\n\ -+ ,' |\n\ -+ `.________'`__| /\\ \n\ -+ _|_|_ / \\/\\ \n\ -+ (o o) /`/ / \\ \n\ -+----ooO--(_)--Ooo---------------- \n",20}, -+{"\n\ -+ | |\n\ -+ | | \n\ -+ ________,' `\n\ -+ ,' | /\\ \n\ -+ `.________'`__| / \\/\\ \n\ -+ (o o) /`/ / \\ \n\ -+----ooO--(_)--Ooo---------------- \n",20}, -+{"\n\ -+ | |\n\ -+ | |\n\ -+ | |\n\ -+ ________,' ` /\\ \n\ -+ ,' | / \\/\\ \n\ -+ `.________'`__| /`/ / \\ \n\ -+----ooO--(_)--Ooo---------------- \n",20}, -+{"\n\ -+ | |\n\ -+ | |\n\ -+ | |\n\ -+ | | /\\ \n\ -+ ________,' ` / \\/\\ \n\ -+ ,' | /`/ / \\ \n\ -+---`.________'`__|--------------- \n",50}, -+{"\n\ -+ | |\n\ -+ | |\n\ -+ | |\n\ -+ ________,' ` /\\ \n\ -+ ,' | / \\/\\ \n\ -+ `.________'`__| /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ | |\n\ -+ | | \n\ -+ ________,' `\n\ -+ ,' | /\\ \n\ -+ `.________'`__| / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ | |\n\ -+ ________,' `\n\ -+ ,' |\n\ -+ `.________'`__| /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ ________,' `\n\ -+ ,' |\n\ -+ `.________'`__| \n\ -+ /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ ,' |\n\ -+ `.________'`__| \n\ -+\n\ -+ /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ `.________'`__| \n\ -+\n\ -+\n\ -+ /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ `.________'`__| \n\ -+\n\ -+\n\ -+ /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ `.________'`__| \n\ -+\n\ -+\n\ -+ /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ `.________'`__| \n\ -+\n\ -+\n\ -+ /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ `.________'`__| \n\ -+\n\ -+\n\ -+ /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ ,' |\n\ -+ `.________'`__| \n\ -+\n\ -+ /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ ________,' `\n\ -+ ,' |\n\ -+ `.________'`__| \n\ -+ /\\ \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ | |\n\ -+ ________,' `\n\ -+ ,' |\n\ -+ `.________'`__| \n\ -+ / \\/\\ \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ | |\n\ -+ | |\n\ -+ ________,' `\n\ -+ ,' |\n\ -+ `.________'`__| \n\ -+ /`/ / \\ \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ | |\n\ -+ | |\n\ -+ | |\n\ -+ ________,' `\n\ -+ ,' |\n\ -+ `.________'`__| \n\ -+--------------------------------- \n",20}, -+{"\n\ -+ | |\n\ -+ | |\n\ -+ | |\n\ -+ | |\n\ -+ ________,' `\n\ -+ ,' |\n\ -+------------------`.________'`__| \n",100}, -+{"\n\ -+ | |\n\ -+ | |\n\ -+ | | \n\ -+ | |\n\ -+ ________,' `\n\ -+ ` _ ' ,' |\n\ -+------------------`.________'`__|\n",40}, -+{"\n\ -+ | |\n\ -+ | |\n\ -+ | | \n\ -+ | |\n\ -+ ` _ ' ________,' `\n\ -+ - (_) - ,' |\n\ -+------------------`.________'`__|\n",40}, -+{"\n\ -+ | |\n\ -+ | |\n\ -+ | | \n\ -+ ` _ ' | |\n\ -+ - (_) - ________,' `\n\ -+ ' ` ,' |\n\ -+------------------`.________'`__|\n",40}, -+{"\n\ -+ | |\n\ -+ | |\n\ -+ ` _ ' | | \n\ -+ - (_) - | |\n\ -+ ' ` ________,' `\n\ -+ ,' |\n\ -+------------------`.________'`__|\n",20}, -+{"\n\ -+ | |\n\ -+ | |\n\ -+ ` _ ' | |\n\ -+ - (_) - ________,' `\n\ -+ ' ` ,' |\n\ -+ `.________'`__|\n\ -+---------------------------------\n",20}, -+{"\n\ -+ | |\n\ -+ ` _ ' | |\n\ -+ - (_) - ________,' `\n\ -+ ' ` ,' |\n\ -+ `.________'`__|\n\ -+ \n\ -+---------------------------------\n",20}, -+{"\n\ -+ | |\n\ -+ ` _ ' ________,' `\n\ -+ - (_) ,' |\n\ -+ ' ` `.________'`__|\n\ -+ \n\ -+ \n\ -+---------------------------------\n",20}, -+{"\n\ -+ | |\n\ -+ ` _ '________,' `\n\ -+ - (_),' |\n\ -+ ' `.________'`__|\n\ -+ \n\ -+ \n\ -+---------------------------------\n",20}, -+{"\n\ -+ ` _ ' | |\n\ -+ - (_) -________,' `\n\ -+ ' `,' |\n\ -+ `.________'`__|\n\ -+ \n\ -+ \n\ -+---------------------------------\n",20}, -+{"\n\ -+- (_) - | |\n\ -+ ' ` ________,' `\n\ -+ ,' |\n\ -+ `.________'`__|\n\ -+ \n\ -+ \n\ -+---------------------------------\n",20}, -+{"\n\ -+' ` ________,' `\n\ -+ ,' |\n\ -+ `.________'`__|\n\ -+ \n\ -+ \n\ -+ \n\ -+---------------------------------\n",20}, -+{"\n\ -+ ,' |\n\ -+ `.________'`__|\n\ -+\n\ -+ \n\ -+ \n\ -+ \n\ -+---------------------------------\n",20}, -+{"\n\ -+ `.________'`__|\n\ -+\n\ -+\n\ -+ \n\ -+ \n\ -+ \n\ -+---------------------------------\n",20}, -+{"\n\ -+\n\ -+\n\ -+\n\ -+\n\ -+\n\ -+\n\ -+---------------------------------\n",150}, -+{"\n\ -+\n\ -+\n\ -+\n\ -+\n\ -+\n\ -+---------------------------------\n",20}, -+{"\n\ -+\n\ -+\n\ -+\n\ -+\n\ -+---------------------------------\n\ -+\n\ -+ Written and Directed by\n",20}, -+{"\n\ -+\n\ -+\n\ -+\n\ -+---------------------------------\n\ -+\n\ -+ Written and Directed by\n",20}, -+{"\n\ -+\n\ -+\n\ -+---------------------------------\n\ -+\n\ -+ Written and Directed by\n\ -+\n\ -+ Stephen Fegan\n",20}, -+{"\n\ -+\n\ -+---------------------------------\n\ -+\n\ -+ Written and Directed by\n\ -+\n\ -+ Stephen Fegan\n",20}, -+{"\n\ -+---------------------------------\n\ -+\n\ -+ Written and Directed by\n\ -+\n\ -+ Stephen Fegan\n",20}, -+{"\n\ -+\n\ -+ Written and Directed by\n\ -+\n\ -+ Stephen Fegan\n\ -+\n\ -+\n\ -+ With\n",20}, -+{"\n\ -+ Written and Directed by\n\ -+\n\ -+ Stephen Fegan\n\ -+\n\ -+\n\ -+ With\n",20}, -+{"\n\ -+\n\ -+ Stephen Fegan\n\ -+\n\ -+\n\ -+ With\n\ -+\n\ -+ The EFTIWALL fonts\n",20}, -+{"\n\ -+ Stephen Fegan\n\ -+\n\ -+\n\ -+ With\n\ -+\n\ -+ The EFTIWALL fonts\n",20}, -+{"\n\ -+\n\ -+\n\ -+ With\n\ -+\n\ -+ The EFTIWALL fonts\n\ -+\n\ -+ by\n",20}, -+{"\n\ -+\n\ -+ With\n\ -+\n\ -+ The EFTIWALL fonts\n\ -+\n\ -+ by\n",20}, -+{"\n\ -+ With\n\ -+\n\ -+ The EFTIWALL fonts\n\ -+\n\ -+ by\n\ -+\n\ -+ Michel Eftimakis (c) 1995\n",20}, -+{"\n\ -+\n\ -+ The EFTIWALL fonts\n\ -+\n\ -+ by\n\ -+\n\ -+ Michel Eftimakis (c) 1995\n",20}, -+{"\n\ -+ The EFTIWALL fonts\n\ -+\n\ -+ by\n\ -+\n\ -+ Michel Eftimakis (c) 1995\n",20}, -+{"\n\ -+\n\ -+ by\n\ -+\n\ -+ Michel Eftimakis (c) 1995\n",20}, -+{"\n\ -+ by\n\ -+\n\ -+ Michel Eftimakis (c) 1995\n",20}, -+{"\n\ -+\n\ -+ Michel Eftimakis (c) 1995\n",20}, -+{"\n\ -+ Michel Eftimakis (c) 1995\n",20}, -+{"\n\ -+\n",200}, -+{"\n\ -+\n\ -+\n\ -+Oh and eh..\n",4} -+ }; - - - void nc_about(void) diff --git a/patches/fltk-1.1.6/fltk-1.1.6-fix-linkerpaths.diff b/patches/fltk-1.1.6/fltk-1.1.6-fix-linkerpaths.diff index 39a1ebcb0..c21a1662d 100644 --- a/patches/fltk-1.1.6/fltk-1.1.6-fix-linkerpaths.diff +++ b/patches/fltk-1.1.6/fltk-1.1.6-fix-linkerpaths.diff @@ -1,3 +1,9 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: [fltk] add library search path + +Add library search path. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- configure | 2 +- configure.in | 2 +- diff --git a/patches/gdb-6.8/Makefile_in_cppflags.diff b/patches/gdb-6.8/Makefile_in_cppflags.diff index f9b567415..f9fcc4b8f 100644 --- a/patches/gdb-6.8/Makefile_in_cppflags.diff +++ b/patches/gdb-6.8/Makefile_in_cppflags.diff @@ -1,34 +1,24 @@ -# -# Submitted-By: Marc Kleine-Budde, 2006-03-20 -# Committed-By: Marc Kleine-Budde -# -# Error: -# -# checking for arm-softfloat-linux-gnu-dlltool... arm-softfloat-linux-gnu-dlltool -# checking for arm-softfloat-linux-gnu-windres... arm-softfloat-linux-gnu-windres -# checking for arm-softfloat-linux-gnu-mig... no -# checking for mig... no -# checking for main in -lm... yes -# checking for wctype... yes -# checking for library containing gethostbyname... none required -# checking for library containing socketpair... none required -# checking for library containing waddstr... no -# checking for library containing tgetent... no -# configure: error: no termcap library found -# make[2]: *** [configure-gdb] Error 1 -# -# Description: -# -# gdb forgets the {LD,CPP}FLAGS_FOR_TARGET -# -# State: -# -# unknown -# +From: Marc Kleine-Budde <m.kleine-budde@pengutronix.de> +Subject: gdb forgets the {LD,CPP}FLAGS_FOR_TARGET + +checking for arm-softfloat-linux-gnu-dlltool... arm-softfloat-linux-gnu-dlltool +checking for arm-softfloat-linux-gnu-windres... arm-softfloat-linux-gnu-windres +checking for arm-softfloat-linux-gnu-mig... no +checking for mig... no +checking for main in -lm... yes +checking for wctype... yes +checking for library containing gethostbyname... none required +checking for library containing socketpair... none required +checking for library containing waddstr... no +checking for library containing tgetent... no +configure: error: no termcap library found +make[2]: *** [configure-gdb] Error 1 + +Signed-off-by: Marc Kleine-Budde <m.kleine-budde@pengutronix.de> --- -# Makefile.in | 2 ++ -# 1 file changed, 2 insertions(+) -# + Makefile.in | 2 ++ + 1 file changed, 2 insertions(+) + Index: Makefile.in =================================================================== --- Makefile.in.orig 2008-03-27 19:23:26.000000000 +0100 diff --git a/patches/grub-0.97/grub-0.97-gcc4x.diff b/patches/grub-0.97/grub-0.97-gcc4x.diff index 2be385ae9..b2509b141 100644 --- a/patches/grub-0.97/grub-0.97-gcc4x.diff +++ b/patches/grub-0.97/grub-0.97-gcc4x.diff @@ -1,21 +1,11 @@ -# -# Submitted-By: Benedikt Spranger, 2005-09-26 -# Committed-By: Robert Schwebel -# -# Error: -# -# -# -# Description: -# -# GCC 4.x declares non-static declaration and static definition and vice -# versa as error. -# -# State: -# -# unknown -# +Subject: fix static declaration +From: Benedikt Spranger <b.spranger@pengutronix.de> +GCC 4.x declares non-static declaration and static definition and vice +versa as error. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> +--- diff -ruN grub-0.97.orig/netboot/main.c grub-0.97/netboot/main.c --- grub-0.97.orig/netboot/main.c 2004-05-21 00:19:33.000000000 +0200 +++ grub-0.97/netboot/main.c 2005-09-15 17:33:34.383904479 +0200 diff --git a/patches/grub-0.97/grub-set-install_partition_hd0_0.diff b/patches/grub-0.97/grub-set-install_partition_hd0_0.diff index 763582885..acadba367 100644 --- a/patches/grub-0.97/grub-set-install_partition_hd0_0.diff +++ b/patches/grub-0.97/grub-set-install_partition_hd0_0.diff @@ -1,14 +1,12 @@ -# -# Submitted-By: Sascha Hauer, 2006-11-22 -# Committed-By: Sascha Hauer <s.hauer@pengutronix.de> -# -# Description: -# -# Let grub find the default partition the rootfs is installed -# on. There must be a better (proper) way to archieve this, -# but I don't know any. -# +From: Sascha Hauer <s.hauer@pengutronix.de> +Subject: Add hack for default partition +Let grub find the default partition the rootfs is installed +on. There must be a better (proper) way to archieve this, +but I don't know any. + +Signed-off-by: (not for upstream) +--- Index: grub-0.97/stage2/asm.S =================================================================== --- grub-0.97.orig/stage2/asm.S diff --git a/patches/gst-plugins-base-0.10.25/add-RGB666-Support-to-ffmpegcolorspace.patch b/patches/gst-plugins-base-0.10.25/add-RGB666-Support-to-ffmpegcolorspace.patch index 64b42a45a..b8e2b4738 100644 --- a/patches/gst-plugins-base-0.10.25/add-RGB666-Support-to-ffmpegcolorspace.patch +++ b/patches/gst-plugins-base-0.10.25/add-RGB666-Support-to-ffmpegcolorspace.patch @@ -4,8 +4,8 @@ Subject: [PATCH] added RGB666 Support to ffmpegcolorspace This one adds RGB666 Support to ffmpegcolorspace Still very hacky, need to be enhanced before submitting to mainline - -Signe-off-by: Luotao Fu <l.fu@pengutronix.de> + +Signed-off-by: Luotao Fu <l.fu@pengutronix.de> --- gst/ffmpegcolorspace/avcodec.h | 1 gst/ffmpegcolorspace/gstffmpegcodecmap.c | 26 ++++++++++- diff --git a/patches/ifplugd-0.28/ifplugd-fix-include.diff b/patches/ifplugd-0.28/ifplugd-fix-include.diff index 93261ed6c..4e305ee77 100644 --- a/patches/ifplugd-0.28/ifplugd-fix-include.diff +++ b/patches/ifplugd-0.28/ifplugd-fix-include.diff @@ -1,22 +1,14 @@ -# -# Submitted-By: Ladislav Michl, 2007-12-7 -# Committed-By: Ladislav Michl -# -# Error: -# -# In file included from interface.c:27: -# /opt/crosstool/gcc-4.1.1-glibc-2.4/arm-unknown-linux-gnu/lib/gcc/arm-unknown-linux-gnu/4.1.1/../../../../arm-unknown-linux-gnu/sys-include/sys/types.h:62: error: conflicting types for 'dev_t' -# ... etc -# -# Description: -# -# Compilation fails because of kernel header inclusion. -# -# State: -# -# fixed, Linux distributions use similar fix, upstream state unknown. -# +From: Ladislav Michl <ladis@linux-mips.org> +Subject: Compilation fails because of kernel header inclusion +Fixes the following error: + +In file included from interface.c:27: +/opt/crosstool/gcc-4.1.1-glibc-2.4/arm-unknown-linux-gnu/lib/gcc/arm-unknown-linux-gnu/4.1.1/../../../../arm-unknown-linux-gnu/sys-include/sys/types.h:62: error: conflicting types for 'dev_t' +... etc + +Signed-off-by: Ladislav Michl <ladis@linux-mips.org> +--- --- ifplugd-0.28/src/interface.c 2005-01-05 01:25:31.000000000 +0100 +++ ifplugd-0.28/src/interface.c 2007-07-15 21:04:54.000000000 +0200 @@ -23,11 +23,9 @@ diff --git a/patches/inadyn-1.96.2/inadyn_patch.diff b/patches/inadyn-1.96.2/inadyn_patch.diff index 8352cf405..c6d3ef10a 100644 --- a/patches/inadyn-1.96.2/inadyn_patch.diff +++ b/patches/inadyn-1.96.2/inadyn_patch.diff @@ -3,6 +3,7 @@ configuration file. Patch made by Christian Eyrich, http://www.eyrich-net.org/programmiertes.html +Signed-off-by: (no sign yet, ask upstream) --- man/inadyn.8 | 5 src/dyndns.c | 325 ++++++++++++++++++++++++++++++++---------------------- diff --git a/patches/iozone3_327/0003-remove-old-makefile.patch b/patches/iozone3_327/0003-remove-old-makefile.patch index 4d8404743..2b11a51fe 100644 --- a/patches/iozone3_327/0003-remove-old-makefile.patch +++ b/patches/iozone3_327/0003-remove-old-makefile.patch @@ -1,3 +1,10 @@ +From: Luotao Fu <l.fu@pengutronix.de> +Subject: remove old makefiles + +This one removes the old hand made makefiles, after autotool support has +been added. + +Signed-off-by: Luotao Fu <l.fu@pengutronix.de> --- src/current/makefile | 1285 --------------------------------------------------- 1 file changed, 1285 deletions(-) diff --git a/patches/iproute2-2.6.31/0003-remove-duplicate-limits.h.patch b/patches/iproute2-2.6.31/0001-remove-duplicate-limits.h.patch index 5fa534a07..b98620360 100644 --- a/patches/iproute2-2.6.31/0003-remove-duplicate-limits.h.patch +++ b/patches/iproute2-2.6.31/0001-remove-duplicate-limits.h.patch @@ -1,8 +1,15 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: [iproute2] remove duplicate header file + +This patch is already in upstream: + From 52d6a850505d70a699fc89604986c45b0cd0c54e Mon Sep 17 00:00:00 2001 From: Stephen Hemminger <stephen.hemminger@vyatta.com> Date: Fri, 27 Mar 2009 11:07:46 -0700 Subject: [PATCH 03/23] remove duplicate limits.h +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + --- tc/m_xt.c | 1 - 1 file changed, 1 deletion(-) diff --git a/patches/iproute2-2.6.31/remove_arpd.diff b/patches/iproute2-2.6.31/0002-remove_arpd.diff index 19cb240b9..ce791d942 100644 --- a/patches/iproute2-2.6.31/remove_arpd.diff +++ b/patches/iproute2-2.6.31/0002-remove_arpd.diff @@ -1,14 +1,18 @@ -Subject: Make the buildsystem be gracious to us. +Subject: [iproute2] build system fixes +From: Juergen Beisert <juergen@kreuzholzen.de> -Signed-off-by: Juergen Beisert juergen@kreuzholzen.de -[refreshed for iproute2-2.6.31] -Signed-off-by: Jon Ringle <jon@ringle.org> +Build arpd only if the user has requested it. +Add a mechanism to feed in CPPFLAGS for cross builds. +Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de> +Signed-off-by: Jon Ringle <jon@ringle.org> --- Makefile | 2 +- misc/Makefile | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) +Jon Ringle: refreshed for iproute2-2.6.31 + --- iproute2-2.6.31.orig/misc/Makefile 2009-12-26 13:26:44.000000000 -0500 +++ iproute2-2.6.31/misc/Makefile 2009-11-08 23:48:39.000000000 -0500 @@ -1,10 +1,14 @@ diff --git a/patches/iproute2-2.6.31/series b/patches/iproute2-2.6.31/series index b9140d116..94ffa3a22 100644 --- a/patches/iproute2-2.6.31/series +++ b/patches/iproute2-2.6.31/series @@ -1,2 +1,2 @@ -0003-remove-duplicate-limits.h.patch -remove_arpd.diff +0001-remove-duplicate-limits.h.patch +0002-remove_arpd.diff diff --git a/patches/libdbus-c++-r9139/autogen.sh b/patches/libdbus-c++-r9139/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/libdbus-c++-r9139/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/libdbus-c++-r9139/libdbus-c++-r9139_autogen_files.diff b/patches/libdbus-c++-r9139/libdbus-c++-r9139_autogen_files.diff deleted file mode 100644 index 8e952c68a..000000000 --- a/patches/libdbus-c++-r9139/libdbus-c++-r9139_autogen_files.diff +++ /dev/null @@ -1,147 +0,0 @@ -diff -ur libdbus-c++-r9139-orig/aclocal.m4 libdbus-c++-r9139-autogen/aclocal.m4 ---- libdbus-c++-r9139-orig/aclocal.m4 2007-01-06 16:32:13.000000000 +0100 -+++ libdbus-c++-r9139-autogen/aclocal.m4 2007-01-06 17:02:17.000000000 +0100 -@@ -6867,18 +6867,6 @@ - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) - ]) - --# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 8 -- --# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. --AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -- - # Do all the work for Automake. -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Only in libdbus-c++-r9139-autogen: autom4te.cache -diff -ur libdbus-c++-r9139-orig/examples/echo/Makefile.in libdbus-c++-r9139-autogen/examples/echo/Makefile.in ---- libdbus-c++-r9139-orig/examples/echo/Makefile.in 2007-01-06 16:32:15.000000000 +0100 -+++ libdbus-c++-r9139-autogen/examples/echo/Makefile.in 2007-01-06 17:02:20.000000000 +0100 -@@ -48,7 +48,9 @@ - CONFIG_CLEAN_FILES = - PROGRAMS = $(noinst_PROGRAMS) - am_echo_server_OBJECTS = echo-server.$(OBJEXT) --echo_server_OBJECTS = $(am_echo_server_OBJECTS) -+nodist_echo_server_OBJECTS = -+echo_server_OBJECTS = $(am_echo_server_OBJECTS) \ -+ $(nodist_echo_server_OBJECTS) - echo_server_DEPENDENCIES = $(top_builddir)/src/libdbus-c++-1.la - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include/dbus-c++ - depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -69,7 +71,7 @@ - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(echo_server_SOURCES) -+SOURCES = $(echo_server_SOURCES) $(nodist_echo_server_SOURCES) - DIST_SOURCES = $(echo_server_SOURCES) - ETAGS = etags - CTAGS = ctags -@@ -189,7 +191,8 @@ - xml_LIBS = @xml_LIBS@ - EXTRA_DIST = README echo-introspect.xml - AM_CPPFLAGS = -I$(top_srcdir)/include --echo_server_SOURCES = echo-glue.h echo-server.h echo-server.cpp -+echo_server_SOURCES = echo-server.h echo-server.cpp -+nodist_echo_server_SOURCES = echo-glue.h - echo_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la - BUILT_SOURCES = echo-glue.h - CLEANFILES = $(BUILT_SOURCES) -@@ -355,9 +358,6 @@ - || exit 1; \ - fi; \ - done -- $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" distdir="$(distdir)" \ -- dist-hook - check-am: all-am - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am -@@ -443,7 +443,7 @@ - uninstall-am: uninstall-info-am - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-noinstPROGRAMS ctags dist-hook distclean \ -+ clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ -@@ -457,9 +457,6 @@ - - echo-glue.h: echo-introspect.xml - $(top_builddir)/tools/dbusxx-xml2cpp $^ --adaptor=$@ -- --dist-hook: -- cd $(distdir); rm -f $(BUILT_SOURCES) - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -diff -ur libdbus-c++-r9139-orig/examples/properties/Makefile.in libdbus-c++-r9139-autogen/examples/properties/Makefile.in ---- libdbus-c++-r9139-orig/examples/properties/Makefile.in 2007-01-06 16:32:15.000000000 +0100 -+++ libdbus-c++-r9139-autogen/examples/properties/Makefile.in 2007-01-06 17:02:20.000000000 +0100 -@@ -48,7 +48,9 @@ - CONFIG_CLEAN_FILES = - PROGRAMS = $(noinst_PROGRAMS) - am_props_server_OBJECTS = props-server.$(OBJEXT) --props_server_OBJECTS = $(am_props_server_OBJECTS) -+nodist_props_server_OBJECTS = -+props_server_OBJECTS = $(am_props_server_OBJECTS) \ -+ $(nodist_props_server_OBJECTS) - props_server_DEPENDENCIES = $(top_builddir)/src/libdbus-c++-1.la - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include/dbus-c++ - depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -69,7 +71,7 @@ - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(props_server_SOURCES) -+SOURCES = $(props_server_SOURCES) $(nodist_props_server_SOURCES) - DIST_SOURCES = $(props_server_SOURCES) - ETAGS = etags - CTAGS = ctags -@@ -189,7 +191,8 @@ - xml_LIBS = @xml_LIBS@ - EXTRA_DIST = README props-introspect.xml - AM_CPPFLAGS = -I$(top_srcdir)/include --props_server_SOURCES = props-glue.h props-server.h props-server.cpp -+props_server_SOURCES = props-server.h props-server.cpp -+nodist_props_server_SOURCES = props-glue.h - props_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la - BUILT_SOURCES = props-glue.h - CLEANFILES = $(BUILT_SOURCES) -@@ -355,9 +358,6 @@ - || exit 1; \ - fi; \ - done -- $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" distdir="$(distdir)" \ -- dist-hook - check-am: all-am - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am -@@ -443,7 +443,7 @@ - uninstall-am: uninstall-info-am - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-noinstPROGRAMS ctags dist-hook distclean \ -+ clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ -@@ -457,9 +457,6 @@ - - props-glue.h: props-introspect.xml - $(top_builddir)/tools/dbusxx-xml2cpp $^ --adaptor=$@ -- --dist-hook: -- cd $(distdir); rm -f $(BUILT_SOURCES) - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/patches/libdbus-c++-r9139/libdbus-c++-r9139_autogen_headerfiles.diff b/patches/libdbus-c++-r9139/libdbus-c++-r9139_autogen_headerfiles.diff index 8566546c5..197471f42 100644 --- a/patches/libdbus-c++-r9139/libdbus-c++-r9139_autogen_headerfiles.diff +++ b/patches/libdbus-c++-r9139/libdbus-c++-r9139_autogen_headerfiles.diff @@ -1,3 +1,5 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: build system fix This patch handles the fact that generated header files shouldn't be distributed in a better way than before. It is now possible to run "make diff --git a/patches/libdbus-c++-r9139/libdbus-c++-r9139_config_h.diff b/patches/libdbus-c++-r9139/libdbus-c++-r9139_config_h.diff index 603fdaa50..323d51240 100644 --- a/patches/libdbus-c++-r9139/libdbus-c++-r9139_config_h.diff +++ b/patches/libdbus-c++-r9139/libdbus-c++-r9139_config_h.diff @@ -1,3 +1,11 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: Fix CONFIG_HEADERS + +Fix a typo. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> +--- + Index: configure.ac =================================================================== --- configure.ac.orig diff --git a/patches/liblbxutil-1.0.1/liblbxutil-1.0.1-fix-cross-compile.diff b/patches/liblbxutil-1.0.1/liblbxutil-1.0.1-fix-cross-compile.diff index dd87a82ba..a182d5b21 100644 --- a/patches/liblbxutil-1.0.1/liblbxutil-1.0.1-fix-cross-compile.diff +++ b/patches/liblbxutil-1.0.1/liblbxutil-1.0.1-fix-cross-compile.diff @@ -1,32 +1,25 @@ -# -# Submitted-By: Marc Kleine-Budde, 2006-01-19 -# Committed-By: Marc Kleine-Budde -# -# Error: -# -# crosscompiling sux, x86 doesn't like it, when arm binaries are executed: -# -# /bin/sh ../libtool --mode=link arm-softfloat-linux-gnu-gcc -O -# -L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/lib -# -L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/usr/lib -# -o mkg3states mkg3states.o arm-softfloat-linux-gnu-gcc -O -o -# mkg3states mkg3states.o -# -L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/lib -# -L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/usr/lib -# rm -f g3states.h ./mkg3states -c > g3states.h_ && mv g3states.h_ -# g3states.h /bin/sh: ./mkg3states: cannot execute binary file -# make[3]: *** [g3states.h] Error 126 -# -# -# Description: -# -# build mkg3states for build not for host, using BSP hack, but works -# rediffed for Xorg7.1 by Luotao Fu, 2006-06-19 -# -# State: -# -# submitted upstream -# +From: Marc Kleine-Budde <m.kleine-budde@pengutronix.de> +Subject: build mkg3states for build not for host + +crosscompiling sux, x86 doesn't like it, when arm binaries are executed: + +/bin/sh ../libtool --mode=link arm-softfloat-linux-gnu-gcc -O +-L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/lib +-L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/usr/lib +-o mkg3states mkg3states.o arm-softfloat-linux-gnu-gcc -O -o +mkg3states mkg3states.o +-L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/lib +-L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/usr/lib +rm -f g3states.h ./mkg3states -c > g3states.h_ && mv g3states.h_ +g3states.h /bin/sh: ./mkg3states: cannot execute binary file +make[3]: *** [g3states.h] Error 126 + +Signed-off-by: Marc Kleine-Budde <m.kleine-budde@pengutronix.de> +--- + +# 20060619 lfu: rediffed for Xorg7.1 +# 20060119 mkl: submitted upstream + Index: liblbxutil-1.0.1/configure.ac =================================================================== --- liblbxutil-1.0.1.orig/configure.ac 2007-10-18 09:39:19.000000000 +0200 diff --git a/patches/libmad-0.15.1b/amd64-64bit.diff b/patches/libmad-0.15.1b/amd64-64bit.diff index da37d8590..5cfef0303 100644 --- a/patches/libmad-0.15.1b/amd64-64bit.diff +++ b/patches/libmad-0.15.1b/amd64-64bit.diff @@ -1,4 +1,9 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: add upstream patch + From: http://ftp.de.debian.org/debian/pool/main/libm/libmad/libmad_0.15.1b-3.diff.gz + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/patches/libmad-0.15.1b/optimize.diff b/patches/libmad-0.15.1b/optimize.diff index ad5b9e376..b0f177859 100644 --- a/patches/libmad-0.15.1b/optimize.diff +++ b/patches/libmad-0.15.1b/optimize.diff @@ -1,4 +1,9 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: add upstream patch + From: http://ftp.de.debian.org/debian/pool/main/libm/libmad/libmad_0.15.1b-3.diff.gz + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- configure.ac | 66 ----------------------------------------------------------- 1 file changed, 1 insertion(+), 65 deletions(-) diff --git a/patches/lmbench-3.0-a9/lmbench-3.0-a9-autotoolize.diff b/patches/lmbench-3.0-a9/lmbench-3.0-a9-autotoolize.diff index 5aded9c93..b41b77b91 100644 --- a/patches/lmbench-3.0-a9/lmbench-3.0-a9-autotoolize.diff +++ b/patches/lmbench-3.0-a9/lmbench-3.0-a9-autotoolize.diff @@ -1,3 +1,8 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: Add autotool based build system + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + --- Makefile.am | 3 + autogen.sh | 22 ++++++++++++ diff --git a/patches/lmbench-3.0-a9/lmbench-3.0-a9-remove-old-buildsystem.diff b/patches/lmbench-3.0-a9/lmbench-3.0-a9-remove-old-buildsystem.diff index 7788dfb86..21c1ed39d 100644 --- a/patches/lmbench-3.0-a9/lmbench-3.0-a9-remove-old-buildsystem.diff +++ b/patches/lmbench-3.0-a9/lmbench-3.0-a9-remove-old-buildsystem.diff @@ -1,3 +1,10 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: Add autotool based build system + +In order to provide an autotool based build system, remove the old one. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + --- Makefile | 74 -------- results/Makefile | 333 ------------------------------------- diff --git a/patches/lmbench-3.0-a9/lmbench-3.0-a9-rpcheaders.diff b/patches/lmbench-3.0-a9/lmbench-3.0-a9-rpcheaders.diff index 677a0ebfa..07ef7b144 100644 --- a/patches/lmbench-3.0-a9/lmbench-3.0-a9-rpcheaders.diff +++ b/patches/lmbench-3.0-a9/lmbench-3.0-a9-rpcheaders.diff @@ -1,3 +1,11 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: minor cleanups + +Add missing header file, add a cast to silence compiler. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> +--- + --- lmbench-3.0-a9-orig/src/lib_tcp.c 2006-06-27 18:27:19.000000000 +0200 +++ lmbench-3.0-a9/src/lib_tcp.c 2009-04-09 17:56:50.000000000 +0200 @@ -7,6 +7,7 @@ diff --git a/patches/mad-0.14.2b/configure.patch b/patches/mad-0.14.2b/configure.patch index d312600d6..0597155c3 100644 --- a/patches/mad-0.14.2b/configure.patch +++ b/patches/mad-0.14.2b/configure.patch @@ -1,3 +1,12 @@ +From: Juergen Beisert <j.beisert@pengutronixde> +Subject: [libmad] remove special handling for architectures + +The configure script adds certain -march flags for different +architectures, which contain a-priori implications which might not be +true for several systems. + +Signed-off-by: Juergen Beisert <j.beisert@pengutronixde> +--- --- configure.orig 2006-12-21 18:53:25.000000000 +0100 +++ configure 2006-12-21 18:53:50.000000000 +0100 @@ -1857,10 +1857,9 @@ diff --git a/patches/mad-0.14.2b/libmad_configure.patch b/patches/mad-0.14.2b/libmad_configure.patch index 25fe388c9..bd5d586ff 100644 --- a/patches/mad-0.14.2b/libmad_configure.patch +++ b/patches/mad-0.14.2b/libmad_configure.patch @@ -1,3 +1,13 @@ +From: Juergen Beisert <j.beisert@pengutronixde> +Subject: [libmad] remove special handling for architectures + +The configure script adds certain -march flags for different +architectures, which contain a-priori implications which might not be +true for several systems. + +Signed-off-by: Juergen Beisert <j.beisert@pengutronixde> +--- + --- libmad/configure.orig 2006-12-21 18:55:55.000000000 +0100 +++ libmad/configure 2006-12-21 18:56:11.000000000 +0100 @@ -1656,10 +1656,9 @@ diff --git a/patches/mknbi-1.4.4/mknbi-1.4.4-gcc4fix.diff b/patches/mknbi-1.4.4/mknbi-1.4.4-gcc4fix.diff index 3fcbfb86e..58c053c51 100644 --- a/patches/mknbi-1.4.4/mknbi-1.4.4-gcc4fix.diff +++ b/patches/mknbi-1.4.4/mknbi-1.4.4-gcc4fix.diff @@ -1,19 +1,11 @@ -# -# Submitted-By: -# Committed-By: Bjørn Bürger, 2006-01-03 -# -# Error: -# -# not gcc4 save, -mcpu is deprecated -# -# Description: -# -# -march may be used alternatively -# -# State: -# -# <upstream state of this problem> -# +From: Bjoern Buerger <b.buerger@pengutronix.de> +Subject: Fix makefiles to be gcc-compliant + +The code is not gcc4 save, -mcpu is deprecated (-march may be used +alternatively). + +Signed-off-by: Bjoern Buerger <b.buerger@pengutronix.de> +--- diff -urN mknbi-1.4.4.orig/Makefile mknbi-1.4.4/Makefile --- mknbi-1.4.4.orig/Makefile 2006-01-03 13:58:14.000000000 +0100 diff --git a/patches/mknbi-1.4.4/series b/patches/mknbi-1.4.4/series new file mode 100644 index 000000000..57bb59fac --- /dev/null +++ b/patches/mknbi-1.4.4/series @@ -0,0 +1,2 @@ +mknbi-1.4.4-gcc4fix.diff +mknbi-1.4.4-libfix.diff diff --git a/patches/mod_python-3.3.1/configure.in-apache-version.diff b/patches/mod_python-3.3.1/configure.in-apache-version.diff index 3fe95f1e4..d397a6bf4 100644 --- a/patches/mod_python-3.3.1/configure.in-apache-version.diff +++ b/patches/mod_python-3.3.1/configure.in-apache-version.diff @@ -1,3 +1,10 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: remove runtime test for cross compiling + +When cross compiling, we assume that the user has made sure that +reasonably new versions are provided. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- configure.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/patches/mysql-5.1.14-beta/mysql-5.0.26_comp_err_gen_lex_hash.diff b/patches/mysql-5.1.14-beta/mysql-5.0.26_comp_err_gen_lex_hash.diff index c58d25716..cede35020 100644 --- a/patches/mysql-5.1.14-beta/mysql-5.0.26_comp_err_gen_lex_hash.diff +++ b/patches/mysql-5.1.14-beta/mysql-5.0.26_comp_err_gen_lex_hash.diff @@ -1,3 +1,9 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: add cross support + +Signed-off-by: (not finished yet) +--- + Index: extra/Makefile.am =================================================================== --- extra/Makefile.am.orig diff --git a/patches/mysql-5.1.14-beta/mysql-5.0.26_factorial.diff b/patches/mysql-5.1.14-beta/mysql-5.0.26_factorial.diff index 7c90fde0b..24ae750fc 100644 --- a/patches/mysql-5.1.14-beta/mysql-5.0.26_factorial.diff +++ b/patches/mysql-5.1.14-beta/mysql-5.0.26_factorial.diff @@ -1,3 +1,12 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: use "build" side factorial tool + +When cross compiling, the "factorial" tool has to be compiled for the +"build" machine. We provide the proper path here. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> +--- + Index: dbug/Makefile.am =================================================================== --- dbug/Makefile.am.orig diff --git a/patches/mysql-5.1.14-beta/mysql-5.1.14-beta-query_cache.diff b/patches/mysql-5.1.14-beta/mysql-5.1.14-beta-query_cache.diff index 0dcb3612d..dc3c501e2 100644 --- a/patches/mysql-5.1.14-beta/mysql-5.1.14-beta-query_cache.diff +++ b/patches/mysql-5.1.14-beta/mysql-5.1.14-beta-query_cache.diff @@ -1,3 +1,7 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: Add upstream patch + +---------8<---------- From: 'Hartmut Holzgraefe'Date: December 14 2006 6:07pm Subject: bk commit into 5.1 tree (hartmut:1.2359) BUG#25075 @@ -20,6 +24,10 @@ ChangeSet@stripped, 2006-12-14 18:06:48+01:00, hartmut@stripped +1 -0 # User: hartmut # Host: linux.site # Root: /home/hartmut/projects/mysql/dev/5.1 +---------8<---------- + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> +--- --- 1.304/sql/sql_class.cc 2006-12-14 18:07:00 +01:00 +++ 1.305/sql/sql_class.cc 2006-12-14 18:07:00 +01:00 diff --git a/patches/nickel-1.1.0/nickel-1.1.0-linkerflags.diff b/patches/nickel-1.1.0/nickel-1.1.0-linkerflags.diff index 3f266de99..c093bedc6 100644 --- a/patches/nickel-1.1.0/nickel-1.1.0-linkerflags.diff +++ b/patches/nickel-1.1.0/nickel-1.1.0-linkerflags.diff @@ -1,3 +1,9 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: [nickel] remove handmade soname + +Don't use handmade soname. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/owfs-2.7p26/owfs-2.7p7-disable-offtpd.diff b/patches/owfs-2.7p26/owfs-2.7p7-disable-offtpd.diff index 12e92d14d..e362528a4 100644 --- a/patches/owfs-2.7p26/owfs-2.7p7-disable-offtpd.diff +++ b/patches/owfs-2.7p26/owfs-2.7p7-disable-offtpd.diff @@ -1,8 +1,17 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: cleanup configure output + +The configure script currently outputs this: + checking if owftpd is enabled... configure: error: no make: *** [/ptx/work/minime/rsc/svn/OSELAS.BSP-phyCORE-trunk/platform-phyCORE-i.MX27/state/owfs.prepare] Error 1 +Fixup for proper linebreaks. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/owfs-2.7p26/owfs-2.7p7-pkgconfigize-fuse.diff b/patches/owfs-2.7p26/owfs-2.7p7-pkgconfigize-fuse.diff index d82b55f99..8c3334695 100644 --- a/patches/owfs-2.7p26/owfs-2.7p7-pkgconfigize-fuse.diff +++ b/patches/owfs-2.7p26/owfs-2.7p7-pkgconfigize-fuse.diff @@ -1,3 +1,10 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: determine fuse with pkg-config + +Add pkg-config support to find fuse libs. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + --- configure.ac | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/patches/portmap_6.0/portmap_6.0-fix-disable-tcpwrapper.diff b/patches/portmap_6.0/portmap_6.0-fix-disable-tcpwrapper.diff index 9c5b4c4b1..d2aa99674 100644 --- a/patches/portmap_6.0/portmap_6.0-fix-disable-tcpwrapper.diff +++ b/patches/portmap_6.0/portmap_6.0-fix-disable-tcpwrapper.diff @@ -1,3 +1,7 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: Include tcpd.h only if HOST_ACCESS is selected + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> --- pmap_check.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches/proftpd-1.3.2c/proftpd-1.3.0rc1-ptx.diff b/patches/proftpd-1.3.2c/proftpd-1.3.0rc1-ptx.diff index 3f86ea578..9244f3827 100644 --- a/patches/proftpd-1.3.2c/proftpd-1.3.0rc1-ptx.diff +++ b/patches/proftpd-1.3.2c/proftpd-1.3.0rc1-ptx.diff @@ -1,10 +1,10 @@ From: Robert Schwebel <rsc@pengutronix.de> Subject: Makefile is trying to compile host tool with cross compiler -[mkl: added standard patch header, quilt refresh'ed] -Singed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- +# mkl: added standard patch header, quilt refresh'ed # wsa: 20091227: OE uses BUILD_CC here, buildroot doesn't have such a patch (why?) # How to solve for upstream? diff --git a/patches/sablevm-1.13/configure-Wl.diff b/patches/sablevm-1.13/configure-Wl.diff index 362bb4ca3..9e9e1b3e0 100644 --- a/patches/sablevm-1.13/configure-Wl.diff +++ b/patches/sablevm-1.13/configure-Wl.diff @@ -1,11 +1,12 @@ -# -# Submitted-By: Marc Kleine-Budde, 2006-04-21 -# Committed-By: Marc Kleine-Budde -# -# Error: -# -# libtool sux, cannont crosscompile if -l<lib> is given, add -Wl, prefixes -# +From: Marc Kleine-Budde <m.kleine-budde@pengutronix.de> +Subject: add -Wl + +libtool sux, cannont crosscompile if -l<lib> is given, add -Wl, prefixes + + +Signed-off-by: Marc Kleine-Budde <m.kleine-budde@pengutronix.de> +--- + Index: sablevm-1.13/configure =================================================================== --- sablevm-1.13.orig/configure diff --git a/patches/sablevm-1.13/configure_ac-Wl.diff b/patches/sablevm-1.13/configure_ac-Wl.diff index 679519a3d..7310ffb50 100644 --- a/patches/sablevm-1.13/configure_ac-Wl.diff +++ b/patches/sablevm-1.13/configure_ac-Wl.diff @@ -1,11 +1,11 @@ -# -# Submitted-By: Marc Kleine-Budde, 2006-04-21 -# Committed-By: Marc Kleine-Budde -# -# Error: -# -# libtool sux, cannont crosscompile if -l<lib> is given, add -Wl, prefixes -# +From: Marc Kleine-Budde <m.kleine-budde@pengutronix.de> +Subject: add -Wl + +libtool sux, cannont crosscompile if -l<lib> is given, add -Wl, prefixes + +Signed-off-by: Marc Kleine-Budde <m.kleine-budde@pengutronix.de> +--- + Index: sablevm-1.13/configure.ac =================================================================== --- sablevm-1.13.orig/configure.ac diff --git a/patches/samba-3.0.37/0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch b/patches/samba-3.0.37/0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch index ee4c6f2a8..0cee2ecfa 100644 --- a/patches/samba-3.0.37/0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch +++ b/patches/samba-3.0.37/0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch @@ -1,13 +1,19 @@ -From d8d84cd7082a95e673a7efc285879dd412b78b4c Mon Sep 17 00:00:00 2001 From: Robert Schwebel <r.schwebel@pengutronix.de> -Date: Tue, 7 Jul 2009 15:56:56 +0200 -Subject: [PATCH 1/8] Linux oplock support is conditional on HAVE_KERNEL_OPLOCKS_LINUX, not plain old LINUX. +Subject: [samba] make oplock support conditional + +Linux oplock support is conditional on HAVE_KERNEL_OPLOCKS_LINUX, not +plain old LINUX. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> -http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23962 --- source/modules/vfs_default.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) +# 20100428 rsc: This patch was already applied in the samba upstream, see +# http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23962 +# and d8d84cd7082a95e673a7efc285879dd412b78b4c in samba git. + diff --git a/source/modules/vfs_default.c b/source/modules/vfs_default.c index 4cc6e88..1f8fb63 100644 --- a/source/modules/vfs_default.c diff --git a/patches/tslib-1.0/egalax.diff b/patches/tslib-1.0/egalax.diff index c1ec8c815..69baf64b2 100644 --- a/patches/tslib-1.0/egalax.diff +++ b/patches/tslib-1.0/egalax.diff @@ -1,3 +1,9 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Subject: [tslib] add egalax driver + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + diff -Naur tslib/configure.ac tslib-1.0-mine/configure.ac --- tslib/configure.ac 2009-03-24 19:02:37.000000000 +0100 +++ tslib-1.0-mine/configure.ac 2009-06-30 13:52:00.000000000 +0200 diff --git a/patches/tslib-1.0/r62-Cleanup-and-kill-syntax-errors-introduced-by-copying.patch b/patches/tslib-1.0/r62-Cleanup-and-kill-syntax-errors-introduced-by-copying.patch index 1da278b82..443ca5098 100644 --- a/patches/tslib-1.0/r62-Cleanup-and-kill-syntax-errors-introduced-by-copying.patch +++ b/patches/tslib-1.0/r62-Cleanup-and-kill-syntax-errors-introduced-by-copying.patch @@ -1,9 +1,14 @@ +From: Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de> +Subject: [tslib] add upstream patch + From 48ff3b48b080d0c69dcdc32e578ccd6977c07729 Mon Sep 17 00:00:00 2001 From: kergoth <kergoth@a933c7a4-9bf7-0310-9141-a2e45189604d> Date: Tue, 11 Nov 2008 20:22:25 +0000 Subject: [PATCH 14/30] Cleanup and kill syntax errors introduced by copying/pasting bits from a badly wrapped mail patch. git-svn-id: svn://svn.berlios.de/tslib/trunk/tslib@62 a933c7a4-9bf7-0310-9141-a2e45189604d + +Signed-off-by: Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de> --- plugins/input-raw.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/patches/tslib-1.0/r66-Define-the-_CNT-macros-if-needed.patch b/patches/tslib-1.0/r66-Define-the-_CNT-macros-if-needed.patch index 9f61c8a03..a77f60d0f 100644 --- a/patches/tslib-1.0/r66-Define-the-_CNT-macros-if-needed.patch +++ b/patches/tslib-1.0/r66-Define-the-_CNT-macros-if-needed.patch @@ -1,3 +1,6 @@ +From: Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de> +Subject: [tslib] add upstream patch + From b2b509ecaee7b449a093c512c78acd180ad53f78 Mon Sep 17 00:00:00 2001 From: kergoth <kergoth@a933c7a4-9bf7-0310-9141-a2e45189604d> Date: Tue, 18 Nov 2008 15:47:57 +0000 @@ -5,8 +8,9 @@ Subject: [PATCH 18/30] Define the _CNT macros if needed. EV_CNT & friends weren't added to linux/input.h until 2.6.24-rc1. - git-svn-id: svn://svn.berlios.de/tslib/trunk/tslib@66 a933c7a4-9bf7-0310-9141-a2e45189604d + +Signed-off-by: Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de> --- plugins/input-raw.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) |