svn commit: r1432496 [3/3] - in /spamassassin/trunk: Changes MANIFEST.SKIP build/README lib/Mail/SpamAssassin.pm

[km...@apache.org]

Modified: spamassassin/trunk/MANIFEST.SKIP
URL: http://svn.apache.org/viewvc/spamassassin/trunk/MANIFEST.SKIP?rev=1432496&r1=1432495&r2=1432496&view=diff
==============================================================================
--- spamassassin/trunk/MANIFEST.SKIP (original)
+++ spamassassin/trunk/MANIFEST.SKIP Sat Jan 12 20:01:49 2013
@@ -114,3 +114,4 @@
 ^xt/
 ^build/rebuild_xt$
 ^build/repackage_latest_update_rules$
+^MYMETA.(json|yml)$

Modified: spamassassin/trunk/build/README
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/README?rev=1432496&r1=1432495&r2=1432496&view=diff
==============================================================================
--- spamassassin/trunk/build/README (original)
+++ spamassassin/trunk/build/README Sat Jan 12 20:01:49 2013
@@ -60,7 +60,6 @@ SPAMASSASSIN RELEASE PROCEDURE
   The output should look like this:
 
   ?      rules/SIQ.pm
-  ?      rules/EmailBL.pm
   ?      rules/sandbox-hstern.pm
   ?      rules/sandbox-felicity.pm
 
@@ -89,15 +88,7 @@ SPAMASSASSIN RELEASE PROCEDURE
     ./spamassassin -L -t < sample-nonspam.txt | grep X-Spam-
 
   Verify that the X-Spam-* headers use the correct version string,
-  without an SVN revision number (those are only for dev builds).
-
-#- Temporary kludge check until bug 6297 is fixed properly:
-# NOTE: BUG IS MARKED RESOLVED / FIXED 
-#
-#    grep nopublish rules/72_active.cf
-#
-#  This should return nothing.  If not, edit the rulesrc files and
-#  add "tflags nopublish" lines as necessary.
+  without an SVN revision number (those are only for dev and pre builds).
 
 - create the Changes file.  Do this step on your own checkout, as
   the release checkout is read-only.   There are two options here:
@@ -118,7 +109,8 @@ SPAMASSASSIN RELEASE PROCEDURE
     r497472 was the release of 3.2.0-pre1; r233108 was the start of 3.2.0,
     just after the 3.1.0 branch was created; r46030 was the start of the
     3.1.0 work (created 3.0 branch); replace with the correct rev number
-    for the point you want to start at if different.
+    for the point you want to start at if different. I used r1149751 to
+    produce the first 3.4.0-pre release, for example.
 
 - Word wrap the Changes file with something like 
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin.pm?rev=1432496&r1=1432495&r2=1432496&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Sat Jan 12 20:01:49 2013
@@ -99,7 +99,7 @@ $IS_DEVEL_BUILD = 1;        # change for
 # 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
 # files; this variable should not be modified.
-@EXTRA_VERSION = qw(pre1);
+@EXTRA_VERSION = qw(pre2);
 
 @ISA = qw();