head	1.2;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.1
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_2_STABLE:1.1
	OPENPKG_E1_FP:1.1
	OPENPKG_2_STABLE_MP:1.2
	OPENPKG_2_STABLE_20061018:1.1
	OPENPKG_2_STABLE_20060622:1.1
	OPENPKG_2_STABLE:1.1.0.2
	OPENPKG_2_STABLE_BP:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.03.04.10.26.31;	author rse;	state Exp;
branches;
next	1.1;
commitid	uJyl9np6oEpk5L8s;

1.1
date	2006.03.07.14.32.13;	author rse;	state Exp;
branches
	1.1.2.1;
next	;
commitid	3jcjy5PRWOg25gor;

1.1.2.1
date	2007.03.18.23.31.16;	author thl;	state Exp;
branches;
next	;
commitid	j886gsownDQWXCas;


desc
@@


1.2
log
@upgrading package: gnuplot 4.0.0 -> 4.2.0
@
text
@Index: src/color.c
--- src/color.c.orig	2007-02-26 00:10:01 +0100
+++ src/color.c	2007-03-04 11:09:56 +0100
@@@@ -70,7 +70,7 @@@@
 
 
 void
-init_color()
+gnuplot_init_color()
 {
   /* initialize global palette */
   sm_palette.colorFormulae = 37;  /* const */
Index: src/color.h
--- src/color.h.orig	2006-06-15 17:42:33 +0200
+++ src/color.h	2007-03-04 11:20:16 +0100
@@@@ -203,7 +203,7 @@@@
 /* ROUTINES */
 
 
-void init_color __PROTO((void));  /* call once to initialize variables */
+void gnuplot_init_color __PROTO((void));  /* call once to initialize variables */
 
 
 /*
Index: src/plot.c
--- src/plot.c.orig	2007-02-10 04:55:59 +0100
+++ src/plot.c	2007-03-04 11:20:31 +0100
@@@@ -556,7 +556,7 @@@@
 	 * would set them to. Since the axis variables aren't in
 	 * initialized arrays any more, this is now necessary... */
 	reset_command();
-	init_color();  /*  Initialization of color  */
+	gnuplot_init_color();  /*  Initialization of color  */
 	load_rcfile();
 	init_fit();		/* Initialization of fitting module */
 
@


1.1
log
@fix building by removing symbol conflict with NCurses init_color() function
@
text
@d2 3
a4 3
--- src/color.c.orig	2003-12-15 00:23:04 +0100
+++ src/color.c	2006-03-07 15:19:52 +0100
@@@@ -66,7 +66,7 @@@@
d13 12
d26 4
a29 3
--- src/plot.c.orig	2004-04-14 17:26:21 +0200
+++ src/plot.c	2006-03-07 15:19:58 +0100
@@@@ -525,7 +525,7 @@@@
a31 1
 #ifdef PM3D
a33 1
 #endif /* PM3D */
d36 1
@


1.1.2.1
log
@MFC: make up leeway for 2_STABLE by virtue of build-time results
@
text
@d2 3
a4 3
--- src/color.c.orig	2007-02-26 00:10:01 +0100
+++ src/color.c	2007-03-04 11:09:56 +0100
@@@@ -70,7 +70,7 @@@@
a12 12
Index: src/color.h
--- src/color.h.orig	2006-06-15 17:42:33 +0200
+++ src/color.h	2007-03-04 11:20:16 +0100
@@@@ -203,7 +203,7 @@@@
 /* ROUTINES */
 
 
-void init_color __PROTO((void));  /* call once to initialize variables */
+void gnuplot_init_color __PROTO((void));  /* call once to initialize variables */
 
 
 /*
d14 3
a16 4
--- src/plot.c.orig	2007-02-10 04:55:59 +0100
+++ src/plot.c	2007-03-04 11:20:31 +0100
@@@@ -556,7 +556,7 @@@@
 	 * would set them to. Since the axis variables aren't in
d19 1
d22 1
a24 1
 
@