- export2cpan also copies the Copyright notice

- README corrected for winXP
  (addition of affiliation for authors / contributors)

2 files changed, 18 insertions, 14 deletions

diff --git a/Perl/README b/Perl/README
index e090549..a59cfea 100644
--- a/Perl/README
+++ b/Perl/README
@@ -2,7 +2,7 @@ Tk::Zinc - another Canvas which proposes many new functions, some based on openG
 
 Tk::Zinc for Perl/Tk is available for Linux, Windows and MacOSX. 
 the easiest way could be to use he CPAN. However new releases are usually 
-first available on www.tkzinc.org/
+first available on www.tkzinc.org
 
 
 * On a Linux system, you need Perl (>= 5.6) and perl-tk (800 or 804) packages.
@@ -15,16 +15,18 @@ first available on www.tkzinc.org/
   - X11 et X11 sdk from Apple (http://www.apple.com/macosx/x11/)
 
 * On WinXP you need:
-  - perl and perl-tk 804, 
-  - Visual C++ or the Free Visual C++ Command Line Tools
-
+  - activeperl (5.8.6.811 or higher) from activatestate.com 
+  - and
+    - if you want to compile TkZinc by yourself:
+      Visual C++ or the Free Visual C++ Command Line Tools
+    - or the TkZinc msi package available from www.tkzinc.org
 
 
 Install:
 
   perl Makefile.PL
-  # you can use the following options: --with-gl=yes|no --with-om=yes|no --with-shape=yes|no
-  # current defaults are  --with-gl=yes --with-om=yes --with-shape=yes
+  # you can use the following options: --with-gl=yes|no --with-atc=yes|no --with-shape=yes|no
+  # current defaults are  --with-gl=yes --with-atc=yes --with-shape=yes
 
   make
   make test
@@ -49,8 +51,7 @@ up-to-date documentation is also available at http://www.tkzinc.org/index.php/Ma
 You will find there the reference manual, a FAQ, a mailing list, its archive
 etc...
 The source of the reference manual is available in the full source package,
-which also includes TkZinc for Tcl/Tk, for Perl/Tk, and for Python (Python binding
-are now obsoletes).
+which also includes TkZinc for Tcl/Tk, for Perl/Tk, and for Python.
 
 
 After installation, we recommend you to launch the zinc-demos script,
@@ -60,8 +61,8 @@ For more information on building Tk::Zinc, a README is available in
 the tkzinc-*tgz tar file (on Tkzinc web site) used for building all
 flavor of TkZinc (ie tcl, perl and python)
 
-This software is delivered under LGPL licence.
-For the copyright, please, read the COPYRIGHT file.
+This software is delivered under new  BSD licence.
+For the copyright, please, read the Copyright file.
 
 For any question on Tk::Zinc usage, build or installation pb,
 please send email to zinc@tls.cena.fr 
@@ -73,9 +74,10 @@ for a confirmation to avoid spam on the list!
 
 Authors and Contributors:
 
-Tk::Zinc main author is Patrick Lecoanet
+Tk::Zinc main author is Patrick Lecoanet (CENA)
 Sub-Modules, demos and documentation have been developped by
-Daniel Etienne, Christophe Mertz, Jean-Luc Vinot, with contributions 
-from Stéphane Chatty, Céline Schlienger, Alexandre Lemort
-Stéphane Conversy contributed to the MacOSX port.
+Daniel Etienne (CENA), Christophe Mertz (formerly CENA and now IntuiLab), 
+Jean-Luc Vinot (CENA), with contributions from Stéphane Chatty (Intuilab), 
+Céline Schlienger (IntuiLab), Alexandre Lemort (IntuiLab)
+Stéphane Conversy (CENA) contributed to the MacOSX port.
 Many others contributed with their bug reports!
diff --git a/Perl/export2cpan b/Perl/export2cpan
index 830e243..cb17bd8 100755
--- a/Perl/export2cpan
+++ b/Perl/export2cpan
@@ -15,6 +15,7 @@
 # The source files are taken from the working directory. This is
 # the anticipated behavior when developping/testing or making
 # a debian package from the rules file.
+# this script has been provided by mertz @ intuilab dot com
 # $Id$
 
 use strict;
@@ -157,6 +158,7 @@ foreach my $f (@files) {
 # modifying the $VERSION of Zinc.pm with the correctly perl formated version scheme.
 &filesubst ('Zinc.pm', "$EXPORT_DIR/$VERSION_DIR/Zinc.pm", '^\$VERSION *=.*;', "\$VERSION = $VERSION;");
 
+system("$CP ../Copyright $EXPORT_DIR/$VERSION_DIR");
 system("$CP Makefile.PL $EXPORT_DIR/$VERSION_DIR");
 system("$CP ../generic/*.c $EXPORT_DIR/$VERSION_DIR");
 system("$CP ../generic/*.h $EXPORT_DIR/$VERSION_DIR");