- obsolete

Changed files:
    plplot-am18.patch -> 1.2
    plplot-conflict.patch -> 1.2

diff --git a/plplot-am18.patch b/plplot-am18.patch
deleted file mode 100644 (file)
index 22adcd5..0000000
--- a/plplot-am18.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- plplot-5.2.1/utils/Makefile.am.orig        2003-03-06 13:40:36.000000000 +0100
-+++ plplot-5.2.1/utils/Makefile.am     2004-02-01 01:32:54.920491019 +0100
-@@ -25,10 +25,11 @@
- AM_CPPFLAGS = $(INCLTDL) -I../bindings/tcl $(TCLINCCMD) $(ITCLINCCMD)
- 
- if enable_tcl
--bin_PROGRAMS = plrender pltek pltcl
-+pltclprog = pltcl
- else
--bin_PROGRAMS = plrender pltek
-+pltclprog =
- endif
-+bin_PROGRAMS = plrender pltek $(pltclprog)
- 
- plrender_SOURCES = plrender.c
- plrender_LDFLAGS = $(RPATH) -no-undefined

diff --git a/plplot-conflict.patch b/plplot-conflict.patch
deleted file mode 100644 (file)
index fe6d635..0000000
--- a/plplot-conflict.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- plplot-5.3.0/drivers/linuxvga.c.orig       2004-01-19 20:10:19.000000000 +0100
-+++ plplot-5.3.0/drivers/linuxvga.c    2004-03-07 02:20:02.895178672 +0100
-@@ -35,7 +35,7 @@
- 
- static void lxvga_text        (PLStream *pls);
- static void lxvga_graph       (PLStream *pls);
--static void pause     (PLStream *pls);
-+static void lxvga_pause       (PLStream *pls);
- 
- /* INDENT ON */
- 
-@@ -158,7 +158,7 @@
- plD_eop_vga(PLStream *pls)
- {
-     if (page_state == DIRTY)
--      pause(pls);
-+      lxvga_pause(pls);
- 
-     /* vga_setmode(mode); */
-     vga_clear();              /* just clean it */
-@@ -255,7 +255,7 @@
- {
-     if (pls->graphx == GRAPHICS_MODE) {
-       if (page_state == DIRTY)
--          pause(pls);
-+          lxvga_pause(pls);
-       vga_setmode(TEXT);
-       pls->graphx = TEXT_MODE;
-     }
-@@ -278,13 +278,13 @@
- }
- 
- /*--------------------------------------------------------------------------*\
-- * pause()
-+ * lxvga_pause()
-  *
-  * Wait for a keystroke.
- \*--------------------------------------------------------------------------*/
- 
- static void
--pause(PLStream *pls)
-+lxvga_pause(PLStream *pls)
- {
-     if (pls->nopause) 
-       return;