Author: gotar Date: Mon Feb 15 21:10:22 2010 GMT Module: packages Tag: HEAD ---- Log message: - updated with Ubuntu patch (https://launchpad.net/ubuntu/intrepid/+source/sc/7.16-2)
---- Files affected: packages/sc: sc.spec (1.4 -> 1.5) , sc_7.16-2.diff (NONE -> 1.1) (NEW), sc-malloc.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/sc/sc.spec diff -u packages/sc/sc.spec:1.4 packages/sc/sc.spec:1.5 --- packages/sc/sc.spec:1.4 Sun Feb 14 23:40:48 2010 +++ packages/sc/sc.spec Mon Feb 15 22:10:17 2010 @@ -3,12 +3,13 @@ Summary(pl.UTF-8): Sc jest darmowym, bazującym na curses arkuszem kalkulacyjnym, uzywającym skrótów klawiszowych podobnych do vi oraz less Name: sc Version: 7.16 -Release: 1 +Release: 2 License: Public Domain Group: Applications/Math Source0: http://www.ibiblio.org/pub/Linux/apps/financial/spreadsheet/%{name}-%{version}.tar.gz # Source0-md5: 1db636e9b2dc7cd73c40aeece6852d47 -Patch0: %{name}-malloc.patch +# https://launchpad.net/ubuntu/hoary/+source/sc/7.16-2/+files/sc_7.16-2.diff.gz +Patch0: %{name}_%{version}-2.diff URL: http://www.ibiblio.org/pub/Linux/apps/financial/spreadsheet/ BuildRequires: bison BuildRequires: ncurses-devel >= 5.0 @@ -66,6 +67,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.5 2010/02/15 21:10:17 gotar +- updated with Ubuntu patch (https://launchpad.net/ubuntu/intrepid/+source/sc/7.16-2) + Revision 1.4 2010/02/14 22:40:48 gotar - integer release ================================================================ Index: packages/sc/sc_7.16-2.diff diff -u /dev/null packages/sc/sc_7.16-2.diff:1.1 --- /dev/null Mon Feb 15 22:10:22 2010 +++ packages/sc/sc_7.16-2.diff Mon Feb 15 22:10:17 2010 @@ -0,0 +1,782 @@ +--- sc-7.16.orig/sc.h ++++ sc-7.16/sc.h +@@ -612,6 +612,9 @@ + extern int rowlimit; + extern int collimit; + ++void yankr(struct ent *v1, struct ent *v2); ++ ++ + #if BSD42 || SYSIII + + #ifndef cbreak +--- sc-7.16.orig/cmds.c ++++ sc-7.16/cmds.c +@@ -478,7 +478,7 @@ + int i, qtmp; + char buf[50]; + struct frange *fr; +- struct ent *obuf; ++ struct ent *obuf=0; + + if ((fr = find_frange(currow, curcol))) + rs = fr->or_right->row - currow + 1; +@@ -535,7 +535,7 @@ + int cs = maxcol - curcol + 1; + int i, qtmp; + char buf[50]; +- struct ent *obuf; ++ struct ent *obuf=0; + + if (cs - arg < 0) { + cs = cs > 0 ? cs : 0; +@@ -810,7 +810,7 @@ + + if (to_insert == 'r') { + insertrow(numrows, 0); +- if (fr = find_frange(currow, curcol)) ++ if ((fr = find_frange(currow, curcol))) + deltac = fr->or_left->col - mincol; + else { + for (i = 0; i < numrows; i++) +@@ -2279,7 +2279,7 @@ + ret->e.r.right.vp = lookat(newrow, newcol); + ret->e.r.right.vf = e->e.r.right.vf; + } else { +- struct enode *temprange; ++ struct enode *temprange=0; + + if (freeenodes) { + ret = freeenodes; +@@ -2337,8 +2337,7 @@ + break; + case 'f': + case 'F': +- if (range && ret->op == 'F' || +- !range && ret->op == 'f') ++ if ((range && ret->op == 'F') || (!range && ret->op == 'f')) + Rdelta = Cdelta = 0; + ret->e.o.left = copye(e->e.o.left, Rdelta, Cdelta, + r1, c1, r2, c2, transpose); +@@ -2798,7 +2797,7 @@ + write_cells(register FILE *f, int r0, int c0, int rn, int cn, int dr, int dc) + { + register struct ent **pp; +- int r, c, rs, cs, mf; ++ int r, c, rs=0, cs=0, mf; + char *dpointptr; + + mf = modflg; +@@ -2861,12 +2860,12 @@ + if ((plugin = findplugin(p+1, 'w')) != NULL) { + if (!plugin_exists(plugin, strlen(plugin), save + 1)) { + error("plugin not found"); +- return; ++ return -1; + } + *save = '|'; + if ((strlen(save) + strlen(fname) + 20) > PATHLEN) { + error("Path too long"); +- return; ++ return -1; + } + sprintf(save + strlen(save), " %s%d:", coltoa(c0), r0); + sprintf(save + strlen(save), "%s%d \"%s\"", coltoa(cn), rn, fname); +@@ -2883,13 +2882,14 @@ + } + #endif /* VMS */ + +- if (*fname == '\0') ++ if (*fname == '\0'){ + if (isatty(STDOUT_FILENO) || *curfile != '\0') + fname = curfile; + else { + write_fd(stdout, r0, c0, rn, cn); + return (0); + } ++ } + + #ifdef MSDOS + namelen = 12; +@@ -2981,12 +2981,12 @@ + if ((plugin = findplugin(p+1, 'r')) != NULL) { + if (!(plugin_exists(plugin, strlen(plugin), save + 1))) { + error("plugin not found"); +- return; ++ return -1; + } + *save = '|'; + if ((strlen(save) + strlen(fname) + 2) > PATHLEN) { + error("Path too long"); +- return; ++ return -1; + } + sprintf(save + strlen(save), " \"%s\"", fname); + eraseflg = 0; +--- sc-7.16.orig/abbrev.c ++++ sc-7.16/abbrev.c +@@ -19,10 +19,15 @@ + #include <stdio.h> + #include <stdlib.h> + #include <ctype.h> ++#include <curses.h> ++#include <unistd.h> + #include "sc.h" + + static struct abbrev *abbr_base; + ++int are_abbrevs(void); ++ ++ + void + add_abbr(char *string) + { +@@ -87,7 +92,7 @@ + } + } + +- if (expansion == NULL) ++ if (expansion == NULL){ + if ((a = find_abbr(string, strlen(string), &prev))) { + error("abbrev \"%s %s\"", a->abbr, a->exp); + return; +@@ -95,6 +100,7 @@ + error("abreviation \"%s\" doesn't exist", string); + return; + } ++ } + + if (find_abbr(string, strlen(string), &prev)) + del_abbr(string); +@@ -122,7 +128,7 @@ + del_abbr(char *abbrev) + { + struct abbrev *a; +- struct abbrev **prev; ++ struct abbrev **prev=0; + + if (!(a = find_abbr(abbrev, strlen(abbrev), prev))) + return; +--- sc-7.16.orig/range.c ++++ sc-7.16/range.c +@@ -18,6 +18,8 @@ + + #include <stdio.h> + #include <ctype.h> ++#include <unistd.h> ++#include <curses.h> + #include "sc.h" + + static struct range *rng_base; +--- sc-7.16.orig/vi.c ++++ sc-7.16/vi.c +@@ -17,6 +17,8 @@ + #include <curses.h> + #include <ctype.h> + #include <stdlib.h> ++#include <unistd.h> ++#include <sys/wait.h> + #include "sc.h" + + #if defined(REGCOMP) +@@ -40,7 +42,7 @@ + + #define istext(a) (isalnum(a) || ((a) == '_')) + +-#define bool int ++/*#define bool int*/ + #define true 1 + #define false 0 + +@@ -667,8 +669,10 @@ + static struct range *nextmatch; + int len; + +- if (linelim > 0 && isalnum(line[linelim-1]) || line[linelim-1] == '_' || +- (completethis && line[linelim-1] == ' ')) { ++ if ((linelim > 0 && isalnum(line[linelim-1])) || ++ line[linelim-1] == '_' || ++ (completethis && line[linelim-1] == ' ')) { ++ + if (!completethis) { + for (completethis = line + linelim - 1; isalnum(*completethis) || + *completethis == '_'; completethis--) /* */; +@@ -715,7 +719,7 @@ + showdr() + { + int minsr, minsc, maxsr, maxsc; +- char *p; ++ /*char *p;*/ + char r[12]; + struct frange *fr = find_frange(currow, curcol); + +@@ -1566,7 +1570,7 @@ + search_again(bool reverse) + { + int prev_match; +- int found_it; ++ int found_it=0; + #if !defined(REGCOMP) && !defined(RE_COMP) && !defined(REGCMP) + char *look_here; + int do_next; +@@ -1777,7 +1781,7 @@ + static void + match_paren() + { +- register int i; ++ /*register int i;*/ + int nest = 1; + int tmp = linelim; + +--- sc-7.16.orig/vmtbl.c ++++ sc-7.16/vmtbl.c +@@ -16,6 +16,7 @@ + # include <curses.h> + #endif /* PSC */ + ++#include <unistd.h> + #include "sc.h" + + /* +--- sc-7.16.orig/Makefile ++++ sc-7.16/Makefile +@@ -32,7 +32,7 @@ + + # This is where the library file (tutorial) goes. + #LIBDIR=/usr/local/share/$(name) # reno +-LIBDIR=${prefix}/lib/$(name) ++LIBDIR=${prefix}/share/doc/$(name) + LIBRARY=-DLIBDIR=\"${LIBDIR}\" + + # Set SIMPLE for lex.c if you don't want arrow keys or lex.c blows up +--- sc-7.16.orig/color.c ++++ sc-7.16/color.c +@@ -19,6 +19,7 @@ + + #include <curses.h> + #include <ctype.h> ++#include <unistd.h> + #include "sc.h" + + /* a linked list of free [struct ent]'s, uses .next as the pointer */ +--- sc-7.16.orig/debian/sc.dirs ++++ sc-7.16/debian/sc.dirs +@@ -0,0 +1,3 @@ ++usr/bin ++usr/share/doc/sc ++usr/share/man/man1 +--- sc-7.16.orig/debian/control ++++ sc-7.16/debian/control +@@ -0,0 +1,20 @@ ++Source: sc ++Section: math ++Priority: optional ++Build-Depends: libncurses5-dev, bison, debhelper (>=4) ++Maintainer: Adam Majer <[email protected]> ++Standards-Version: 3.6.1 ++ ++Package: sc ++Architecture: any ++Depends: ${shlibs:Depends} ++Description: Text-based spreadsheet with VI-like keybindings ++ "Spreadsheet Calculator" is a much modified version of the public- ++ domain spread sheet sc, which was posted to Usenet several years ago ++ by Mark Weiser as vc, originally by James Gosling. It is based on ++ rectangular table much like a financial spreadsheet. ++ . ++ Its keybindings are familiar to users of 'vi', and it has most ++ features that a pure spreadsheet would, but lacks things like ++ graphing and saving in foreign formats. It's very stable and quite ++ easy to use once you've put a little effort into learning it. +--- sc-7.16.orig/debian/compat ++++ sc-7.16/debian/compat +@@ -0,0 +1 @@ ++4 +--- sc-7.16.orig/debian/changelog ++++ sc-7.16/debian/changelog +@@ -0,0 +1,117 @@ ++sc (7.16-2) unstable; urgency=low ++ ++ * New maintainer (closes: #260000) ++ * Fixed the code to remove most of the warnings during compile. ++ * No longer tries to "redefine" malloc (closes: #259840) ++ * debian/rules now uses debhelper ++ ++ -- Adam Majer <[email protected]> Mon, 19 Jul 2004 14:24:48 -0500 ++ ++sc (7.16-1) unstable; urgency=low ++ ++ * New upstream version. (closes: Bug#131782, Bug#169590) ++ * Doesn't use '#' as backup character. (closes: Bug#127612) ++ * Help page index fixed. (closes: Bug#115456) ++ * Tutorial file location corrected in man page. (closes: Bug#115454) ++ ++ -- Chad Miller <[email protected]> Tue, 19 Nov 2002 14:11:52 -0500 ++ ++sc (7.13-2) unstable; urgency=low ++ ++ * Fixed spelling error in package description. ++ ++ -- Chad Miller <[email protected]> Tue, 18 Dec 2001 14:22:47 +0000 ++ ++sc (7.13-1) unstable; urgency=low ++ ++ * New upstream version; many bugfixes. (closes: Bug#114473) ++ ++ -- Chad Miller <[email protected]> Thu, 4 Oct 2001 19:54:46 +0000 ++ ++sc (6.21-12) unstable; urgency=low ++ ++ * Installed 'tutorial.sc' in doc directory. (closes: Bug:85546) ++ ++ -- Chad Miller <[email protected]> Sat, 17 Mar 2001 15:03:21 -0500 ++ ++sc (6.21-11) unstable; urgency=low ++ ++ * Maintainer change. (closes: Bug#68149) ++ * Put manpages under /usr/share/man, as recent policy says. ++ * Added to CFLAGS, to prevent ``still changing'' bug on some architectures. ++ (closes: Bug#50986) ++ ++ -- Chad Miller <[email protected]> Mon, 8 Jan 2001 15:20:02 -0500 ++ ++sc (6.21-10) unstable; urgency=low ++ ++ * Added support for cursor keys, thanks to D. J. Raymond ++ <[email protected]> ++ ++ -- Martin Schulze <[email protected]> Sun, 2 Jan 2000 17:35:34 +0100 ++ ++sc (6.21-9) unstable; urgency=low, closes=48133 ++ ++ * Corrected manpage creation (closes: Bug#48133) ++ ++ -- Martin Schulze <[email protected]> Fri, 29 Oct 1999 00:32:30 +0200 ++ ++sc (6.21-8) frozen unstable; urgency=low, closes=29540 ++ ++ * Removed external declaration for strcpy() and strcat() from format.c ++ and included <string.h> instead. (closes: Bug#29540) ++ ++ -- Martin Schulze <[email protected]> Tue, 17 Nov 1998 11:19:50 +0100 ++ ++sc (6.21-7) unstable; urgency=low ++ ++ * Re-compiled against ncurses4 ++ ++ -- Martin Schulze <[email protected]> Fri, 30 Oct 1998 11:14:48 +0100 ++ ++sc (6.21-6) unstable; urgency=low ++ ++ * Applied y2k patch from L J Bayuk <[email protected]>. Thanks to ++ Ray for forwarding. ++ ++ -- Martin Schulze <[email protected]> Fri, 23 Oct 1998 19:21:05 +0200 ++ ++sc (6.21-5) unstable; urgency=low, closes=25513 23241 ++ ++ * Undebhelpering it ++ * Recompiled against ncurses3.4 to make it work with that lib (closes: ++ Bug#25513, Bug#23241) ++ * This works together with the current ncurses package ++ ++ -- Martin Schulze <[email protected]> Sun, 6 Sep 1998 22:22:47 +0000 ++ ++sc (6.21-4) unstable; urgency=high, closes=22616 ++ ++ * Recompiled against ncurses3.4 to make it work with that lib (closes: ++ Bug#22616) ++ * Added Conflicts: ncurses3.4 (<<1.9.9g-8.2) ++ ++ -- Martin Schulze <[email protected]> Tue, 19 May 1998 10:30:44 +0200 ++ ++sc (6.21-3) frozen unstable; urgency=low, closes=20915 ++ ++ * Corrected sc.1 manpage (closes: Bug#20915) ++ * Removed dh_du ++ * Added scqref.1 undocumented manpage link ++ ++ -- Martin Schulze <[email protected]> Sat, 11 Apr 1998 04:45:23 +0200 ++ ++sc (6.21-2) unstable; urgency=low, closes=20079 ++ ++ * Removed dependency to regex (closes: Bug#20079) ++ * Little code clean ups in pvmtbl.c ++ ++ -- Martin Schulze <[email protected]> Mon, 23 Mar 1998 01:56:31 +0100 ++ ++sc (6.21-1) unstable; urgency=low ++ ++ * First release ++ * Removed references to initkbd(), resetkbd() and kbd_again() ++ * Changed nmgetch() to getch() ++ ++ -- Martin Schulze <[email protected]> Thu, 12 Mar 1998 02:58:48 +0100 +--- sc-7.16.orig/debian/copyright ++++ sc-7.16/debian/copyright +@@ -0,0 +1,15 @@ ++This is the Debian GNU/Linux prepackaged version of the public domain ++spread sheet sc, posted several years ago by Mark Weiser as vc, ++originally by James Gosling. ++ ++This package was originally put together by ++Martin Schulze <[email protected]>, and later adopted by ++Chad Miller <[email protected]>. Source was obtained from: ++ http://ibiblio.org/pub/Linux/apps/financial/spreadsheet/sc-7.13.tar.gz ++ ++Sc is not a product of ProsLink, Inc. It is supplied as is with no ++warranty, express or implied, as a service to Usenet readers. It is ++not copyrighted, either. Have at it. ++ ++Some of the files were originally written by Robert Bond, James ++Gosling, Bradley Williams or Mark Nagel. +--- sc-7.16.orig/debian/rules ++++ sc-7.16/debian/rules +@@ -0,0 +1,95 @@ ++#!/usr/bin/make -f ++# -*- makefile -*- ++# Sample debian/rules that uses debhelper. ++# GNU copyright 1997 to 1999 by Joey Hess. ++ ++# Uncomment this to turn on verbose mode. ++#export DH_VERBOSE=1 ++ ++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ++ CFLAGS += -O0 ++else ++ CFLAGS += -O2 ++endif ++ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) ++ INSTALL_PROGRAM += -s ++endif ++ ++configure: configure-stamp ++configure-stamp: ++ dh_testdir ++ # Add here commands to configure the package. ++ touch configure-stamp ++ ++ ++build: build-stamp ++ ++build-stamp: configure-stamp ++ dh_testdir ++ ++ # Add here commands to compile the package. ++ $(MAKE) all sc.1 psc.1 CC=gcc CFLAGS="-O2 -Wall -DSYSV3 -ffloat-store" ++ #/usr/bin/docbook-to-man debian/sc.sgml > sc.1 ++ ++ touch build-stamp ++ ++clean: ++ dh_testdir ++ dh_testroot ++ rm -f build-stamp configure-stamp ++ ++ # Add here commands to clean up after the build process. ++ -test -f Makefile && $(MAKE) clean ++ rm -f sc psc scqref ++ find . -name '*~' -exec rm {} \; ++ rm -rf stamp-build *~ ++ ++ dh_clean ++ ++install: build ++ dh_testdir ++ dh_testroot ++ dh_clean -k ++ dh_installdirs ++ ++ # Add here commands to install the package into debian/sc. ++ # $(MAKE) install DESTDIR=$(CURDIR)/debian/sc ++ ++ ++# Build architecture-independent files here. ++binary-indep: build install ++# We have nothing to do by default. ++ ++# Build architecture-dependent files here. ++binary-arch: build install ++ dh_testdir ++ dh_testroot ++ dh_installchangelogs CHANGES ++ dh_installdocs ++# dh_installexamples ++ dh_install ++# dh_installmenu ++# dh_installdebconf ++# dh_installlogrotate ++# dh_installemacsen ++# dh_installpam ++# dh_installmime ++# dh_installinit ++# dh_installcron ++# dh_installinfo ++ dh_installman ++# dh_link ++ dh_strip ++ dh_compress ++ dh_fixperms ++# dh_perl ++# dh_python ++# dh_makeshlibs ++ dh_installdeb ++ dh_shlibdeps ++ dh_gencontrol ++ dh_md5sums ++ dh_builddeb ++ ++binary: binary-indep binary-arch ++.PHONY: build clean binary-indep binary-arch binary install configure +--- sc-7.16.orig/debian/sc.docs ++++ sc-7.16/debian/sc.docs +@@ -0,0 +1,2 @@ ++README ++tutorial.sc +--- sc-7.16.orig/debian/sc.install ++++ sc-7.16/debian/sc.install +@@ -0,0 +1,3 @@ ++sc usr/bin ++psc usr/bin ++scqref usr/bin +--- sc-7.16.orig/debian/sc.manpages ++++ sc-7.16/debian/sc.manpages +@@ -0,0 +1,2 @@ ++psc.1 ++sc.1 +--- sc-7.16.orig/frame.c ++++ sc-7.16/frame.c +@@ -18,6 +18,9 @@ + + #include <stdio.h> + #include <ctype.h> ++#include <stdlib.h> ++#include <curses.h> ++#include <unistd.h> + #include "sc.h" + + static struct frange *frame_base; +--- sc-7.16.orig/sc.c ++++ sc-7.16/sc.c <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sc/sc.spec?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
