diffstat for levee-3.5a levee-3.5a debian/changelog | 11 +++ debian/patches/10-gcc4.4-getline.patch | 105 +++++++++++++++++++++++++++++++++ debian/patches/debian-changes-3.5a-1.1 | 63 +++++++++++++++++++ debian/patches/series | 2 debian/source/format | 1 editcor.c | 2 extern.h | 2 lv.1 | 10 +-- main.c | 2 misc.c | 4 - move.c | 2 proto.h | 2 12 files changed, 194 insertions(+), 12 deletions(-) diff -Nru levee-3.5a/debian/changelog levee-3.5a/debian/changelog --- levee-3.5a/debian/changelog 2010-03-12 08:49:25.000000000 +0200 +++ levee-3.5a/debian/changelog 2010-02-14 17:16:27.000000000 +0200 @@ -1,3 +1,14 @@ +levee (3.5a-1.1) unstable; urgency=low + + [Jari Aalto] + * Non-maintainer upload. + * Move to packaging format "3.0 (quilt)" due to patch. + * debian/patches + - (Number 10): Add patch to fix Gcc 4.4 error: conflicting types + for getline (RC bug FTBFS serious; Closes: #548965). + + -- Jari Aalto Sun, 14 Feb 2010 16:48:08 +0200 + levee (3.5a-1) unstable; urgency=low * New upstream release. diff -Nru levee-3.5a/debian/patches/10-gcc4.4-getline.patch levee-3.5a/debian/patches/10-gcc4.4-getline.patch --- levee-3.5a/debian/patches/10-gcc4.4-getline.patch 1970-01-01 02:00:00.000000000 +0200 +++ levee-3.5a/debian/patches/10-gcc4.4-getline.patch 2010-02-14 17:20:49.000000000 +0200 @@ -0,0 +1,105 @@ +From 789d4a04a02f48e1db228b92fffb29c54780a909 Mon Sep 17 00:00:00 2001 +From: Jari Aalto +Date: Sun, 14 Feb 2010 17:20:44 +0200 +Subject: [PATCH] Fix Gcc 4.4 getline + +Signed-off-by: Jari Aalto +--- + editcor.c | 2 +- + extern.h | 2 +- + main.c | 2 +- + misc.c | 4 ++-- + move.c | 2 +- + proto.h | 2 +- + 6 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/editcor.c b/editcor.c +index 35aa626..4dae9e3 100644 +--- a/editcor.c ++++ b/editcor.c +@@ -186,7 +186,7 @@ execute(start, end) + + clrprompt(); + printch('!'); +- if ( !getline(instring) ) ++ if ( !levee_getline(instring) ) + return FALSE; + + if ( (tf = mkstemp(scratch)) < 0 ) { +diff --git a/extern.h b/extern.h +index 0e505b1..1484282 100644 +--- a/extern.h ++++ b/extern.h +@@ -197,7 +197,7 @@ extern exec_type PROC editcore(); + extern char PROC line(), peekc(), readchar(); + extern char PROC *findparse(),*makepat(); + +-extern bool PROC getline(); ++extern bool PROC levee_getline(); + extern bool PROC putfile(); + extern bool PROC doyank(), deletion(), putback(); + extern bool PROC pushb(),pushi(),pushmem(),uputcmd(), delete_to_undo(); +diff --git a/main.c b/main.c +index 6e4b3d6..fe4113c 100644 +--- a/main.c ++++ b/main.c +@@ -253,7 +253,7 @@ exec_type emode; + mode=emode; + do { + prompt(FALSE,":"); +- if (getline(instring)) ++ if (levee_getline(instring)) + exec(instring, &mode, &noquit); + indirect = FALSE; + if (mode == E_VISUAL && zotscreen && noquit) { /*ask for more*/ +diff --git a/misc.c b/misc.c +index 48197d2..329d58d 100644 +--- a/misc.c ++++ b/misc.c +@@ -21,7 +21,7 @@ + #include "extern.h" + + bool PROC +-getline(str) ++levee_getline(str) + char *str; + { + int len; +@@ -31,7 +31,7 @@ char *str; + str[len] = 0; + strput(CE); + return (flag == EOL); +-} /* getline */ ++} /* levee_getline */ + + + char PROC +diff --git a/move.c b/move.c +index ecc1eee..a396263 100644 +--- a/move.c ++++ b/move.c +@@ -160,7 +160,7 @@ cmdtype cmd; + clrprompt(); + if (cmd == PATT_FWD || cmd == PATT_BACK) { + printch(tsearch = instring[0] = chars[cmd-PATT_FWD]); +- if (!getline(&instring[1])) ++ if (!levee_getline(&instring[1])) + return ESCAPED; /* needs to skip later tests */ + } + else { +diff --git a/proto.h b/proto.h +index c362af3..e65be5d 100644 +--- a/proto.h ++++ b/proto.h +@@ -71,7 +71,7 @@ int PROC fseekeol(int origin); + int PROC gcount(void); + int PROC getKey(void); + int PROC getcontext(char c,int begline); +-int PROC getline(char *str); ++int PROC levee_getline(char *str); + int PROC initialize(int count,char * *args); + int PROC inputf(char *fname,int newbuf); + int PROC insert_to_undo(struct undostack *u,int start,int size); +-- +1.6.6.1 + diff -Nru levee-3.5a/debian/patches/debian-changes-3.5a-1.1 levee-3.5a/debian/patches/debian-changes-3.5a-1.1 --- levee-3.5a/debian/patches/debian-changes-3.5a-1.1 1970-01-01 02:00:00.000000000 +0200 +++ levee-3.5a/debian/patches/debian-changes-3.5a-1.1 2010-03-04 00:03:15.000000000 +0200 @@ -0,0 +1,63 @@ +Description: Upstream changes introduced in version 3.5a-1.1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + levee (3.5a-1.1) unstable; urgency=low + . + [Jari Aalto] + * Non-maintainer upload. + * Move to packaging format "3.0 (quilt)" due to patch. + * debian/patches + - (Number 10): Add patch to fix Gcc 4.4 error: conflicting types + for getline (RC bug FTBFS serious; Closes: #548965). + . + The person named in the Author field signed this changelog entry. +Author: Jari Aalto +Bug-Debian: http://bugs.debian.org/548965 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Forwarded: +Reviewed-By: +Last-Update: + +--- levee-3.5a.orig/lv.1 ++++ levee-3.5a/lv.1 +@@ -224,8 +224,8 @@ Delete 'file' from disk. + Set a tunable variable. Levee has a dozen or so user-definable + variables which you can twiddle via this command. There are boolean, + integer, and string variables that you can set. A string or integer +-variable is set by 'set xxx=yyy', a boolean variable is set via +-'set xxx' or 'set noxxx'. ++variable is set by 'set xxx=yyy', a boolean variable is set ++via 'set xxx' or 'set noxxx'. + + Here are the settable variables (and abbreviations): + .TP +@@ -275,8 +275,8 @@ Ignore the case of alphabetic characters + during searches. + .TP + .B "mapslash" +-(ST version only) Map '/' in filenames to +-'\\'. If the environment contains `mapslash' ++(ST version only) Map '/' in filenames ++to '\\'. If the environment contains `mapslash' + when levee is called, this variable will + default to true, otherwise it defaults to + false. (See the documentation for the +@@ -913,7 +913,7 @@ Find a 'end', ignoring case. + .B [A-Za-z][A-Za-z0-9]* + Find the next identifier. + .TP +-.B (\\*.*\\*) ++.B (\\\\*\\.*\\\\*) + Find the next one-line pascal comment. + .TP + .B \ diff -Nru levee-3.5a/debian/patches/series levee-3.5a/debian/patches/series --- levee-3.5a/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ levee-3.5a/debian/patches/series 2010-03-04 00:03:15.000000000 +0200 @@ -0,0 +1,2 @@ +10-gcc4.4-getline.patch +debian-changes-3.5a-1.1 diff -Nru levee-3.5a/debian/source/format levee-3.5a/debian/source/format --- levee-3.5a/debian/source/format 1970-01-01 02:00:00.000000000 +0200 +++ levee-3.5a/debian/source/format 2010-03-12 08:49:25.637858364 +0200 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru levee-3.5a/editcor.c levee-3.5a/editcor.c --- levee-3.5a/editcor.c 2010-03-12 08:49:25.000000000 +0200 +++ levee-3.5a/editcor.c 2008-05-24 10:06:14.000000000 +0300 @@ -186,7 +186,7 @@ clrprompt(); printch('!'); - if ( !levee_getline(instring) ) + if ( !getline(instring) ) return FALSE; if ( (tf = mkstemp(scratch)) < 0 ) { diff -Nru levee-3.5a/extern.h levee-3.5a/extern.h --- levee-3.5a/extern.h 2010-03-12 08:49:25.000000000 +0200 +++ levee-3.5a/extern.h 2008-05-24 10:06:14.000000000 +0300 @@ -197,7 +197,7 @@ extern char PROC line(), peekc(), readchar(); extern char PROC *findparse(),*makepat(); -extern bool PROC levee_getline(); +extern bool PROC getline(); extern bool PROC putfile(); extern bool PROC doyank(), deletion(), putback(); extern bool PROC pushb(),pushi(),pushmem(),uputcmd(), delete_to_undo(); diff -Nru levee-3.5a/lv.1 levee-3.5a/lv.1 --- levee-3.5a/lv.1 2010-03-12 08:49:25.000000000 +0200 +++ levee-3.5a/lv.1 2008-05-24 10:06:14.000000000 +0300 @@ -224,8 +224,8 @@ Set a tunable variable. Levee has a dozen or so user-definable variables which you can twiddle via this command. There are boolean, integer, and string variables that you can set. A string or integer -variable is set by 'set xxx=yyy', a boolean variable is set -via 'set xxx' or 'set noxxx'. +variable is set by 'set xxx=yyy', a boolean variable is set via +'set xxx' or 'set noxxx'. Here are the settable variables (and abbreviations): .TP @@ -275,8 +275,8 @@ during searches. .TP .B "mapslash" -(ST version only) Map '/' in filenames -to '\\'. If the environment contains `mapslash' +(ST version only) Map '/' in filenames to +'\\'. If the environment contains `mapslash' when levee is called, this variable will default to true, otherwise it defaults to false. (See the documentation for the @@ -913,7 +913,7 @@ .B [A-Za-z][A-Za-z0-9]* Find the next identifier. .TP -.B (\\\\*\\.*\\\\*) +.B (\\*.*\\*) Find the next one-line pascal comment. .TP .B \ diff -Nru levee-3.5a/main.c levee-3.5a/main.c --- levee-3.5a/main.c 2010-03-12 08:49:25.000000000 +0200 +++ levee-3.5a/main.c 2008-05-24 10:06:14.000000000 +0300 @@ -253,7 +253,7 @@ mode=emode; do { prompt(FALSE,":"); - if (levee_getline(instring)) + if (getline(instring)) exec(instring, &mode, &noquit); indirect = FALSE; if (mode == E_VISUAL && zotscreen && noquit) { /*ask for more*/ diff -Nru levee-3.5a/misc.c levee-3.5a/misc.c --- levee-3.5a/misc.c 2010-03-12 08:49:25.000000000 +0200 +++ levee-3.5a/misc.c 2008-05-24 10:06:14.000000000 +0300 @@ -21,7 +21,7 @@ #include "extern.h" bool PROC -levee_getline(str) +getline(str) char *str; { int len; @@ -31,7 +31,7 @@ str[len] = 0; strput(CE); return (flag == EOL); -} /* levee_getline */ +} /* getline */ char PROC diff -Nru levee-3.5a/move.c levee-3.5a/move.c --- levee-3.5a/move.c 2010-03-12 08:49:25.000000000 +0200 +++ levee-3.5a/move.c 2008-05-24 10:06:14.000000000 +0300 @@ -160,7 +160,7 @@ clrprompt(); if (cmd == PATT_FWD || cmd == PATT_BACK) { printch(tsearch = instring[0] = chars[cmd-PATT_FWD]); - if (!levee_getline(&instring[1])) + if (!getline(&instring[1])) return ESCAPED; /* needs to skip later tests */ } else { diff -Nru levee-3.5a/proto.h levee-3.5a/proto.h --- levee-3.5a/proto.h 2010-03-12 08:49:25.000000000 +0200 +++ levee-3.5a/proto.h 2008-05-24 10:06:14.000000000 +0300 @@ -71,7 +71,7 @@ int PROC gcount(void); int PROC getKey(void); int PROC getcontext(char c,int begline); -int PROC levee_getline(char *str); +int PROC getline(char *str); int PROC initialize(int count,char * *args); int PROC inputf(char *fname,int newbuf); int PROC insert_to_undo(struct undostack *u,int start,int size);