[Spambayes-checkins] spambayes/spambayes Version.py,1.26,1.27

[Kenny Pitt]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14702

Modified Files:
	Version.py 
Log Message:
Clean up version descriptions a little, and remove unused version info for
SMTP Proxy (now part of sb_server).


Index: Version.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Version.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Version.py	23 Dec 2003 03:17:01 -0000	1.26
--- Version.py	4 Feb 2004 15:49:59 -0000	1.27
***************
*** 17,21 ****
  LATEST_VERSION_HOME="http://spambayes.sourceforge.net/download/Version.cfg"
  
! # This module is part of the spambayes project, which is Copyright 2002-3
  # The Python Software Foundation and is covered by the Python Software
  # Foundation license.
--- 17,21 ----
  LATEST_VERSION_HOME="http://spambayes.sourceforge.net/download/Version.cfg"
  
! # This module is part of the spambayes project, which is Copyright 2002-4
  # The Python Software Foundation and is covered by the Python Software
  # Foundation license.
***************
*** 23,38 ****
      # Non app specific - changed when "spambayes\*" changes significantly
      "Version":          0.2,
!     "Description":      "SpamBayes Beta2",
      "Date":             "July 2003",
!     "Full Description": "%(Description)s, version %(Version)s (%(Date)s)",
      # Sub-dict for application specific version strings.
      "Apps": {
!         # Should this be here?  I'm not sure that anything uses it, and the
!         # hammie.py script is gone.  A sb_filter version might be better.
!         "Hammie" : {
              "Version":          0.1,
!             "Description":      "SpamBayes command line tool (Hammie) Beta1",
              "Date":             "January 2003",
!             "Full Description": "%(Description)s, version %(Version)s (%(Date)s)",
          },
          "Outlook" : {
--- 23,36 ----
      # Non app specific - changed when "spambayes\*" changes significantly
      "Version":          0.2,
!     "Description":      "SpamBayes Engine",
      "Date":             "July 2003",
!     "Full Description": "%(Description)s Version %(Version)s (%(Date)s)",
      # Sub-dict for application specific version strings.
      "Apps": {
!         "sb_filter" : {
              "Version":          0.1,
!             "Description":      "SpamBayes Command Line Filter",
              "Date":             "January 2003",
!             "Full Description": "%(Description)s Version %(Version)s (%(Date)s)",
          },
          "Outlook" : {
***************
*** 41,47 ****
              "Description":      "SpamBayes Outlook Addin",
              "Date":             "December 2003",
!             "Full Description": "%(Description)s, version %(Version)s (%(Date)s)",
              "Full Description Binary":
!                                 "%(Description)s, Binary version %(BinaryVersion)s (%(Date)s)",
              # Note this means we can change the download page later, and old
              # versions will still go to the new page.
--- 39,45 ----
              "Description":      "SpamBayes Outlook Addin",
              "Date":             "December 2003",
!             "Full Description": "%(Description)s Version %(Version)s (%(Date)s)",
              "Full Description Binary":
!                                 "%(Description)s Binary Version %(BinaryVersion)s (%(Date)s)",
              # Note this means we can change the download page later, and old
              # versions will still go to the new page.
***************
*** 52,64 ****
              "Version":          0.3,
              "BinaryVersion":    0.2,
!             "Description":      "SpamBayes POP3 Proxy Beta3",
              "Date":             "December 2003",
              "InterfaceVersion":            0.03,
!             "InterfaceDescription":        "SpamBayes POP3 Proxy Web Interface Alpha3",
!             "Full Description": """%(Description)s, version %(Version)s (%(Date)s),
! using %(InterfaceDescription)s, version %(InterfaceVersion)s""",
              "Full Description Binary":
!                                 """%(Description)s, Binary version %(BinaryVersion)s (%(Date)s),
! using %(InterfaceDescription)s, version %(InterfaceVersion)s""",
              # Note this means we can change the download page later, and old
              # versions will still go to the new page.
--- 50,62 ----
              "Version":          0.3,
              "BinaryVersion":    0.2,
!             "Description":      "SpamBayes POP3 Proxy",
              "Date":             "December 2003",
              "InterfaceVersion":            0.03,
!             "InterfaceDescription":        "POP3 Proxy Web Interface",
!             "Full Description": """%(Description)s Version %(Version)s (%(Date)s),
! using %(InterfaceDescription)s Version %(InterfaceVersion)s""",
              "Full Description Binary":
!                                 """%(Description)s Binary Version %(BinaryVersion)s (%(Date)s),
! using %(InterfaceDescription)s Version %(InterfaceVersion)s""",
              # Note this means we can change the download page later, and old
              # versions will still go to the new page.
***************
*** 68,98 ****
          "Lotus Notes Filter" : {
              "Version":          0.01,
!             "Description":      "SpamBayes Lotus Notes Filter Alpha1",
              "Date":             "March 2003",
!             "Full Description": "%(Description)s, version %(Version)s (%(Date)s)",
!         },
!         "SMTP Proxy" : {
!             "Version":          0.1,
!             "Description":      "SpamBayes SMTP Proxy Beta1",
!             "Date":             "September 2003",
!             "Full Description": "%(Description)s, version %(Version)s (%(Date)s)",
          },
          "IMAP Filter" : {
              "Version":          0.1,
!             "Description":      "SpamBayes IMAP Filter Beta1",
              "Date":             "September 2003",
              "InterfaceVersion":            0.02,
!             "InterfaceDescription":        "SpamBayes IMAP Filter Web Interface Alpha2",
!             "Full Description": """%(Description)s, version %(Version)s (%(Date)s),
! using %(InterfaceDescription)s, version %(InterfaceVersion)s""",
          },
          "IMAP Server" : {
              "Version":          0.01,
!             "Description":      "SpamBayes IMAP Server Alpha1",
              "Date":             "September 2003",
              "InterfaceVersion":             0.02,
!             "InterfaceDescription":        "SpamBayes IMAP Server Web Interface Alpha2",
!             "Full Description": """%(Description)s, version %(Version)s (%(Date)s),
! using %(InterfaceDescription)s, version %(InterfaceVersion)s""",
          },
      },
--- 66,90 ----
          "Lotus Notes Filter" : {
              "Version":          0.01,
!             "Description":      "SpamBayes Lotus Notes Filter",
              "Date":             "March 2003",
!             "Full Description": "%(Description)s Version %(Version)s (%(Date)s)",
          },
          "IMAP Filter" : {
              "Version":          0.1,
!             "Description":      "SpamBayes IMAP Filter",
              "Date":             "September 2003",
              "InterfaceVersion":            0.02,
!             "InterfaceDescription":        "IMAP Filter Web Interface",
!             "Full Description": """%(Description)s Version %(Version)s (%(Date)s),
! using %(InterfaceDescription)s Version %(InterfaceVersion)s""",
          },
          "IMAP Server" : {
              "Version":          0.01,
!             "Description":      "SpamBayes IMAP Server",
              "Date":             "September 2003",
              "InterfaceVersion":             0.02,
!             "InterfaceDescription":        "IMAP Server Web Interface",
!             "Full Description": """%(Description)s Version %(Version)s (%(Date)s),
! using %(InterfaceDescription)s Version %(InterfaceVersion)s""",
          },
      },
***************
*** 207,216 ****
          make_cfg(sys.stdout)
          sys.exit(0)
!     print "SpamBayes version is:", get_version_string()
      # Enumerate applications
      print
      print "Application versions:"
      for app in versions["Apps"]:
!         print "%s: %s" % (app, get_version_string(app))
  
      print
--- 199,208 ----
          make_cfg(sys.stdout)
          sys.exit(0)
!     print "SpamBayes engine version:", get_version_string()
      # Enumerate applications
      print
      print "Application versions:"
      for app in versions["Apps"]:
!         print "\n%s: %s" % (app, get_version_string(app))
  
      print
***************
*** 225,234 ****
  
      print
!     print "SpamBayes version is:", get_version_string(version_dict=latest_dict)
      # Enumerate applications
      print
      print "Application versions:"
      for app in latest_dict["Apps"]:
!         print "%s: %s" % (app, get_version_string(app, version_dict=latest_dict))
  
  if __name__=='__main__':
--- 217,226 ----
  
      print
!     print "SpamBayes engine version:", get_version_string(version_dict=latest_dict)
      # Enumerate applications
      print
      print "Application versions:"
      for app in latest_dict["Apps"]:
!         print "\n%s: %s" % (app, get_version_string(app, version_dict=latest_dict))
  
  if __name__=='__main__':