svn commit: r527963 - in /spamassassin/trunk: MANIFEST build/README build/announcements/3.2.0-rc2.txt build/announcements/3.2.0.txt lib/Mail/SpamAssassin.pm

[jm...@apache.org]

Author: jm
Date: Thu Apr 12 07:50:28 2007
New Revision: 527963

URL: http://svn.apache.org/viewvc?view=rev&rev=527963
Log:
for next rc or the release -- update build instructions a little; remove the 3.2.0.txt announcement, and remove it from MANIFEST, since it's too complicated trying to update it *and* put it in the distribution tarball; update Dallas' email address for the change log; and set trunk back into dev mode, since the current tarball is being voted on from the rc2 tag.

Removed:
    spamassassin/trunk/build/announcements/3.2.0.txt
Modified:
    spamassassin/trunk/MANIFEST
    spamassassin/trunk/build/README
    spamassassin/trunk/build/announcements/3.2.0-rc2.txt
    spamassassin/trunk/lib/Mail/SpamAssassin.pm

Modified: spamassassin/trunk/MANIFEST
URL: http://svn.apache.org/viewvc/spamassassin/trunk/MANIFEST?view=diff&rev=527963&r1=527962&r2=527963
==============================================================================
--- spamassassin/trunk/MANIFEST (original)
+++ spamassassin/trunk/MANIFEST Thu Apr 12 07:50:28 2007
@@ -12,7 +12,6 @@
 TRADEMARK
 UPGRADE
 USAGE
-build/announcements/3.2.0.txt
 build/check_dependencies
 build/convert_pods_to_doc
 build/get_version

Modified: spamassassin/trunk/build/README
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/README?view=diff&rev=527963&r1=527962&r2=527963
==============================================================================
--- spamassassin/trunk/build/README (original)
+++ spamassassin/trunk/build/README Thu Apr 12 07:50:28 2007
@@ -63,9 +63,12 @@
   line.   Ensure the correct version number is present in $VERSION
   and $EXTRA_VERSION.
 
-  Prerelease versions are formatted like this -- "pre4" -- in
-  $EXTRA_VERSION, and $IS_DEVEL_BUILD is left as 1 instead of commented.
-  When referred to in full, it's "3.1.0-pre4".
+  Prereleases: formatted like this: "pre4" -- in $EXTRA_VERSION, and
+  $IS_DEVEL_BUILD is left as 1 instead of commented. When referred to in
+  full, it's "3.1.0-pre4".
+
+  Release candidates: formatted like this: "rc2" -- in $EXTRA_VERSION, and
+  $IS_DEVEL_BUILD is commented. When referred to in full, it's "3.1.0-rc2".
 
   [NOTE: when editing files in these instructions, you may have to
   use another checkout somewhere else, check in the changes there,
@@ -170,7 +173,10 @@
 - take a copy of the MD5sum line output.
 
 - by default, they're written to ~/site/released/ .
-  Copy them to wherever you want, yourself.
+  Copy them to wherever you want, yourself:
+
+    mkdir -p ~/public_html/devel
+    mv ~/site/released/Mail-SpamAssassin-3.2.0-rc2.* ~/public_html/devel
 
 - test the tar.gz and zip files!  redo until they work!! ;)
 
@@ -184,10 +190,11 @@
     vi !$
 
 - (for any rc, prerelease, or full release) Place the tarballs in a
-  discreet location (discreet means not linked from downloads, but
-  included in the vote mail) and request a vote on the development mailing
-  list to make the release.  Post the URL, md5sums/sha1sums, and proposed
-  release announcement mail.  
+  discreet location (discreet means not linked from the "downloads" page
+  of the website, but included in the vote mail) and request a vote on the
+  development mailing list to make the release.  Post the URL,
+  md5sums/sha1sums, and proposed release announcement mail to the dev
+  list. 
 
   Pre-releases and RCs require just lazy consensus -- ie. no objections.
 

Modified: spamassassin/trunk/build/announcements/3.2.0-rc2.txt
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/announcements/3.2.0-rc2.txt?view=diff&rev=527963&r1=527962&r2=527963
==============================================================================
--- spamassassin/trunk/build/announcements/3.2.0-rc2.txt (original)
+++ spamassassin/trunk/build/announcements/3.2.0-rc2.txt Thu Apr 12 07:50:28 2007
@@ -44,7 +44,7 @@
 
  * new behavior for trusted_networks/internal_networks: the 127.* network is now always considered trusted and internal, regardless of configuration.
 
- * bug 3109: short-circuiting of 'definite ham' or 'definite spam' messages based on individual short-circuit rules using the 'shortcircuit' setting, by Dallas Engelken <dallase /at/ nmgi.com>.
+ * bug 3109: short-circuiting of 'definite ham' or 'definite spam' messages based on individual short-circuit rules using the 'shortcircuit' setting, by Dallas Engelken <dallase /at/ uribl.com>.
 
  * bug 5305: implement 'msa_networks', for ISPs to specify their Mail Submission Agents, and extend network trust accordingly.
 
@@ -110,7 +110,7 @@
 
  * bug 4770: add ASN.pm plugin, contributed by Matthias Leisi <matthias at leisi.net>
 
- * bug 5271: move ImageInfo ruleset into 3.2.0 core rules, thanks to Dallas Engelken <dallase /at/ nmgi.com>.
+ * bug 5271: move ImageInfo ruleset into 3.2.0 core rules, thanks to Dallas Engelken <dallase /at/ uribl.com>.
 
  * VBounce ruleset and plugin: detect spurious bounce messages sent by broken mail systems in response to spam or viruses.  (Based on Tim Jackson's "bogus-virus-warnings.cf" ruleset.)
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin.pm?view=diff&rev=527963&r1=527962&r2=527963
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Thu Apr 12 07:50:28 2007
@@ -95,7 +95,7 @@
 };
 
 $VERSION = "3.002000";      # update after release (same format as perl $])
-# $IS_DEVEL_BUILD = 1;        # change for release versions
+$IS_DEVEL_BUILD = 1;        # change for release versions
 
 # Used during the prerelease/release-candidate part of the official release
 # process. If you hacked up your SA, you should add a version_tag to your .cf