[vidalia-svn] r1892: I suppose I should version bump before I get too carried awa (in trunk: . pkg/win32 src src/gui/res)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-08-27 19:20:20 -0400 (Mon, 27 Aug 2007)
New Revision: 1892

Modified:
   trunk/
   trunk/configure.in
   trunk/pkg/win32/vidalia-bundle.nsi
   trunk/pkg/win32/vidalia.nsi
   trunk/src/gui/res/vidalia_win.rc
   trunk/src/vidalia.h
Log:
 r2102@adrastea:  edmanm | 2007-08-27 19:20:14 -0400
 I suppose I should version bump before I get too carried away.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /vidalia/local/trunk [r2102] on 54b3572a-7227-0410-958f-53ecd705b71a

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2007-08-27 23:18:25 UTC (rev 1891)
+++ trunk/configure.in	2007-08-27 23:20:20 UTC (rev 1892)
@@ -1,4 +1,4 @@
-AC_INIT(vidalia,0.0.14)
+AC_INIT(vidalia,0.0.15-svn)
 AC_MSG_NOTICE([Configuring AC_PACKAGE_STRING...])
 AC_PROG_CXX
 PROFILE="Vidalia.pro"

Modified: trunk/pkg/win32/vidalia-bundle.nsi
===================================================================
--- trunk/pkg/win32/vidalia-bundle.nsi	2007-08-27 23:18:25 UTC (rev 1891)
+++ trunk/pkg/win32/vidalia-bundle.nsi	2007-08-27 23:20:20 UTC (rev 1892)
@@ -32,12 +32,12 @@
 
 !define VIDALIA_NAME        "Vidalia"
 !define VIDALIA_EXEC        "vidalia.exe"
-!define VIDALIA_APPVERSION  "0.0.14"
+!define VIDALIA_APPVERSION  "0.0.15-svn"
 !define VIDALIA_DESC        "${VIDALIA_NAME} ${VIDALIA_APPVERSION}"
 
 !define TOR_NAME            "Tor"
 !define TOR_EXEC            "tor.exe"
-!define TOR_APPVERSION      "0.2.0.4-alpha"
+!define TOR_APPVERSION      "0.2.0.6-alpha"
 !define TOR_DESC            "${TOR_NAME} ${TOR_APPVERSION}"
 
 !define PRIVOXY_NAME        "Privoxy"
@@ -50,13 +50,13 @@
 !define TORBUTTON_DESC      "${TORBUTTON_NAME} ${TORBUTTON_APPVERSION}"
 
 !define OPENSSL_NAME        "OpenSSL"
-!define OPENSSL_APPVERSION  "0.9.8d"
+!define OPENSSL_APPVERSION  "0.9.8e"
 !define OPENSSL_DESC        "${OPENSSL_NAME} ${OPENSSL_APPVERSION}"
 
 !define BUNDLE_NAME         "Vidalia Bundle"
 !define BUNDLE_APPVERSION   "${TOR_APPVERSION}-${VIDALIA_APPVERSION}"
 !define BUNDLE_REVISION     "1"
-!define BUNDLE_PRODVERSION  "0.0.14.${BUNDLE_REVISION}" ; Product version must be x.x.x.x
+!define BUNDLE_PRODVERSION  "0.0.15.${BUNDLE_REVISION}" ; Product version must be x.x.x.x
 !define BUNDLE_DESC         "${BUNDLE_NAME} ${BUNDLE_APPVERSION}"
 !define INSTALLFILE         "vidalia-bundle-${BUNDLE_APPVERSION}.exe"
 !define UNINSTALLER         "Uninstall.exe"

Modified: trunk/pkg/win32/vidalia.nsi
===================================================================
--- trunk/pkg/win32/vidalia.nsi	2007-08-27 23:18:25 UTC (rev 1891)
+++ trunk/pkg/win32/vidalia.nsi	2007-08-27 23:20:20 UTC (rev 1892)
@@ -29,8 +29,8 @@
 ; Global definitions
 !define VIDALIA_NAME        "Vidalia"
 !define VIDALIA_EXEC        "vidalia.exe"
-!define VIDALIA_APPVERSION  "0.0.14"
-!define VIDALIA_PRODVERSION "0.0.14.0" ; Product version must be x.x.x.x
+!define VIDALIA_APPVERSION  "0.0.15-svn"
+!define VIDALIA_PRODVERSION "0.0.15.0" ; Product version must be x.x.x.x
 !define VIDALIA_AUTHORS     "Matt Edman, Justin Hipple"
 !define VIDALIA_INSTALLFILE "vidalia-${VIDALIA_APPVERSION}.exe"
 !define VIDALIA_DESC "${VIDALIA_NAME} ${VIDALIA_APPVERSION}"

Modified: trunk/src/gui/res/vidalia_win.rc
===================================================================
--- trunk/src/gui/res/vidalia_win.rc	2007-08-27 23:18:25 UTC (rev 1891)
+++ trunk/src/gui/res/vidalia_win.rc	2007-08-27 23:20:20 UTC (rev 1892)
@@ -29,8 +29,8 @@
 #include "vidalia_win.rc.h"
 
 1 VERSIONINFO
-FILEVERSION     0,0,14,0
-PRODUCTVERSION  0,0,14,0
+FILEVERSION     0,0,15,0
+PRODUCTVERSION  0,0,15,0
 FILEFLAGSMASK   0
 FILEOS          VOS__WINDOWS32
 FILETYPE        VFT_APP
@@ -39,8 +39,8 @@
     {
         BLOCK "040904E4"
         {
-            VALUE "FileVersion",      "0.0.14"
-            VALUE "ProductVersion",   "0.0.14"
+            VALUE "FileVersion",      "0.0.15-svn"
+            VALUE "ProductVersion",   "0.0.15-svn"
             VALUE "FileDescription",  "Vidalia"
             VALUE "InternalName",     "Vidalia"
             VALUE "ProductName",      "Vidalia"

Modified: trunk/src/vidalia.h
===================================================================
--- trunk/src/vidalia.h	2007-08-27 23:18:25 UTC (rev 1891)
+++ trunk/src/vidalia.h	2007-08-27 23:20:20 UTC (rev 1892)
@@ -43,7 +43,7 @@
 #include <control/torcontrol.h>
 
 /** Vidalia's version string */
-#define VIDALIA_VERSION    "0.0.14"
+#define VIDALIA_VERSION    "0.0.15-svn"
 
 /** Pointer to this Vidalia application instance. */
 #define vApp  ((Vidalia *)qApp)