Update trunk for post-1.8-branch

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23589 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/README b/README
index a05bc9f6e1c0983f201e4e450553fe17ffde1418..2d98c550f4b17a68ddc301cd2b20c7b24fc577ac 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-                   Kerberos Version 5, Release 1.8
+                   Kerberos Version 5, Release 1.9
 
                             Release Notes
                         The MIT Kerberos Team
@@ -7,20 +7,20 @@ Unpacking the Source Distribution
 ---------------------------------
 
 The source distribution of Kerberos 5 comes in a gzipped tarfile,
-krb5-1.8.tar.gz.  Instructions on how to extract the entire
+krb5-1.9.tar.gz.  Instructions on how to extract the entire
 distribution follow.
 
 If you have the GNU tar program and gzip installed, you can simply do:
 
-        gtar zxpf krb5-1.8.tar.gz
+        gtar zxpf krb5-1.9.tar.gz
 
 If you don't have GNU tar, you will need to get the FSF gzip
 distribution and use gzcat:
 
-        gzcat krb5-1.8.tar.gz | tar xpf -
+        gzcat krb5-1.9.tar.gz | tar xpf -
 
-Both of these methods will extract the sources into krb5-1.8/src and
-the documentation into krb5-1.8/doc.
+Both of these methods will extract the sources into krb5-1.9/src and
+the documentation into krb5-1.9/doc.
 
 Building and Installing Kerberos 5
 ----------------------------------
@@ -68,10 +68,10 @@ from using single-DES cryptosystems.  Among these is a configuration
 variable that enables "weak" enctypes, which defaults to "false"
 beginning with krb5-1.8.
 
-Major changes in 1.8
+Major changes in 1.9
 --------------------
 
-krb5-1.8 changes by ticket ID
+krb5-1.9 changes by ticket ID
 -----------------------------
 
 Copyright and Other Legal Notices
@@ -624,7 +624,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Acknowledgements for krb5-1.8
+Acknowledgements for krb5-1.9
 -----------------------------
 
 Thanks to the members of the Kerberos V5 development team at MIT, both

diff --git a/src/patchlevel.h b/src/patchlevel.h
index e1b179eeb89910ed9ac1fc958f938fdb5844c212..6a848d82f0672d1a3e73c0779d4df2b872925205 100644 (file)
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -51,8 +51,8 @@
  * organization.
  */
 #define KRB5_MAJOR_RELEASE 1
-#define KRB5_MINOR_RELEASE 8
+#define KRB5_MINOR_RELEASE 9
 #define KRB5_PATCHLEVEL 0
 #define KRB5_RELTAIL "prerelease"
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "branches/krb5-1-8"
+#define KRB5_RELTAG "trunk"