File lifelines-3.0.46.1.dif of Package lifelines

--- Makefile.am
+++ Makefile.am	2005-09-30 14:51:46.000000000 +0200
@@ -3,7 +3,7 @@
 ACLOCAL_AMFLAGS = -I build/autotools -I build/gettext
 
 # intl must come before src since we link with it!
-SUBDIRS = build intl po win32 src docs reports tt
+SUBDIRS = build po win32 src docs reports tt
 
 EXTRA_DIST = .linesrc lines.cfg \
              COPYING LICENSE INSTALL NEWS README AUTHORS ABOUT-NLS \
--- configure.in
+++ configure.in	2005-09-30 14:52:20.000000000 +0200
@@ -31,6 +31,7 @@
 dnl but debian maintainer still needs it
 dnl These languages should be a copy of po/LINGUAS
 ALL_LINGUAS="da de el fr it nl pl rw sv"
+AM_GNU_GETTEXT_VERSION(0.13)
 AM_GNU_GETTEXT(,need-ngettext)
 dnl codeset conversion library
 AM_ICONV
--- reports/timeline1.ll
+++ reports/timeline1.ll	2005-09-30 14:51:47.000000000 +0200
@@ -96,9 +96,7 @@
         list(plist)
         pagemode(1, 200)
         getindi(indi)
-        while (eq(indi, NULL)) {
-            getindi(indi)
-        }
+        if (not(indi)) { return() }
         set(valid,0)
         while (eq(valid,0)) {
             print("Graph (1) parents, (2) children, (3) spouses")
--- reports/timeline2.ll
+++ reports/timeline2.ll	2005-09-30 14:51:47.000000000 +0200
@@ -134,9 +134,8 @@
         set(linnum, 1)
         set(linpos, 1)
         list(plist)
-        while (eq(indi, NULL)) {
-            getindi(indi)
-        }
+        getindi(indi)
+        if (not(indi)) { return() }
         while (and(ne(gra,1), ne(gra,2))) {
                 getintmsg(gra,"Select timeline (1) graph, (2) chart:")
         }
--- src/gedlib/translat.c
+++ src/gedlib/translat.c	2005-09-30 14:51:47.000000000 +0200
@@ -307,7 +307,7 @@
 void
 transl_load_all_tts (void)
 {
-	CNSTRING ttpath = getoptstr("TTPATH", ".");
+	CNSTRING ttpath = getoptstr("TTPATH", "/usr/share/lifelines/tt");
 	if (!inited) local_init();
 	xl_load_all_dyntts(ttpath);
 }
--- src/hdrs/standard.h
+++ src/hdrs/standard.h	2005-09-30 14:51:47.000000000 +0200
@@ -73,6 +73,8 @@
 #define INCLUDED_STDARG_H
 #endif
 
+#include <inttypes.h>
+
 /* Having 'char *' instead of 'unsigned char *' removes about */
 /* 1800 compiler warnings.  We still need to investigate *every* */
 /* instance where a STRING is dereferenced and the contents acted */
@@ -90,7 +92,7 @@
 #ifndef FALSE
 #       define FALSE 0
 #endif
-#define INT int 
+#define INT int
 #define SHORT short
 #define FLOAT double
 
--- src/interp/builtin.c
+++ src/interp/builtin.c	2005-09-30 14:51:47.000000000 +0200
@@ -1116,7 +1116,7 @@
 PVALUE
 ___alpha (PNODE node, SYMTAB stab, BOOLEAN *eflg)
 {
-	static char scratch[2];
+	static char scratch[3];
 	INT i;
 	PNODE arg = (PNODE) iargs(node);
 	PVALUE val = eval_and_coerce(PINT, arg, stab, eflg);
@@ -3409,7 +3409,7 @@
 	PNODE arg = iargs(node);
 	PVALUE val = eval_and_coerce(PSTRING, arg, stab, eflg);
 	char buffer[1024];
-	STRING programsdir = getoptstr("LLPROGRAMS", ".");
+	STRING programsdir = getoptstr("LLPROGRAMS", "/usr/share/lifelines/reports");
 	if (*eflg)  {
 		prog_error(node, nonstr1, "copyfile");
 		goto copyfile_end;
--- src/interp/interp.c
+++ src/interp/interp.c	2005-09-30 14:51:47.000000000 +0200
@@ -258,7 +258,7 @@
 	} else {
 		PATHINFO pathinfo = 0;
 		STRING fname=0, fullpath=0;
-		STRING programsdir = getoptstr("LLPROGRAMS", ".");
+		STRING programsdir = getoptstr("LLPROGRAMS", "/usr/share/lifelines/reports");
 		if (!rptui_ask_for_program(LLREADTEXT, _(qSwhatrpt), &fname, &fullpath
 			, programsdir, ".ll", picklist)) {
 			if (fname)  {
@@ -466,7 +466,7 @@
 static BOOLEAN
 find_program (STRING fname, STRING localdir, STRING *pfull,BOOLEAN include)
 {
-	STRING programsdir = getoptstr("LLPROGRAMS", ".");
+	STRING programsdir = getoptstr("LLPROGRAMS", "/usr/share/lifelines/reports");
 	FILE * fp = 0;
 	ZSTR zstr=zs_new();
 	BOOLEAN rtn=FALSE;
--- src/liflines/screen.c
+++ src/liflines/screen.c	2005-09-30 14:51:47.000000000 +0200
@@ -1889,7 +1889,7 @@
 		enqueue_list(list, strsave(zs_str(zstr)));
 	}
 
-	zs_setf(zstr, "TTPATH: %s", getoptstr("TTPATH", "."));
+	zs_setf(zstr, "TTPATH: %s", getoptstr("TTPATH", "/usr/share/lifelines/tt"));
 	enqueue_list(list, strsave(zs_str(zstr)));
 
 	display_list(_("Codeset information"), list);
@@ -2028,7 +2028,7 @@
 	}
 
 	/* Ask whence to load it */
-	ttimportdir = getoptstr("TTPATH", ".");
+	ttimportdir = getoptstr("TTPATH", "/usr/share/lifelines/tt");
 	fp = ask_for_input_file(LLREADTEXT, _(qSmintt), &fname, ttimportdir, ".tt");
 	if (fp) {
 		fclose(fp);