joachim99@2: KDiff3-Readme
joachim99@2: =============
joachim99@2: 
joachim99@2: Author: Joachim Eibl  (joachim.eibl@gmx.de)
joachim99@2: Copyright: (C) 2002 by Joachim Eibl
joachim99@2: KDiff3-Version: 0.81
joachim99@2: 
joachim99@2: 
joachim99@2: KDiff3 is a program that
joachim99@2: - compares two or three input files,
joachim99@2: - shows the differences line by line and character by character (!),
joachim99@2: - provides an automatic merge-facility and
joachim99@2: - an integrated editor for comfortable solving of merge-conflicts
joachim99@2: - and has an intuitive graphical user interface.
joachim99@2: 
joachim99@2: 
joachim99@2: Licence:
joachim99@2:     GNU GENERAL PUBLIC LICENSE, Version 2, June 1991
joachim99@2:     This program is free software; you can redistribute it and/or modify
joachim99@2:     it under the terms of the GNU General Public License as published by
joachim99@2:     the Free Software Foundation; either version 2 of the License, or
joachim99@2:     (at your option) any later version.
joachim99@2: 
joachim99@2:     This program is distributed in the hope that it will be useful,
joachim99@2:     but WITHOUT ANY WARRANTY; without even the implied warranty of
joachim99@2:     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
joachim99@2:     GNU General Public License for more details.
joachim99@2: 
joachim99@2:     You should have received a copy of the GNU General Public License
joachim99@2:     along with this program; if not, write to the Free Software
joachim99@2:     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
joachim99@2: 
joachim99@2:     For details see file "COPYING".
joachim99@2: 
joachim99@2: 
joachim99@2: Requirements & Installation:
joachim99@2:    Version 0.81 supports KDE2 and KDE3 but due to some problem with libkio and libkfile
joachim99@2:    it was necessary to provide different packages for each, but only the configure
joachim99@2:    script differs.
joachim99@2: 
joachim99@2:    For KDE2 you need
joachim99@2:       - kdiff3-0.81_for_KDE2.tar.gz
joachim99@2:       - KDE2 and QT2-libraries.
joachim99@2:       - gcc, g++ with version >=2.95      
joachim99@2:       
joachim99@2:    For KDE3 you need
joachim99@2:       - kdiff3-0.81_for_KDE3.tar.gz
joachim99@2:       - KDE3 and QT3-libraries.
joachim99@2:       - gcc, g++ with version >=2.95
joachim99@2: 
joachim99@2: Installation for KDE2:
joachim99@2:    - Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
joachim99@2:      If it doesn't contain the correct path, type
joachim99@2:         export QTDIR=your_path_to_qt  (e.g. /usr/lib/qt2)
joachim99@2:    - Unpack the archive: tar xvfz kdiff3-0.81_for_KDE2.tar.gz
joachim99@2:    - cd into the directory kdiff3-0.81 and type
joachim99@2:    - ./configure --prefix=/opt/kde2
joachim99@2:    - make
joachim99@2:    - make install  (You must have root-rights for this step.)
joachim99@2: 
joachim99@2: Installation for KDE3:
joachim99@2:    - Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
joachim99@2:      If it doesn't contain the correct path, type
joachim99@2:         export QTDIR=your_path_to_qt  (e.g. /usr/lib/qt3)
joachim99@2:    - Unpack the archive: tar xvfz kdiff3-0.81_for_KDE3.tar.gz
joachim99@2:    - cd into the directory kdiff3-0.81 and type
joachim99@2:    - ./configure --prefix=/opt/kde3
joachim99@2:    - make
joachim99@2:    - make install  (You must have root-rights for this step.)
joachim99@2: 
joachim99@2:    For details also see the generic instructions in file "INSTALL".
joachim99@2:    
joachim99@2: If some icons are not visible or don't seem right, probably the prefix
joachim99@2: was wrong. Check where you're KDE2/3 installation is located and
joachim99@2: use that directory with the prefix-option of configure.
joachim99@2: 
joachim99@2:    
joachim99@2: Start from commandline:
joachim99@2: - Comparing 2 files:     kdiff3 file1 file2
joachim99@2: - Merging 2 files:       kdiff3 file1 file2 -o outputfile
joachim99@2: - Comparing 3 files:     kdiff3 file1 file2 file3
joachim99@2: - Merging 3 files:       kdiff3 file1 file2 file3 -o outputfile
joachim99@2:      Note that file1 will be treated as base of file2 and file3.
joachim99@2: 
joachim99@2: If you start without arguments, then a dialog will appear where you can
joachim99@2: select your files via a filebrowser.
joachim99@2: 
joachim99@2: For more documentation, see the help-menu or the subdirectory doc.
joachim99@2: 
joachim99@2: Have fun!