* Upgrade to new version 2.21.9. Version 2.22 will be a bug release

version
author: Eduardo Chappa <chappa@washington.edu> 2017-09-19 21:57:49 -0600
committer: Eduardo Chappa <chappa@washington.edu> 2017-09-19 21:57:49 -0600
commit: 988ec3d0df0a7102a5d349525bccab84a39902b0 (patch)
tree: 03c171e3a3a68aced1b4270fddb8bc32d26377a4
parent: d4b8c04ba11e61cb96f246705f7e50b0d9dbf7e9 (diff)
download: alpine-988ec3d0df0a7102a5d349525bccab84a39902b0.tar.xz
11 files changed, 19 insertions, 18 deletions
diff --git a/VERSION b/VERSION
index 3fe7dd19..3006803a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.21.1
+2.21.9
diff --git a/alpine/osdep/alpine-splash.bmp b/alpine/osdep/alpine-splash.bmp
index 3d08f04a..de48ca0e 100644
--- a/alpine/osdep/alpine-splash.bmp
+++ b/alpine/osdep/alpine-splash.bmp
diff --git a/alpine/osdep/mswin.rc b/alpine/osdep/mswin.rc
index 4c3ae966..37f1fc80 100644
--- a/alpine/osdep/mswin.rc
+++ b/alpine/osdep/mswin.rc
@@ -244,8 +244,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,21,1,0
- PRODUCTVERSION 2,21,1,0
+ FILEVERSION 2,21,9,0
+ PRODUCTVERSION 2,21,9,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -267,12 +267,12 @@ BEGIN
 #else
             VALUE "FileDescription", "Alpine\0"
 #endif
-            VALUE "FileVersion", "2.21.1\0"
+            VALUE "FileVersion", "2.21.9\0"
             VALUE "InternalName", "alpine\0"
             VALUE "LegalCopyright", "Copyright 2006-2009 University of Washington, Copyright 2013-2014\0"
             VALUE "OriginalFilename", "alpine.exe\0"
             VALUE "ProductName", "alpine\0"
-            VALUE "ProductVersion", "2.21.1\0"
+            VALUE "ProductVersion", "2.21.9\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/doc/man1/alpine.1 b/doc/man1/alpine.1
index 630ee11b..48106b3a 100644
--- a/doc/man1/alpine.1
+++ b/doc/man1/alpine.1
@@ -1,4 +1,4 @@
-.TH alpine 1 "Version 2.21.1"
+.TH alpine 1 "Version 2.21.9"
 .SH NAME
 alpine \- an Alternatively Licensed Program for Internet News and Email
 .SH SYNTAX 
diff --git a/doc/tech-notes/index.html b/doc/tech-notes/index.html
index c118fca1..bc2b9397 100644
--- a/doc/tech-notes/index.html
+++ b/doc/tech-notes/index.html
@@ -3,7 +3,7 @@
 <BODY>
 <H1>Alpine Technical Notes</H1>
  
-Version 2.21.1, March 2017
+Version 2.21.9, September 2017
 
 <H2><A NAME="TOC">Table of Contents</A></H2><P>
 
diff --git a/include/config.h.in b/include/config.h.in
index 56c9160f..ad14ba6e 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -475,7 +475,8 @@
 /* Enable keyboard lock support */
 #undef KEYBOARD_LOCK
 
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
 #undef LT_OBJDIR
 
 /* Path to local inboxes for pico newmail check */
diff --git a/include/config.wnt.h b/include/config.wnt.h
index e110d027..d73b2b87 100644
--- a/include/config.wnt.h
+++ b/include/config.wnt.h
@@ -454,13 +454,13 @@
 #define PACKAGE_NAME "alpine"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "alpine 2.21.1"
+#define PACKAGE_STRING "alpine 2.21.9"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "alpine"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.21.1"
+#define PACKAGE_VERSION "2.21.9"
 
 /* Program users use to change their password */
 /* #undef PASSWD_PROG */
@@ -552,7 +552,7 @@
 #define UTF8_INTERNAL
 
 /* Version number of package */
-#define VERSION "2.21.1"
+#define VERSION "2.21.9"
 
 /* Windows is just too different */
 #ifndef _WINDOWS
diff --git a/mapi/pmapi.c b/mapi/pmapi.c
index ef841ec1..945104f3 100644
--- a/mapi/pmapi.c
+++ b/mapi/pmapi.c
@@ -1952,7 +1952,7 @@ BOOL APIENTRY DllMain(
 
 	now = time((time_t *)0);
 	tm_now = localtime(&now);
-	fprintf(ms_global->dfd, "pmapi32.dll for Alpine Version 2.21.1\r\n");
+	fprintf(ms_global->dfd, "pmapi32.dll for Alpine Version 2.21.9\r\n");
 	fprintf(ms_global->dfd, " Build date: %s\r\n", datestamp);
 	fprintf(ms_global->dfd,
 		" please report all bugs to chappa@gmx.com\r\n");
diff --git a/mapi/pmapi.rc b/mapi/pmapi.rc
index a6ba40ed..7e0bcd2c 100644
--- a/mapi/pmapi.rc
+++ b/mapi/pmapi.rc
@@ -98,8 +98,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,21,1,0
- PRODUCTVERSION 2,21,1,0
+ FILEVERSION 2,21,9,0
+ PRODUCTVERSION 2,21,9,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x29L
@@ -117,14 +117,14 @@ BEGIN
             VALUE "Comments", "alpine info: http://alpine.freeiz.com/alpine\0"
             VALUE "CompanyName", "Patches for Alpine\0"
             VALUE "FileDescription", "Simple MAPI DLL for Alpine for Windows\0"
-            VALUE "FileVersion", "2.21.1\0"
+            VALUE "FileVersion", "2.21.9\0"
             VALUE "InternalName", "pmapi32\0"
             VALUE "LegalCopyright", "Copyright ? University of Washington 2006-2009, Eduardo Chappa 2013-2014\0"
             VALUE "LegalTrademarks", "Apache License, Version 2.0\0"
             VALUE "OriginalFilename", "pmapi32.dll\0"
             VALUE "PrivateBuild", " \0"
             VALUE "ProductName", "Simple MAPI for Alpine for Windows\0"
-            VALUE "ProductVersion", "2.21.1\0"
+            VALUE "ProductVersion", "2.21.9\0"
             VALUE "SpecialBuild", " \0"
         END
     END
diff --git a/packages/alpine.spec b/packages/alpine.spec
index 7d201b90..8a9dcacf 100644
--- a/packages/alpine.spec
+++ b/packages/alpine.spec
@@ -1,6 +1,6 @@
 Summary: Alpine mail user agent
 Name: alpine
-Version: 2.21.1
+Version: 2.21.9
 Release: 1
 License: Apache License
 Group: Applications/Mail
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 44e4485e..273571d0 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
 reasonable place to be called from.
 Dummy change to get revision in pine.hlp
 ============= h_revision =================
-Alpine Commit 215 2017-09-19 20:55:01
+Alpine Commit 216 2017-09-19 21:56:28
 ============= h_news =================
 <HTML>
 <HEAD>
author	Eduardo Chappa <chappa@washington.edu>	2017-09-19 21:57:49 -0600
committer	Eduardo Chappa <chappa@washington.edu>	2017-09-19 21:57:49 -0600
commit	988ec3d0df0a7102a5d349525bccab84a39902b0 (patch)
tree	03c171e3a3a68aced1b4270fddb8bc32d26377a4
parent	d4b8c04ba11e61cb96f246705f7e50b0d9dbf7e9 (diff)
download	alpine-988ec3d0df0a7102a5d349525bccab84a39902b0.tar.xz