From: dirk Date: Thu, 14 Jun 2007 22:03:30 +0000 (+0200) Subject: Merge /scm/spider into SIMPLEROUTE X-Git-Tag: 1.55~160^2~12^2~1 X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=d7dbb7fe3680afb068ffc585b1f95690008a9a7d;p=spider.git Merge /scm/spider into SIMPLEROUTE Conflicts: .gitignore Changes cmd/Aliases data/.gitignore filter/.gitignore msg/.gitignore perl/DXChannel.pm perl/DXProt.pm perl/DXSql/SQLite.pm perl/DXSql/mysql.pm perl/DXXml.pm perl/DXXml/Cmd.pm perl/DXXml/IM.pm perl/DXXml/Text.pm perl/Msg.pm perl/Route/Node.pm perl/Version.pm Fix merge into existing tree --- d7dbb7fe3680afb068ffc585b1f95690008a9a7d diff --cc Changes index 899cc366,b1cbb1c9..edf2bfe3 --- a/Changes +++ b/Changes @@@ -1,11 -1,38 +1,41 @@@ +13Jun06======================================================================= +1. start using git. +2. change all the version / build numbering. - 15Jan06======================================================================= + 14Jun07======================================================================= -1. prepare for git repository and moving of anon cvs repository to ++1. prepare for git repository and moving of anon cvs repository to + scm.tobit.co.uk. + 11Jun07======================================================================= + 1. Change the frequency normalisation for DX Spot dupe checks so that any + decimal part is thrown away (in other words: truncate the freq to integer khz) + 20May07======================================================================= + 1. add 1704 cty.dat + 08Apr07======================================================================= + 1. add CTY-1703 cty.dat + 2. alter the way the dupefile deletion is done. + 18Mar07======================================================================= + 1. change URL in show/425. + 04Mar07======================================================================= + 1. add CTY 1702 prefix data files + 22Feb07======================================================================= -1. add show/myfdx to Aliases. ++1. add show/myfdx to Aliases. + 15Feb07======================================================================= + 1. allow convkeps.pl to parse NORAD keps files. + 22Jan07======================================================================= + 1. disable default propagation of PC9x sentences -2. simplify PC17 handling ++2. simplify PC17 handling + 16Jan07======================================================================= + 1. back ported a change to PC16 handling so that a locally connected node's + info clears out and generally overrides any residual PC16 info gathered from + elsewhere. + 15Jan07======================================================================= 1. added CTY-1701 - 07Jan06======================================================================= + 07Jan07======================================================================= -1. use IO::Socket blocking where available and switch off or ignore all +1. use IO::Socket blocking where available and switch off or ignore all attempts to block. + 05Jan07======================================================================= + 1. increase default ephemeral deduping on PC15 to 6 minutes (from 2). + 23Nov06======================================================================= + 1. added wrapping to over length lines in console.pl. 03Nov06======================================================================= 1. add CTY-1609 changes 2. add back Geo::Taf code with submitted mods diff --cc perl/Version.pm index 92136f57,42a2c0f4..230b4a83 --- a/perl/Version.pm +++ b/perl/Version.pm @@@ -6,5 -9,7 +9,7 @@@ package main use vars qw($version $build); - $version = "1.54"; - $build = 467; -$version = '1.53'; -$build = '10'; ++$version = '1.54'; ++$build = '3'; + + 1;