Hello community,
here is the log from the commit of package dbview
checked in at Sat Apr 7 10:03:10 CEST 2007.
--------
--- dbview/dbview.changes 2006-05-22 17:30:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/dbview/dbview.changes 2007-04-06 17:15:41.000000000 +0200
@@ -1,0 +2,12 @@
+Fri Apr 6 17:02:10 CEST 2007 - lmichnovic@suse.cz
+
+- update to version 1.0.4
+ - Support for deleted records
+ Added --deleted|-D to display deleted records as well.
+ - Improved handling of differences between dBase III and
+ dBase III+ files.
+ - Improved error handling
+- obsoletes patch gcc-warning
+- patch %name-%version.diff renamed to *makefile.patch
+
+-------------------------------------------------------------------
Old:
----
dbview-1.0.3.diff
dbview-1.0.3.tar.bz2
dbview-gcc-warning.diff
New:
----
dbview-1.0.4-makefile.patch
dbview-1.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dbview.spec ++++++
--- /var/tmp/diff_new_pack.h30664/_old 2007-04-07 10:02:53.000000000 +0200
+++ /var/tmp/diff_new_pack.h30664/_new 2007-04-07 10:02:53.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package dbview (Version 1.0.3)
+# spec file for package dbview (Version 1.0.4)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,14 +11,14 @@
# norootforbuild
Name: dbview
-License: GPL
+URL: http://www.infodrom.org/projects/dbview/
+License: GNU General Public License (GPL)
Group: Productivity/Databases/Tools
Autoreqprov: on
-Version: 1.0.3
-Release: 439
+Version: 1.0.4
+Release: 1
Source0: ftp://ftp.infodrom.north.de/pub/Linux/Devel/%{name}/%{name}-%{version}.tar.bz2
-Patch: %{name}-%{version}.diff
-Patch1: %{name}-gcc-warning.diff
+Patch1: %{name}-%{version}-makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Viewer for dBase III and dBase IV Files
@@ -34,7 +34,6 @@
%prep
%setup
-%patch
%patch1
%build
@@ -48,11 +47,20 @@
%files
%defattr(-, root, root)
-%doc README dBASE
+%doc README dBASE CHANGES
%doc %{_mandir}/man1/*
%{_prefix}/bin/dbview
-%changelog -n dbview
+%changelog
+* Fri Apr 06 2007 - lmichnovic@suse.cz
+- update to version 1.0.4
+ - Support for deleted records
+ Added --deleted|-D to display deleted records as well.
+ - Improved handling of differences between dBase III and
+ dBase III+ files.
+ - Improved error handling
+- obsoletes patch gcc-warning
+- patch %%name-%%version.diff renamed to *makefile.patch
* Mon May 22 2006 - schwab@suse.de
- Don't build as root.
- Don't strip binaries.
++++++ dbview-1.0.4-makefile.patch ++++++
--- Makefile
+++ Makefile
@@ -19,13 +19,14 @@
MAN=man
CC= gcc
-CFLAGS= -O6 -fomit-frame-pointer -Wall -pipe
+CFLAGS= -O2 -fomit-frame-pointer -Wall -pipe
# CFLAGS= -g -fomit-frame-pointer -Wall -pipe
# Look where your install program is
#
INSTALL = /usr/bin/install
-prefix = /usr
+DESTDIR =
+prefix = $(DESTDIR)/usr
bindir = $(prefix)/bin
mandir = $(prefix)/share/$(MAN)
@@ -43,10 +44,10 @@
makedepend *.c
install: all
- $(INSTALL) -d -o root -g root -m 755 $(bindir)
- $(INSTALL) -s -o root -g root -m 755 dbview $(bindir)
- $(INSTALL) -d -o $(MAN) -g $(MAN) -m 755 $(mandir)/man1
- $(INSTALL) -o $(MAN) -g $(MAN) -m 644 dbview.1 $(mandir)/man1
+ $(INSTALL) -d -m 755 $(bindir)
+ $(INSTALL) -m 755 dbview $(bindir)
+ $(INSTALL) -d -m 755 $(mandir)/man1
+ $(INSTALL) -m 644 dbview.1 $(mandir)/man1
clean:
rm -f dbview *.o *.log *~ *.orig Makefile.bak;
++++++ dbview-1.0.3.tar.bz2 -> dbview-1.0.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dbview-1.0.3/CHANGES new/dbview-1.0.4/CHANGES
--- old/dbview-1.0.3/CHANGES 1970-01-01 01:00:00.000000000 +0100
+++ new/dbview-1.0.4/CHANGES 2006-11-27 12:52:50.000000000 +0100
@@ -0,0 +1,6 @@
+1.0.4 -- 2006-11-27
+
+ - Support for deleted records
+ Added --deleted|-D to display deleted records as well.
+ - Improved handling of differences between dBase III and dBase III+ files.
+ - Improved error handling
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dbview-1.0.3/dBASE new/dbview-1.0.4/dBASE
--- old/dbview-1.0.3/dBASE 1996-04-18 22:36:39.000000000 +0200
+++ new/dbview-1.0.4/dBASE 2006-10-16 19:37:00.000000000 +0200
@@ -55,6 +55,8 @@
n + 1 1 byte 0DH as the field terminator.
+n + 2 1 byte 00H only in dBase III (not in dBase III+ or dBase IV)
+
* n is the last byte in the field descriptor array. The size of the array
depends on the number of fields in the database file.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dbview-1.0.3/db_dump.c new/dbview-1.0.4/db_dump.c
--- old/dbview-1.0.3/db_dump.c 1996-10-08 09:25:54.000000000 +0200
+++ new/dbview-1.0.4/db_dump.c 2006-11-27 12:51:25.000000000 +0100
@@ -1,6 +1,6 @@
/*
db_dump.c - Routines for reading dBase III files
- Copyright (c) 1995 Martin Schulze
+ Copyright (c) 1995,96,2003,6 Martin Schulze
This file is part of the dbview package, a viewer for dBase II files.
@@ -15,8 +15,8 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
@@ -24,7 +24,9 @@
Most of the code in this file comes from Greg Twaites anno 87. I
only took the file and wrote a program around it. I enclude the
whole header. I have obtained this file from a free software
- archive, namely nic.funet.fi.
+ archive, namely nic.funet.fi. It is supposed to be placed in the
+ public domain. Hence, adding GPL code around and distributinng
+ the entire file under the GPL should be fine.
ftp://nic.funet.fi/pub/msdos/languages/c/dbase.c
*/
@@ -46,6 +48,15 @@
* Modified on some places based on corrections from Vladimir
* Michl
*
+ * Mon Sep 25 17:09:46 2006: Gergely Szasz
+ * Added --deleted|-D to display deleted records as well.
+ *
+ * Mon Oct 16 18:34:23 CEST 2006: Joey Schulze
+ * Improved error handling. Improved handling of differences between
+ * dBase III and dBase III+ files.
+ *
+ * Mon Nov 20 16:58:35 CET 2006: Joey Schulze
+ * Adjusted type handling and proper casts.
*/
#include "db_dump.h"
@@ -57,29 +68,68 @@
#include
#include
#include
+#include
+#include
+#define TRUE 1
+#define FALSE 0
+
DBASE_HEAD dbhead={0};
FLD_LIST *db_fld_root=0;
char *Buffer;
char buf_work[255];
-int dbfile;
+FILE *dbfile;
+
+/*----------------------------------------------------helpers------------*/
+#if BYTE_ORDER == BIG_ENDIAN
+size_t
+db3_fread (void *ptr, size_t size, size_t nmemb, FILE *stream)
+{
+ size_t ret;
+ size_t i;
+ uint16_t *p = (uint16_t *) ptr;
+ uint32_t *pp = (uint32_t *) ptr;
+
+ ret = fread(ptr, size, nmemb, stream);
+
+ switch (size)
+ {
+ case 2:
+ for (i = 0; i < ret; i++)
+ p[i] = bswap_16(p[i]);
+ break;
+ case 4:
+ for (i = 0; i < ret; i++)
+ pp[i] = bswap_32(pp[i]);
+ break;
+ default:
+ break;
+ }
+
+ return ret;
+}
+
+#define fread db3_fread
+#endif
/*------------------------------------------------------------code-------*/
-void
+int
db3_process(dbfn, flags, delim)
char *dbfn;
int flags;
char delim;
{
- dbfile=open(dbfn,O_RDONLY);
- if (dbfile == -1) {
+ dbfile=fopen(dbfn,"r");
+ if (dbfile == NULL) {
printf("Unable to open file `%s'\n", dbfn);
- return;
+ return FALSE;
}
- db3_read_dic(flags);
- if ( ! (flags & DB_FL_OMIT))
+ if (db3_read_dic(flags)) {
+ if ( ! (flags & DB_FL_OMIT))
db3_print_recs(dbhead.count, flags, delim);
- close(dbfile);
+ }
+ fclose(dbfile);
+ return TRUE;
}
@@ -116,7 +166,7 @@
{
char *c=var;
- for (c+=strlen(var); isspace (*c); c--);
+ for (c+=strlen(var)-1; isspace (*c); c--);
*(++c) = '\0';
return var;
@@ -135,9 +185,10 @@
db3_cvt_fld (fld)
DBASE_FIELD *fld;
{
- char *c;
- char first=1;
+ uint8_t *c;
+ uint8_t first;
+ first = 1;
for (c=fld->name; *c; c++)
if (!first) {
if (isupper(*c))
@@ -151,7 +202,32 @@
first = 0;
}
-
+
+void
+db3_read_head(dbh)
+DBASE_HEAD *dbh;
+{
+ fread(&dbh->version, 1, 1, dbfile);
+ fread(dbh->l_update, 1, 3, dbfile);
+ fread(&dbh->count, 4, 1, dbfile);
+ fread(&dbh->header, 2, 1, dbfile);
+ fread(&dbh->lrecl, 2, 1, dbfile);
+ fread(dbh->reserv, 1, 20, dbfile);
+}
+
+void
+db3_read_field(fld)
+DBASE_FIELD *fld;
+{
+ fread(fld->name, 1, 11, dbfile);
+ fread(&fld->type, 1, 1, dbfile);
+ /* "duh" believe me, it used to do just that before */
+ fread(&fld->data_ptr, 4, 1, dbfile);
+ fread(&fld->length, 1, 1, dbfile);
+ fread(&fld->dec_point, 1, 1, dbfile);
+ fread(fld->fill, 1, 14, dbfile);
+}
+
/******************************************************
db3_read_dic()
This function is called with a file name to
@@ -159,30 +235,30 @@
dbase file
******************************************************/
-void
+int
db3_read_dic(flags)
int flags;
{
int fields;
DBASE_FIELD *fld;
- if(dbfile==-1) {
+ if(dbfile==NULL) {
printf("open failed");
- return;
+ return FALSE;
}
- read(dbfile,&dbhead,sizeof(DBASE_HEAD));
+ db3_read_head(&dbhead);
if( !(dbhead.version==3 || dbhead.version==0x83) ) {
printf ("Version %d not supported\n",dbhead.version);
if(dbhead.version==0x8b ) {
printf ("dBase IV - partially known...\n");
}
- return;
+ return FALSE;
}
if (flags & DB_FL_INFO) {
printf("File version : %d\n",dbhead.version);
- printf("Last update : %02d/%02d/%2d\n", dbhead.l_update[1],dbhead.l_update[2],dbhead.l_update[0]);
- printf("Number of recs: %ld\n",dbhead.count);
+ printf("Last update : %02d/%02d/%2d\n", dbhead.l_update[1],dbhead.l_update[2],dbhead.l_update[0]+1900);
+ printf("Number of recs: %d\n",dbhead.count);
printf("Header length : %d\n",dbhead.header);
printf("Record length : %d\n",dbhead.lrecl);
}
@@ -198,9 +274,9 @@
fld=(DBASE_FIELD *)malloc(sizeof(DBASE_FIELD));
if (!fld) {
printf ("Not enough memory\n");
- return;
+ return FALSE;
}
- read(dbfile,fld,sizeof(DBASE_FIELD));
+ db3_read_field(fld);
if (! (flags & DB_FL_RESERVE))
db3_cvt_fld (fld);
if (flags & DB_FL_DESCR) {
@@ -209,10 +285,10 @@
}
stack_field(fld);
}
- read(dbfile,Buffer,1); /* read the silly little \r 0x0d character */
- read(dbfile,Buffer,1); /* strange, it only works if we read another byte */
+ /* Jump to where the data starts */
+ fseek(dbfile, dbhead.header, SEEK_SET);
- return;
+ return TRUE;
}
/******************************************************
@@ -229,12 +305,12 @@
int bytes;
while(cnt) {
- bytes=read(dbfile,Buffer,dbhead.lrecl);
+ bytes=fread(Buffer,1,dbhead.lrecl,dbfile);
if(bytes!=dbhead.lrecl)
break;
/* Check if deleted == '*' */
- if(Buffer[0]==' ') {
- db3_print(flags, delim);
+ if(flags & DB_FL_DELETED || Buffer[0]==' ') {
+ db3_print(flags, delim, Buffer[0]);
cnt--;
}
}
@@ -248,13 +324,17 @@
******************************************************/
void
-db3_print(flags, delim)
+db3_print(flags, delim, deleted)
int flags;
char delim;
+char deleted;
{
FLD_LIST *temp;
temp=db_fld_root;
+ if ((flags & DB_FL_DELETED) && (flags & DB_FL_BROWSE))
+ printf("%c%c", deleted, delim);
+
while (temp) {
memcpy(buf_work,temp->data,temp->fld->length);
buf_work[temp->fld->length] = '\0';
@@ -267,6 +347,10 @@
printf("%-11s: %s\n",temp->fld->name,db3_rm_tr_spc(db3_rm_ld_spc(buf_work)));
temp=temp->next;
}
+
+ if ((flags & DB_FL_DELETED) && ((flags & DB_FL_BROWSE) == 0) && (deleted != ' '))
+ printf("*Deleted* : %c\n", deleted);
+
printf("\n");
return;
}
@@ -289,7 +373,7 @@
}
list->fld=fld;
if(!db_fld_root) {
- list->data=Buffer+1; /*skip delete byte*/
+ list->data = (uint8_t *)Buffer+1; /*skip delete byte*/
db_fld_root=list;
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dbview-1.0.3/db_dump.h new/dbview-1.0.4/db_dump.h
--- old/dbview-1.0.3/db_dump.h 1996-10-08 09:18:40.000000000 +0200
+++ new/dbview-1.0.4/db_dump.h 2006-11-19 21:29:10.000000000 +0100
@@ -1,6 +1,6 @@
/*
db_dump.h - Routines for reading dBase III files
- Copyright (c) 1995 Martin Schulze
+ Copyright (c) 1995,96,2003 Martin Schulze
This file is part of the dbview package, a viewer for dBase II files.
@@ -16,7 +16,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
@@ -24,7 +24,9 @@
Most of the code in this file comes from Greg Twaites anno 87. I
only took the file and wrote a program around it. I enclude the
whole header. I have obtained this file from a free software
- archive, namely nic.funet.fi.
+ archive, namely nic.funet.fi. It is supposed to be placed in the
+ public domain. Hence, adding GPL code around and distributinng
+ the entire file under the GPL should be fine.
ftp://nic.funet.fi/pub/msdos/languages/c/dbase.c
*/
@@ -40,25 +42,28 @@
*
*/
+#include
+
#define DB_FL_BROWSE 0x01
#define DB_FL_INFO 0x02
#define DB_FL_DESCR 0x04
#define DB_FL_RESERVE 0x08
#define DB_FL_OMIT 0x10
#define DB_FL_TRIM 0x20
+#define DB_FL_DELETED 0x40
typedef struct dbase_head {
- unsigned char version; /* 03 for dbIII and 83 for dbIII w/memo file */
- unsigned char l_update[3]; /* yymmdd for last update*/
- unsigned long count; /* number of records in file*/
- unsigned short header; /* length of the header
- * includes the \r at end
- */
- unsigned short lrecl; /* length of a record
- * includes the delete
- * byte
- */
- unsigned char reserv[20];
+ uint8_t version; /* 03 for dbIII and 83 for dbIII w/memo file */
+ uint8_t l_update[3]; /* yymmdd for last update*/
+ uint32_t count; /* number of records in file*/
+ uint16_t header; /* length of the header
+ * includes the \r at end
+ */
+ uint16_t lrecl; /* length of a record
+ * includes the delete
+ * byte
+ */
+ uint8_t reserv[20];
} DBASE_HEAD;
#define DB_FLD_CHAR 'C'
@@ -68,22 +73,22 @@
#define DB_FLD_DATE 'D'
typedef struct dbase_fld {
- char name[11]; /*field name*/
- char type; /*field type*/
+ uint8_t name[11]; /*field name*/
+ uint8_t type; /*field type*/
/* A-T uses large data model but drop it for now */
- char *data_ptr; /*pointer into buffer*/
- char length; /*field length*/
- char dec_point; /*field decimal point*/
- char fill[14];
+ uint8_t *data_ptr; /*pointer into buffer*/
+ uint8_t length; /*field length*/
+ uint8_t dec_point; /*field decimal point*/
+ uint8_t fill[14];
} DBASE_FIELD;
typedef struct fld_list {
struct fld_list *next;
DBASE_FIELD *fld;
- char *data;
+ uint8_t *data;
} FLD_LIST;
-void
+int
db3_process(char*, int, char);
/******************************************************
@@ -93,7 +98,7 @@
dbase file
******************************************************/
-void
+int
db3_read_dic(int);
/******************************************************
@@ -110,7 +115,7 @@
******************************************************/
void
-db3_print(int, char);
+db3_print(int, char, char);
/******************************************************
stack_field()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dbview-1.0.3/dbview.1 new/dbview-1.0.4/dbview.1
--- old/dbview-1.0.3/dbview.1 1996-10-08 08:41:27.000000000 +0200
+++ new/dbview-1.0.4/dbview.1 2006-11-20 16:57:12.000000000 +0100
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1996 Martin Schulze (joey@infodrom.north.de)
+.\" Copyright (c) 1996,2003,6 Martin Schulze
.\"
.\" This is free documentation; you can redistribute it and/or
.\" modify it under the terms of the GNU General Public License as
@@ -17,10 +17,10 @@
.\"
.\" You should have received a copy of the GNU General Public
.\" License along with this manual; if not, write to the Free
-.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-.\" USA.
+.\" Software Foundation, Inc., 59 Temple Place - Suite 330,
+.\" Boston, MA 02111, USA.
.\"
-.TH DBVIEW 1 "October 8, 1996" "Unix" "Database Management"
+.TH DBVIEW 1 "November 20th, 2006" "Unix" "Database Management"
.SH NAME
dbview \- View dBase III files
.SH SYNOPSIS
@@ -30,6 +30,7 @@
.IR delim |
.B \-\-delimiter
.IR delim ]
+.RB [ \-D | \-\-deleted ]
.RB [ \-e | \-\-description ]
.RB [ \-h | \-\-help ]
.RB [ \-i | \-\-info ]
@@ -68,6 +69,11 @@
examine the output with scripts.
.TP
+.B "\-\-deleted, \-D"
+displays deleted records as well as the delete state in each record in
+the database.
+
+.TP
.B "\-\-description, \-e"
displays the field description of the database.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dbview-1.0.3/dbview.c new/dbview-1.0.4/dbview.c
--- old/dbview-1.0.3/dbview.c 1996-10-08 09:04:23.000000000 +0200
+++ new/dbview-1.0.4/dbview.c 2006-11-19 21:29:11.000000000 +0100
@@ -1,6 +1,6 @@
/*
dbview.c - View dBase III files
- Copyright (c) 1995 Martin Schulze
+ Copyright (c) 1995,96,2003 Martin Schulze
This file is part of the dbview package, a viewer for dBase II files.
@@ -15,8 +15,9 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+
*/
/*
@@ -30,13 +31,15 @@
#include "db_dump.h"
#include
+#include
#include
+#include
void help_short()
{
printf ("%s %s - %s, (c) 1996 by Martin Schulze\n", progname, version, longname);
printf ("\n");
- printf ("%s [-b [-t]] [-d delim] [-e] [-h] [-i] [-o] [-o] [-v] dbfile\n", progname);
+ printf ("%s [-b [-t]] [-d delim] [-e] [-h] [-i] [-D] [-o] [-v] dbfile\n", progname);
}
void help_long()
@@ -48,16 +51,17 @@
printf (" --description, -e display field description\n");
printf (" --help, -h display help\n");
printf (" --info, -i display db information\n");
+ printf (" --deleted, -D display deleted records\n");
printf (" --omit, -o omit db records\n");
printf (" --reserve, -r reserve fieldnames from beeing translated\n");
printf (" --trim, -t trim browse fields\n");
printf (" --version, -v display version\n");
}
-void main (int argc, char **argv)
+int main (int argc, char **argv)
{
int opt_index;
- char c;
+ int c;
static const struct option long_options[] =
{
{"browse", no_argument, 0, 'b'},
@@ -66,6 +70,7 @@
{"help", no_argument, 0, 'H'},
{"info", no_argument, 0, 'i'},
{"omit", no_argument, 0, 'o'},
+ {"deleted", no_argument, 0, 'D'},
{"reserve", no_argument, 0, 'r'},
{"trim", no_argument, 0, 't'},
{"version", no_argument, 0, 'v'},
@@ -76,7 +81,7 @@
char delim = ':';
optind = 0;
- while ( (c = getopt_long(argc, argv, "Hbd:ehiortv", long_options, &opt_index)) != -1 ) {
+ while ( (c = getopt_long(argc, argv, "Hbd:ehiDortv", long_options, &opt_index)) != -1 ) {
switch (c) {
case 'H': /* --help */
help_long (); exit (0);
@@ -98,6 +103,9 @@
case 'i':
flags |= DB_FL_INFO;
break;
+ case 'D':
+ flags |= DB_FL_DELETED;
+ break;
case 'o':
flags |= DB_FL_OMIT;
break;
@@ -121,6 +129,5 @@
strcpy(dbfile, argv[optind]);
/* if ! -f dbfile thnen -f dbfile.dbf */
- db3_process (dbfile, flags, delim);
-
+ exit (db3_process (dbfile, flags, delim));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dbview-1.0.3/debian.ChangeLog new/dbview-1.0.4/debian.ChangeLog
--- old/dbview-1.0.3/debian.ChangeLog 1996-06-21 19:11:40.000000000 +0200
+++ new/dbview-1.0.4/debian.ChangeLog 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-Sun Apr 21 17:56:03 1996 Martin Schulze
-
- * Linked against libc 5.2.18 (Bug#2723, Bug#2725)
-
- * Corrected control file to fit with newer dpkgs
-
-Wed Apr 17 21:40:56 1996 Martin Schulze
-
- * Added Debian packaging information
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dbview-1.0.3/debian.control new/dbview-1.0.4/debian.control
--- old/dbview-1.0.3/debian.control 1996-10-08 09:40:55.000000000 +0200
+++ new/dbview-1.0.4/debian.control 1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-Package: @@package@@
-Version: @@version@@-@@revision@@
-Architecture: @@arch@@
-Section: misc
-Priority: extra
-Maintainer: Martin Schulze
-Suggests: recode, textutils
-Depends: libc5
-Description: View dBase III files.
- Dbview is a little tool that will display dBase III and IV
- files. You can also use it to convert your old .dbf files
- for further use with Unix.
- .
- It wasn't the intention to write a freaking viewer and
- reinvent the wheel again. Instead dbview is intend to be
- used in conjunction with your favourite unix text utili-
- ties like cut, recode and more.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dbview-1.0.3/debian.copyright new/dbview-1.0.4/debian.copyright
--- old/dbview-1.0.3/debian.copyright 1996-06-21 19:11:40.000000000 +0200
+++ new/dbview-1.0.4/debian.copyright 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-This is the Debian GNU/Linux prepackaged version a utility to view
-dBase III and IV files under Unix.
-
-This package was put together by Martin Schulze ,
-from sources obtained from:
- ftp.infodrom.north.de:/pub/Linux/Devel/dbview-1.0.0.tar.gz
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 dated June, 1991.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave., Cambridge, MA 02139, USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/doc/copyright/GPL'.
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dbview-1.0.3/debian.rules new/dbview-1.0.4/debian.rules
--- old/dbview-1.0.3/debian.rules 1996-10-08 09:32:22.000000000 +0200
+++ new/dbview-1.0.4/debian.rules 1970-01-01 01:00:00.000000000 +0100
@@ -1,93 +0,0 @@
-#! /usr/bin/make -f
-#
-# Last updated: Fri Jan 19 21:29:57 MET 1996 by joey.
-#
-# To make the binary distribution package, the ``Debianized'' source package
-# and the context diff to the original package, type `./debian.rules dist'.
-# Make sure that `debian.rules' is executable before the final distribution
-# is made.
-#
-# Invoke each target with `./debian.rules <target>'. All targets should be
-# invoked with the package root as the current directory.
-#
-# The `binary' target must be run as root, as it needs to install files with
-# specific ownerships. The `diff' target assumes that you have the original
-# source package available, unpacked, in ../$(p)-$(version).orig, or that you have
-# the previous revision of the ``Debianized'' source package and context diff
-# in the parent directory.
-
-# The name of the package
-package = dbview
-appendix =
-# The version of the package
-version = 1.0.3
-# The Debian revision of the package
-revision = 1
-# The architecture of this build
-arch = $(shell dpkg --print-architecture)
-
-build:
-# Builds the binary package.
- $(MAKE)
- touch stamp-build
-
-clean:
-# Undoes the effect of `make -f debian.rules build'.
- $(MAKE) clean
- rm -rf stamp-build debian-tmp *~
-
-binary:
-# Makes a binary package.
- test -f stamp-build || make -f debian.rules build
- install -d -g root -m 755 -o root debian-tmp
- chmod g-s debian-tmp
- install -d -g root -m 755 -o root debian-tmp/DEBIAN
- sed -e 's/@@version@@/$(version)/' -e 's/@@revision@@/$(revision)/' \
- -e 's/@@package@@/$(package)$(appendix)/' -e 's/@@arch@@/$(arch)/' \
- debian.control > debian-tmp/DEBIAN/control
- chmod 644 debian-tmp/DEBIAN/control
- install -d -g root -m 755 -o root debian-tmp/usr/doc/copyright
- install -g root -m 644 -o root debian.copyright \
- debian-tmp/usr/doc/copyright/$(package)
- $(MAKE) MAN=root prefix=debian-tmp/usr CFLAGS="-O2 -fomit-frame-pointer -Wall -pipe" \
- install
- dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb
-
-source:
-# Makes a source package.
- make -f debian.rules clean
- ( cd .. && tar cf - $(package)-$(version) | gzip -9f > $(package)_$(version)-$(revision).tar.gz )
-
-diff:
-# Makes a context diff.
- -test -f stamp-build && make -f debian.rules clean
- -test -d ../orig/$(package)-$(version) -a ! -d ../$(package)-$(version).orig \
- && (ln -s orig/$(package)-$(version) ../$(package)-$(version).orig; touch stamp-orig; true)
- -test -d ../$(package)-$(version).orig -o -f ../$(package)-$(version)-`expr $(revision) - 1`.diff.gz \
- || ( echo "Original source package is not available." ; false )
- -test -d ../$(package)-$(version).orig || make -f debian.rules orig
- -read x
- ( cd .. && diff -uNr $(package)-$(version).orig $(package)-$(version) | gzip -9f \
- > $(package)_$(version)-$(revision).diff.gz )
- -test -f stamp-orig \
- && rm -rf ../$(package)-$(version).orig && rm -f stamp-orig
-
-dist: binary source diff
-# Prepares the package for distribution.
-
-orig:
-# Prepares the original package from the previous
-# Debian revision source package and context diff.
- ( cd .. \
- && mkdir $(package).orig \
- && cd $(package).orig \
- && tar xzf ../$(package)-$(version)-`expr $(revision) - 1`.tar.gz \
- && cd $(package)-$(version) \
- && ( zcat ../../$(package)-$(version)-`expr $(revision) - 1`.diff.gz \
- | patch -sER -p1 ) \
- && find . -name "*.orig" -exec rm -f {} \; \
- && cd .. \
- && mv $(package)-$(version) ../$(package)-$(version).orig \
- && cd .. \
- && rmdir $(package).orig )
- touch stamp-orig
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dbview-1.0.3/Makefile new/dbview-1.0.4/Makefile
--- old/dbview-1.0.3/Makefile 1996-09-26 22:05:30.000000000 +0200
+++ new/dbview-1.0.4/Makefile 2006-11-19 20:37:41.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright (c) 1996 Martin Schulze
+# Copyright (c) 1995,96,2003,6 Martin Schulze
#
# This file is part of the dbview package, a viewer for dBase II files
#
@@ -13,8 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+
MAN=man
@@ -27,7 +28,7 @@
INSTALL = /usr/bin/install
prefix = /usr
bindir = $(prefix)/bin
-mandir = $(prefix)/$(MAN)
+mandir = $(prefix)/share/$(MAN)
obj = db_dump.o dbview.o version.o
@@ -55,14 +56,3 @@
rm -f TAGS;
# DO NOT DELETE
-
-db_dump.o: db_dump.h /usr/include/fcntl.h /usr/include/features.h
-db_dump.o: /usr/include/sys/cdefs.h /usr/include/sys/types.h
-db_dump.o: /usr/include/linux/types.h /usr/include/asm/types.h
-db_dump.o: /usr/include/gnu/types.h /usr/include/linux/fcntl.h
-db_dump.o: /usr/include/sys/stat.h /usr/include/linux/stat.h
-db_dump.o: /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h
-db_dump.o: /usr/include/unistd.h /usr/include/posix_opt.h
-db_dump.o: /usr/include/confname.h /usr/include/malloc.h
-dbview.o: version.h db_dump.h /usr/include/stdio.h /usr/include/libio.h
-dbview.o: /usr/include/_G_config.h /usr/include/getopt.h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dbview-1.0.3/README new/dbview-1.0.4/README
--- old/dbview-1.0.3/README 1996-10-08 08:32:52.000000000 +0200
+++ new/dbview-1.0.4/README 2003-08-29 21:54:11.000000000 +0200
@@ -1,17 +1,16 @@
-The file db_view.c if of unknown source, at least it is provided as a
-gift so we can work with it. I have obtained it from
-ftp://nic.funet.fi/pub/msdos/languages/c/dbase.c. The file contains a
-posting to comp.sys.ibm.pc from '87. I have saved the header in
-db_view.header.
+The file db_dump.c if of unknown source, at least it is provided as a
+gift so we can work with it. I have obtained it from
+ftp://nic.funet.fi/pub/msdos/languages/c/dbase.c. The file contains a
+posting to comp.sys.ibm.pc from 1987. I have saved the header in
+db_dump.header.
-The file dBASE contains a description of the dBase II file format. I
+The file dBASE contains a description of the dBase II file format. I
have obtained it from one of the various CPAN Comprehensive Perl
-Archive Network) ftp server in the
-Internet, e.g.
+Archive Network) ftp server in the Internet, e.g.
ftp://ftp.switch.ch/mirror/CPAN/modules/dbperl/refinfo/formats/dBASE
The native site for this package is
-ftp.infodrom.north.de/pub/Linux/Devel/dbview/. New versions will
+http://www.infodrom.org/projects/dbview/. New versions will
first occur there.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dbview-1.0.3/version.c new/dbview-1.0.4/version.c
--- old/dbview-1.0.3/version.c 1996-09-26 22:03:57.000000000 +0200
+++ new/dbview-1.0.4/version.c 2006-11-20 07:54:50.000000000 +0100
@@ -1,6 +1,6 @@
/*
version.c - version string
- Copyright (c) 1995, 1996 Martin Schulze
+ Copyright (c) 1995,96,2003,6 Martin Schulze
This file is part of the dbview package, a viewer for dBase II files.
@@ -16,11 +16,11 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
char progname[] = "dbview";
char longname[] = "View dBase III files";
-char version[] = "1.0.2";
+char version[] = "1.0.4";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dbview-1.0.3/version.h new/dbview-1.0.4/version.h
--- old/dbview-1.0.3/version.h 1996-04-18 23:33:46.000000000 +0200
+++ new/dbview-1.0.4/version.h 2003-08-29 21:24:40.000000000 +0200
@@ -1,6 +1,6 @@
/*
version.h - version string
- Copyright (c) 1995, 1996 Martin Schulze
+ Copyright (c) 1995,96,2003 Martin Schulze
This file is part of the dbview package, a viewer for dBase II files.
@@ -16,7 +16,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
extern char progname[];
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
