CVS update: PyukiWiki-Devel/build (Pyukiwiki-cvs 0004128) - PyukiWiki

Index: PyukiWiki-Devel/build/build.pl
diff -u PyukiWiki-Devel/build/build.pl:1.444 PyukiWiki-Devel/build/build.pl:1.445

--- PyukiWiki-Devel/build/build.pl:1.444	Sun Jan 29 05:07:40 2012
+++ PyukiWiki-Devel/build/build.pl	Sun Jan 29 07:31:08 2012
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # release file perl script for pyukiwiki
-# $Id: build.pl,v 1.444 2012/01/28 20:07:40 papu Exp $
+# $Id: build.pl,v 1.445 2012/01/28 22:31:08 papu Exp $
 
 $DIR=$ARGV[0];
 $TYPE=$ARGV[1];
@@ -511,7 +511,7 @@
 			}
 		}
 		# for sorceforge url
-		s/L\<\@\@CVSURL\@\@(.*)\>/L\<\@\@CVSURL\@\@$1\?view\=log\>/g;
+		s/L\<http://sfjp.jp/cvs/view/pyukiwiki(.*)\>/L\<http://sfjp.jp/cvs/view/pyukiwiki$1\?view\=log\>/g;
 
 		# for yuicompress direct source
 		if(/\@\@yuicompressor\_(.+)\=\"(.+)\"\@\@/) {
@@ -573,12 +573,12 @@
 			}
 			s/([\s\t]+)?$//g;
 			$s=$_;
-			if($s=~/\@\@CVSURL\@\@/) {
+			if($s=~/http://sfjp.jp/cvs/view/pyukiwiki/) {
 				$tmps=$s;
-				$tmps=~s!\@\@CVSURL\@\@/PyukiWiki\-Devel/!\@\@CVSURL\@\@/PyukiWiki\-Devel\-UTF8/!g;
+				$tmps=~s!http://sfjp.jp/cvs/view/pyukiwiki/PyukiWiki\-Devel/!http://sfjp.jp/cvs/view/pyukiwiki/PyukiWiki\-Devel\-UTF8/!g;
 				$s.="\n\n$tmps";
 			}
-			while($s=~/\@\@(.+?)\@\@/) {
+			while($s=~//) {
 				$rep=$1;
 				$s=~s/\@\@$rep\@\@/$text{$rep}/g;
 				if($filemode eq 'crlf') {
@@ -588,6 +588,16 @@
 				}
 				last if($ii++>10);
 			}
+			while($s=~/\\\@\\\@(.+?)\\\@\\\@/) {
+				$rep=$1;
+				$s=~s/\\\@\\\@$rep\\\@\\\@/$text{$rep}/g;
+				if($filemode eq 'crlf') {
+					$s=~s/\x0D\x0A|\x0D|\x0A/\r\n/g;
+				} else {
+					$s=~s/\x0D\x0A|\x0D|\x0A/\n/g;
+				}
+				last if($ii++>10);
+			}
 			if(!($file=~/\.txt$/ && $s=~/test/) || $debug eq 1) {
 				chomp $s;
 				if($s ne '' || $commentcut eq 0 || $old=~/$ignore_crlfcut/) {
Index: PyukiWiki-Devel/build/compressfile.pl
diff -u PyukiWiki-Devel/build/compressfile.pl:1.301 PyukiWiki-Devel/build/compressfile.pl:1.302
--- PyukiWiki-Devel/build/compressfile.pl:1.301	Sun Jan 29 05:07:40 2012
+++ PyukiWiki-Devel/build/compressfile.pl	Sun Jan 29 07:31:08 2012
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # yuicompressor script
-# $Id: compressfile.pl,v 1.301 2012/01/28 20:07:40 papu Exp $
+# $Id: compressfile.pl,v 1.302 2012/01/28 22:31:08 papu Exp $
 
 $mode=$ARGV[0];
 $output=$ARGV[1];
@@ -13,7 +13,7 @@
 $convert{euc}="perl ./build/Jcode-convert.pl euc";
 
 if($ARGV[3] eq '') {
-	$top="/* \@\@PYUKIWIKIVERSION\@\@ */\n/* \$Id\$ */\n\n";
+	$top="/* "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ */\n/* \$Id\$ */\n\n";
 #	$top="/* \@charset \"Shift_JIS\"; */\n/* If use japanese font, use @charset */\n"
 #		. $top
 #		if($mode eq "css");
Index: PyukiWiki-Devel/build/installer_sub.sh
diff -u PyukiWiki-Devel/build/installer_sub.sh:1.3 PyukiWiki-Devel/build/installer_sub.sh:1.4
--- PyukiWiki-Devel/build/installer_sub.sh:1.3	Sun Jan 29 05:01:28 2012
+++ PyukiWiki-Devel/build/installer_sub.sh	Sun Jan 29 07:31:08 2012
@@ -6,8 +6,8 @@
 DOCTYPE='<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'
 HEADJA='<html><head><title>PyukiWikiã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©</title><link rel="stylesheet" href="http://pyukiwiki.sourceforge.jp/skin/pyukiwiki.default.css" type="text/css" media="screen" charset="EUC-JP"></head>'
 HEADEN='<html><head><title>PyukiWiki Installer</title><link rel="stylesheet" href="http://pyukiwiki.sourceforge.jp/skin/pyukiwiki.default.css" type="text/css" media="screen" charset="EUC-JP"></head>'
-FOOTJA='<hr><div id="footer"><strong><a href="\@\@PYUKI_URL\@\@" class="link" title="PyukiWiki Installer \@\@PYUKIVER\@\@">PyukiWiki Installer \@\@PYUKIVER\@\@</a></strong>Copyright&copy; 2004-\@\@YEAR\@\@ by <a href="\@\@NEKYO_URL\@\@" class="link" title="Nekyo">Nekyo</a>, <a href="\@\@PYUKI_URL\@\@" class="link" title="PyukiWiki Developers Team">PyukiWiki Developers Team</a>License is <a href="\@\@GPLJP_URL\@\@" class="link" title="GPL">GPL</a>, <a href="\@\@ARTISTICJP_URL\@\@" class="link" title="Artistic">Artistic</a><br>Based on &quot;<a href="\@\@YUKIWIKI_URL\@\@" class="link" title="YukiWiki">YukiWiki</a>&quot; 2.1.0 by <a href="\@\@YUKI_URL\@\@" class="link" title="yuki">yuki</a>and <a href="\@\@PUKIWIKI_URL\@\@" class="link" title="PukiWiki">PukiWiki</a> by <a href="\@\@PUKIWIKI_URL\@\@" class="link" title="PukiWiki Developers Term">\@\@PUKIWIKIDEV_URL\@\@</a><br></div></div></div></body></html>'
-FOOTEN='<hr><div id="footer"><strong><a href="\@\@PYUKI_URL\@\@" class="link" title="PyukiWiki Installer \@\@PYUKIVER\@\@">PyukiWiki Installer \@\@PYUKIVER\@\@</a></strong>Copyright&copy; 2004-\@\@YEAR\@\@ by <a href="\@\@NEKYO_URL\@\@" class="link" title="Nekyo">Nekyo</a>, <a href="\@\@PYUKI_URL\@\@" class="link" title="PyukiWiki Developers Team">PyukiWiki Developers Team</a>License is <a href="\@\@GPL_URL\@\@" class="link" title="GPL">GPL</a>, <a href="\@\@ARTISTIC_URL\@\@" class="link" title="Artistic">Artistic</a><br>Based on &quot;<a href="\@\@YUKIWIKI_URL\@\@" class="link" title="YukiWiki">YukiWiki</a>&quot; 2.1.0 by <a href="\@\@YUKI_URL\@\@" class="link" title="yuki">yuki</a>and <a href="\@\@PUKIWIKI_URL\@\@" class="link" title="PukiWiki">PukiWiki</a> by <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki Developers Term">\@\@PUKIWIKIDEV_URL\@\@</a><br></div></div></div></body></html>'
+FOOTJA='<hr><div id="footer"><strong><a href="http://pyukiwiki.sfjp.jp/" class="link" title="PyukiWiki Installer 0.2.0-p1-preview2-p2">PyukiWiki Installer 0.2.0-p1-preview2-p2</a></strong>Copyright&copy; 2004-2012 by <a href="http://nekyo.qp.land.to/" class="link" title="Nekyo">Nekyo</a>, <a href="http://pyukiwiki.sfjp.jp/" class="link" title="PyukiWiki Developers Team">PyukiWiki Developers Team</a>License is <a href="http://sfjp.jp/projects/opensource/wiki/GPLv3_Info" class="link" title="GPL">GPL</a>, <a href="http://www.opensource.jp/artistic/ja/Artistic-ja.html" class="link" title="Artistic">Artistic</a><br>Based on &quot;<a href="http://www.hyuki.com/yukiwiki/" class="link" title="YukiWiki">YukiWiki</a>&quot; 2.1.0 by <a href="http://www.hyuki.com/" class="link" title="yuki">yuki</a>and <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki">PukiWiki</a> by <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki Developers Term">http://pukiwiki.sfjp.jp/<
 /a><br></div></div></div></body></html>'
+FOOTEN='<hr><div id="footer"><strong><a href="http://pyukiwiki.sfjp.jp/" class="link" title="PyukiWiki Installer 0.2.0-p1-preview2-p2">PyukiWiki Installer 0.2.0-p1-preview2-p2</a></strong>Copyright&copy; 2004-2012 by <a href="http://nekyo.qp.land.to/" class="link" title="Nekyo">Nekyo</a>, <a href="http://pyukiwiki.sfjp.jp/" class="link" title="PyukiWiki Developers Team">PyukiWiki Developers Team</a>License is <a href="http://www.gnu.org/licenses/gpl.html" class="link" title="GPL">GPL</a>, <a href="http://www.perl.com/language/misc/Artistic.html" class="link" title="Artistic">Artistic</a><br>Based on &quot;<a href="http://www.hyuki.com/yukiwiki/" class="link" title="YukiWiki">YukiWiki</a>&quot; 2.1.0 by <a href="http://www.hyuki.com/" class="link" title="yuki">yuki</a>and <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki">PukiWiki</a> by <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki Developers Term">http://pukiwiki.sfjp.jp/</a><br></div></div><
 /div></body></html>'
 
 getversion() {
 	# pyukiwiki
Index: PyukiWiki-Devel/build/text.pl
diff -u PyukiWiki-Devel/build/text.pl:1.401 PyukiWiki-Devel/build/text.pl:1.402
--- PyukiWiki-Devel/build/text.pl:1.401	Sun Jan 29 05:07:40 2012
+++ PyukiWiki-Devel/build/text.pl	Sun Jan 29 07:31:08 2012
@@ -1,5 +1,5 @@
 # release file perl script for pyukiwiki
-# $Id: text.pl,v 1.401 2012/01/28 20:07:40 papu Exp $
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 
 use Jcode;
 
@@ -15,11 +15,11 @@
 $text{YEAR}=$year;
 if($TYPE=~/compact/) {
 $text{BASEHEAD1}=<<EOM;
-\@\@FILENAME\@\@ - \$Id\$
+text.pl - \$Id\$
 EOM
 } else {
 $text{BASEHEAD1}=<<EOM;
-\@\@FILENAME\@\@ - This is PyukiWiki, yet another Wiki clone.
+text.pl - This is PyukiWiki, yet another Wiki clone.
 # \$Id\$
 EOM
 }
@@ -27,204 +27,223 @@
 if($TYPE=~/compact/) {
 $text{BASEHEAD2}=<<EOM;
 Copyright(C) 2005-$year PyukiWiki Developers Team/2004-$year Nekyo
-# \@\@PYUKI_URL\@\@  \@\@NEKYO_URL\@\@
-# @\@CRLF\@\@ \@\@CODE\@\@ 4Spaces GPL2 and/or Artistic License
+# http://pyukiwiki.sfjp.jp/  http://nekyo.qp.land.to/
+# @\@CRLFCODE\@\@ 4Spaces GPL2 and/or Artistic License
 EOM
 $text{BASEHEAD4}=<<EOM;
 Copyright(C)2000-$year - Laurent Destailleur - <eldy (at) users (dot) sourceforge (dot) net>
-# \@\@AWSTATS_URL\@\@
+# http://awstats.sf.net/
 Copyright(C) 2005-$year PyukiWiki Developers Team/2004-$year Nekyo
-# \@\@PYUKI_URL\@\@  \@\@NEKYO_URL\@\@
-# @\@CRLF\@\@ \@\@CODE\@\@ 4Spaces GPL2 and/or Artistic License
+# http://pyukiwiki.sfjp.jp/  http://nekyo.qp.land.to/
+# @\@CRLFCODE\@\@ 4Spaces GPL2 and/or Artistic License
 EOM
 } else {
 $text{BASEHEAD2}=<<EOM;
 Copyright (C) 2004-$year Nekyo
-# \@\@NEKYO_URL\@\@
+# http://nekyo.qp.land.to/
 # Copyright (C) 2005-$year PyukiWiki Developers Team
-# \@\@PYUKI_URL\@\@
-# Based on YukiWiki \@\@YUKIWIKI_URL\@\@
-# Powerd by PukiWiki \@\@PUKIWIKI_URL\@\@
+# http://pyukiwiki.sfjp.jp/
+# Based on YukiWiki http://www.hyuki.com/yukiwiki/
+# Powerd by PukiWiki http://pukiwiki.sfjp.jp/
 # License: GPL2 and/or Artistic or each later version
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the same terms as Perl itself.
-# Return:\@\@CRLF\@\@ Code=\@\@CODE\@\@ 1TAB=4Spaces
+# Return:LF Code=EUC-JP 1TAB=4Spaces
 EOM
 $text{BASEHEAD4}=<<EOM;
 Copyright (C) 2000-$year - Laurent Destailleur - <eldy (at) users (dot) sourceforge (dot) net>
-# \@\@AWSTATS_URL\@\@
+# http://awstats.sf.net/
 # Copyright (C) 2004-$year Nekyo
-# \@\@NEKYO_URL\@\@
+# http://nekyo.qp.land.to/
 # Copyright (C) 2005-$year PyukiWiki Developers Team
-# \@\@PYUKI_URL\@\@
-# Based on YukiWiki \@\@YUKIWIKI_URL\@\@
-# Powerd by PukiWiki \@\@PUKIWIKI_URL\@\@
+# http://pyukiwiki.sfjp.jp/
+# Based on YukiWiki http://www.hyuki.com/yukiwiki/
+# Powerd by PukiWiki http://pukiwiki.sfjp.jp/
 # License: GPL2 and/or Artistic or each later version
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the same terms as Perl itself.
-# Return:\@\@CRLF\@\@ Code=\@\@CODE\@\@ 1TAB=4Spaces
+# Return:LF Code=EUC-JP 1TAB=4Spaces
 EOM
 }
 
 $text{HEADER1}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@PYUKIWIKIVERSION\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
 # $text{BASEHEAD2}
 EOM
 
 if($TYPE=~/compact/) {
 
 $text{HEADER2_NEKYO}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@PYUKIWIKIVERSION\@\@
-# Author: \@\@NEKYO\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
+# Author: Nekyo
 # $text{BASEHEAD2}
 EOM
 
 $text{HEADER2_NANAMI}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@PYUKIWIKIVERSION\@\@
-# Author: \@\@NANAMI\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
+# Author: Nanami
 # $text{BASEHEAD2}
 EOM
 
 $text{HEADER2_YUKI}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@PYUKIWIKIVERSION\@\@
-# Author: \@\@YUKI\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
+# Author: Hiroshi Yuki
 # $text{BASEHEAD2}
 EOM
 
 $text{HEADER2_JUNICHI}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@PYUKIWIKIVERSION\@\@
-# Author: \@\@JUNICHI\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
+# Author: Junichi
 # $text{BASEHEAD2}
 EOM
 
 $text{HEADER2_YASHIGANIMODOKI}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@PYUKIWIKIVERSION\@\@
-# Author: \@\@YASHIGANIMODOKI\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
+# Author: YashiganiModoki
 # $text{BASEHEAD2}
 EOM
 
 $text{HEADER3_NANAMI}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@MODULEVERSION\@\@
-# Author: \@\@NANAMI\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
+# Author: Nanami
 # $text{BASEHEAD2}
 EOM
 
 $text{HEADER3_YUKI}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@MODULEVERSION\@\@
-# Author: \@\@YUKI\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
+# Author: Hiroshi Yuki
 # $text{BASEHEAD2}
 EOM
 
 $text{HEADER4_AWS}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@PYUKIWIKIVERSION\@\@
-# Author: \@\@NANAMI\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
+# Author: Nanami
 # $text{BASEHEAD4}
 EOM
 
 } else {
 
 $text{HEADER2_NEKYO}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@PYUKIWIKIVERSION\@\@
-# Author: \@\@NEKYO\@\@ \@\@NEKYO_URL\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
+# Author: Nekyo http://nekyo.qp.land.to/
 # $text{BASEHEAD2}
 EOM
 
 $text{HEADER2_NANAMI}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@PYUKIWIKIVERSION\@\@
-# Author: \@\@NANAMI\@\@ \@\@NANAMI_URL\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
+# Author: Nanami http://nanakochi.daiba.cx/
 # $text{BASEHEAD2}
 EOM
 
 $text{HEADER2_YUKI}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@PYUKIWIKIVERSION\@\@
-# Author: \@\@YUKI\@\@ \@\@YUKI_URL\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
+# Author: Hiroshi Yuki http://www.hyuki.com/
 # $text{BASEHEAD2}
 EOM
 
 $text{HEADER2_JUNICHI}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@PYUKIWIKIVERSION\@\@
-# Author: \@\@JUNICHI\@\@ \@\@JUNICHI_URL\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
+# Author: Junichi http://www.re-birth.com/
 # $text{BASEHEAD2}
 EOM
 
 $text{HEADER2_YASHIGANIMODOKI}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@PYUKIWIKIVERSION\@\@
-# Author: \@\@YASHIGANIMODOKI\@\@
-#         \@\@YASHIGANIMODOKI_URL\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
+# Author: YashiganiModoki
+#         http://hpcgi1.nifty.com/it2f/wikinger/pyukiwiki.cgi
 # $text{BASEHEAD2}
 EOM
 
 $text{HEADER3_NANAMI}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@MODULEVERSION\@\@
-# Author: \@\@NANAMI\@\@
-# \@\@NANAMI_URL\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
+# Author: Nanami
+# http://nanakochi.daiba.cx/
 # $text{BASEHEAD2}
 EOM
 
 $text{HEADER3_YUKI}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@MODULEVERSION\@\@
-# Author: \@\@YUKI\@\@
-# \@\@YUKI_URL\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
+# Author: Hiroshi Yuki
+# http://www.hyuki.com/
 # $text{BASEHEAD2}
 EOM
 
 $text{HEADER4_AWS}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@PYUKIWIKIVERSION\@\@
-# Author: \@\@NANAMI\@\@ \@\@NANAMI_URL\@\@
+# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$
+# Author: Nanami http://nanakochi.daiba.cx/
 # $text{BASEHEAD4}
 EOM
 
 }
 
 $text{HEADERPLUGIN_NANAMI}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@PLUGINVERSION\@\@
-# Author: \@\@NANAMI\@\@ \@\@NANAMI_URL\@\@
+# 
+# Author: Nanami http://nanakochi.daiba.cx/
 # $text{BASEHEAD2}
 EOM
 
 $text{HEADEREXPLUGIN_NANAMI}=<<EOM;
-\@\@BASEHEAD1\@\@
+@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone.
+# $Id: text.pl,v 1.402 2012/01/28 22:31:08 papu Exp $
 #
-# \@\@PLUGINVERSION\@\@
-# Author: \@\@NANAMI\@\@ \@\@NANAMI_URL\@\@
+# 
+# Author: Nanami http://nanakochi.daiba.cx/
 # $text{BASEHEAD2}
 EOM
 
@@ -241,35 +260,60 @@
 EOM
 
 $text{LICENSE}=<<EOM;
-Copyright (C) 2004-$year by \@\@NEKYO\@\@.
+Copyright (C) 2004-$year by Nekyo.
 
-\@\@LICENSE_BASE\@\@
+Copyright (C) 2005-2012 by PyukiWiki Developers Team
+
+License is GNU GENERAL PUBLIC LICENSE 2 and/or Artistic 1 or each later version.
+
+This program is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.
 EOM
 
 $text{LICENSE_NEKYO}=$text{LICENSE};
 
 $text{LICENSE_NANAMI}=<<EOM;
-Copyright (C) 2005-$year by \@\@NANAMI\@\@.
+Copyright (C) 2005-$year by Nanami.
+
+Copyright (C) 2005-2012 by PyukiWiki Developers Team
 
-\@\@LICENSE_BASE\@\@
+License is GNU GENERAL PUBLIC LICENSE 2 and/or Artistic 1 or each later version.
+
+This program is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.
 EOM
 
 $text{LICENSE_JUNICHI}=<<EOM;
-Copyright (C) 2005-$year by \@\@JUNICHI\@\@.
+Copyright (C) 2005-$year by Junichi.
+
+Copyright (C) 2005-2012 by PyukiWiki Developers Team
+
+License is GNU GENERAL PUBLIC LICENSE 2 and/or Artistic 1 or each later version.
 
-\@\@LICENSE_BASE\@\@
+This program is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.
 EOM
 
 $text{LICENSE_YASHIGANIMODOKI}=<<EOM;
-Copyright (C) 2004-$year by \@\@YASHIGANIMODOKI\@\@.
+Copyright (C) 2004-$year by YashiganiModoki.
+
+Copyright (C) 2005-2012 by PyukiWiki Developers Team
 
-\@\@LICENSE_BASE\@\@
+License is GNU GENERAL PUBLIC LICENSE 2 and/or Artistic 1 or each later version.
+
+This program is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.
 EOM
 
 $text{LICENSE_YUKI}=<<EOM;
-Copyright (C) 2002-$year by \@\@YUKI\@\@.
+Copyright (C) 2002-$year by Hiroshi Yuki.
+
+Copyright (C) 2005-2012 by PyukiWiki Developers Team
+
+License is GNU GENERAL PUBLIC LICENSE 2 and/or Artistic 1 or each later version.
 
-\@\@LICENSE_BASE\@\@
+This program is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.
 EOM
 
 #############################################################
@@ -277,37 +321,37 @@
 $text{AUTHOR_PYUKI}=<<EOM;
 =item PyukiWiki Developers Team
 
-L<\@\@PYUKI_URL\@\@>
+L<http://pyukiwiki.sfjp.jp/>
 EOM
 
 $text{AUTHOR_NEKYO}=<<EOM;
-=item \@\@NEKYO\@\@
+=item Nekyo
 
-L<\@\@NEKYO_URL\@\@>
+L<http://nekyo.qp.land.to/>
 EOM
 
 $text{AUTHOR_YUKI}=<<EOM;
-=item \@\@YUKI\@\@
+=item Hiroshi Yuki
 
-L<\@\@YUKI_URL\@\@>
+L<http://www.hyuki.com/>
 EOM
 
 $text{AUTHOR_JUNICHI}=<<EOM;
-=item \@\@JUNICHI\@\@
+=item Junichi
 
-L<\@\@JUNICHI_URL\@\@>
+L<http://www.re-birth.com/>
 EOM
 
 $text{AUTHOR_NANAMI}=<<EOM;
-=item \@\@NANAMI\@\@
+=item Nanami
 
-L<\@\@NANAMI_URL\@\@> etc...
+L<http://nanakochi.daiba.cx/> etc...
 EOM
 
 $text{AUTHOR_YASHIGANIMODOKI}=<<EOM;
-=item \@\@YASHIGANIMODOKI\@\@
+=item YashiganiModoki
 
-L<\@\@YASHIGANIMODOKI_URL\@\@>
+L<http://hpcgi1.nifty.com/it2f/wikinger/pyukiwiki.cgi>
 EOM
 
 


PyukiWiki

[Pyukiwiki-cvs 0004128] CVS update: PyukiWiki-Devel/build