cvs server: Diffing .
Index: ChangeLog
===================================================================
RCS file: /cvsroot/scigraphica/sg/ChangeLog,v
retrieving revision 0.37
retrieving revision 0.38
diff -r0.37 -r0.38
0a1,5
> 12/03/2001  John Bland:
>             docs/FAQ-developers.sgml, docs/TODO
>                Extra info on: Nightly tarballs, CVS branches, package
>                dependencies.
> 
cvs server: Diffing docs
Index: docs/FAQ-developers.sgml
===================================================================
RCS file: /cvsroot/scigraphica/sg/docs/FAQ-developers.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -r1.6 -r1.7
16c16
<    October 10th, 2001
---
>    December 3rd, 2001
116a117,130
>    <title>Nightly Snapshots</title>
>    <para>CVS access is a very useful way of keeping up to date with current developments but sometimes you
>    might find yourself unable to use it. The company you work for might have a firewall that blocks your
>    access, you might temporarily be on a machine without a CVS client etc. Don't worry! You can still obtain
>    the CVS code through a nightly snapshot.</para>
>    <para>Every night the SciGraphica CVS source tree is put into a
>    <ulink url="http://scigraphica.sourceforge.net/cvs/sg-nightly.tar.gz">tarball which you can
>    download<userinput>(http://scigraphica.sourceforge.net/cvs/sg-nightly.tar.gz)</userinput></ulink> with a
>    web browser. This can be unarchived as for a normal source tarball.</para>
>    <para>The only difference now between a normal source tarball and the nightly snapshot is that you need to
>    run the autogen.sh script to generate the configure and Makefile setup.</para>
>   </sect2>
>   
>   <sect2>
149a164,185
>    
>    <para>There will occasionally be branches of the CVS trunk made, usually before a new point release. That
>    branch can then be kept static apart from serious bugfixes whilst the main trunk carries on with
>    development. CVS makes this pretty easy to deal with. Let's say a new branch has been made called sg_x_y_z
>    ready for the x_y_z release. To move your local CVS copy to this branch you can use</para>
>    
>    <programlisting>
>     $ cvs update -r sg_x_y_z
>    </programlisting>
>    
>    <para>Any differences between your local copy and this branch are handled by CVS, including patching files,
>    adding new ones and deleting files which aren't in that branch. You can move back to the main trunk
>    with</para>
>    
>    <programlisting>
>     $ cvs update -r HEAD
>    </programlisting>
>    
>    <para>HEAD is the main CVS source tree. You can switch between branches in this way to edit particular
>    things, commit them and then move back to your original branch without having to utilise different
>    directories for different versions, although you can do this as well if you wish.</para>
>    
178c214
<  <! COMPILING ISSUES>
---
>  <!-- COMPILING ISSUES -->
201c237
<   <! PACKAGE DEPENDECIES>
---
>   <!-- PACKAGE DEPENDECIES -->
206c242,243
<    libraries. Here is a list of the packages you must have installed in order that SciGraphica can be compiled.
---
>    libraries. Here is a list of the packages you must have installed in order that SciGraphica can be compiled
>    (as of V0.8.0).
208a246,298
>    <itemizedlist>
>     <listitem>
>      <para>X11R6</para>
>     </listitem>
>     <listitem>
>      <para>GTK+ >= 1.2.0 (GUI library)</para>
>     </listitem>
>     <listitem>
>      <para>Gtk+Extra >= 0.99.17 (Extra useful widgets)</para>
>     </listitem>
>     <listitem>
>      <para>Python >= 1.5.2</para>
>     </listitem>
>     <listitem>
>      <para>Numerical Python >= 17.3.0 (Numerical extensions to Python)</para>
>     </listitem>
>     <listitem>
>      <para>LibXML (For manipulating XML files, used in SciGraphica file formats)</para>
>     </listitem>
>     <listitem>
>      <para>Zlib (For gzip compression, used in SciGraphica files)</para>
>     </listitem>
>     <listitem>
>      <para>Readline >= 4.0 (or 2.05 as comes with bash)</para>
>     </listitem>
>     <listitem>
>      <para>Termcap</para>
>     </listitem>
>     <listitem>
>      <para>Ncurses</para>
>     </listitem>
>     <listitem>
>      <para>Imlib >= 1.9.7 (General graphics handling)</para>
>     </listitem>
>    </itemizedlist>
> 
>    <para>You will also need any relavent -devel packages (eg imlib-devel). Optionally SciGraphica can utilise
>    GNOME support with the following packages (plus their -devel counterparts)</para>
> 
>    <itemizedlist>
>     <listitem>
>      <para>GNOME >= 1.4.0</para>
>     </listitem>
>     <listitem>
>      <para>GNOME-print</para>
>     </listitem>
>     <listitem>
>      <para>GNOME-libs</para>
>     </listitem>
>    </itemizedlist>
> 
>    <para>A working C compiler and development environemt is assumed ;0).</para>
> 
211c301
<   <! CONFIGURE PROBLEMS>  
---
>   <!-- CONFIGURE PROBLEMS -->  
Index: docs/TODO
===================================================================
RCS file: /cvsroot/scigraphica/sg/docs/TODO,v
retrieving revision 1.1
retrieving revision 1.2
diff -r1.1 -r1.2
4d3
< Extra info about cvs branches.
cvs server: Diffing docs/FAQ-developers
cvs server: Diffing examples
cvs server: Diffing macros
cvs server: Diffing pixmaps
cvs server: Diffing src
Index: src/sg.h
===================================================================
RCS file: /cvsroot/scigraphica/sg/src/sg.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -r1.10 -r1.11
39d38
< #include "sg_import_dialog.h"
Index: src/sg_preferences_dialog.c
===================================================================
RCS file: /cvsroot/scigraphica/sg/src/sg_preferences_dialog.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -r1.29 -r1.30
194c194
<                     compression_info={1,9,&compress_init,&compress_apply};
---
>                     compression_info={0,9,&compress_init,&compress_apply};
cvs server: Diffing src/python
Index: src/python/Makefile.am
===================================================================
RCS file: /cvsroot/scigraphica/sg/src/python/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -r1.25 -r1.26
2c2,3
< 	-I$(includedir) $(PY_CFLAGS) $(GTK_EXTRA_CFLAGS) -I.. \
---
> 	-I$(includedir) $(PY_CFLAGS) $(GTK_EXTRA_CFLAGS) \
> 	-I$(top_srcdir) -I$(top_srcdir)/src \
7,20c8,27
< libpint_a_SOURCES = \
< python_config.c \
< python_sheet.c \
< python_command.c \
< import_data.c \
< python_int.c \
< python_term.c \
< python_config.h \
< python_command.h \
< import_data.h \
< python_int.h \
< python_main.h \
< python_sheet.h \
< python_term.h
---
> libpint_a_c_sources = \
> 	python_config.c \
> 	python_sheet.c \
> 	python_command.c \
> 	import_data.c \
> 	python_int.c \
> 	python_term.c
> 
> libpint_a_h_sources = \
> 	python_config.h \
> 	python_command.h \
> 	import_data.h \
> 	python_int.h \
> 	python_main.h \
> 	python_sheet.h \
> 	python_term.h
> 
> libpint_a_SOURCES =  \
> 	$(libpint_a_c_sources) \
> 	$(libpint_a_h_sources)
25,37c32,42
< clarens.py \
< clarens_histograms.py \
< FitWizard.py \
< gtkLeastSquares.py \
< pysga.py \
< pstat.py \
< SimpleStats.py \
< sgagtk.py \
< stats.py \
< test_plugin.py \
< unpickler.py 
< 
< 
---
> 	clarens.py \
> 	clarens_histograms.py \
> 	FitWizard.py \
> 	gtkLeastSquares.py \
> 	pysga.py \
> 	pstat.py \
> 	SimpleStats.py \
> 	sgagtk.py \
> 	stats.py \
> 	test_plugin.py \
> 	unpickler.py 
40,52d44
< Pythonexec_DATA = \
< clarens.py \
< clarens_histograms.py \
< FitWizard.py \
< gtkLeastSquares.py \
< pstat.py \
< pysga.py \
< sgagtk.py \
< SimpleStats.py \
< stats.py \
< test_plugin.py \
< unpickler.py 
< 
53a46,57
> Pythonexec_DATA = \
> 	clarens.py \
> 	clarens_histograms.py \
> 	FitWizard.py \
> 	gtkLeastSquares.py \
> 	pstat.py \
> 	pysga.py \
> 	sgagtk.py \
> 	SimpleStats.py \
> 	stats.py \
> 	test_plugin.py \
> 	unpickler.py 
Index: src/python/python_command.c
===================================================================
RCS file: /cvsroot/scigraphica/sg/src/python/python_command.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -r1.22 -r1.23
12c12
< #include "../sg.h"
---
> #include "sg.h"
Index: src/python/python_config.c
===================================================================
RCS file: /cvsroot/scigraphica/sg/src/python/python_config.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -r1.31 -r1.32
14d13
< #include "../sg_dataset.h"
16d14
< #include "sg_config.h"
Index: src/python/python_int.c
===================================================================
RCS file: /cvsroot/scigraphica/sg/src/python/python_int.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -r1.80 -r1.81
17,20c17,18
< #include "../sg.h"
< #include "../sg_project_autosave.h"
< #include "../sg_config.h"
< #include "../sg_dialogs.h"
---
> #include "sg.h"
> #include "sg_dialogs.h"
Index: src/python/python_sheet.c
===================================================================
RCS file: /cvsroot/scigraphica/sg/src/python/python_sheet.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -r1.91 -r1.92
16,17c16,17
< #include "../sg.h"
< #include "../sg_wrap.h"
---
> #include "sg.h"
> #include "sg_wrap.h"
Index: src/python/python_sheet.h
===================================================================
RCS file: /cvsroot/scigraphica/sg/src/python/python_sheet.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -r1.9 -r1.10
6c6
< #include "../sg_worksheet.h"
---
> #include "sg_worksheet.h"
Index: src/python/python_term.c
===================================================================
RCS file: /cvsroot/scigraphica/sg/src/python/python_term.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -r1.51 -r1.52
63,64c63,64
< #include "../sg.h"
< #include "../../config.h"
---
> #include "sg.h"
> #include "config.h"
66c66
< #include "../pixmaps/python_small.xpm"
---
> #include "pixmaps/python_small.xpm"
cvs server: Diffing zvt