[Pkg-privacy-commits] [pidgin-otr] 155/255: Release 4.0.0-rc1

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch experimental
in repository pidgin-otr.

commit 1a11e606aeb2547f847b3ab57b50770a66145144
Author: Ian Goldberg <iang at cs.uwaterloo.ca>
Date:   Wed Aug 22 17:37:23 2012 -0400

    Release 4.0.0-rc1
    
    Change all version numbers to remove "-beta2" and turn off the beta
    warning dialog.
---
 ChangeLog                        | 9 +++++++++
 INSTALL.mingw                    | 2 +-
 Makefile.mingw                   | 2 +-
 NEWS                             | 4 ++++
 README                           | 2 +-
 configure.ac                     | 2 +-
 otr-plugin.c                     | 2 +-
 packaging/windows/pidgin-otr.nsi | 2 +-
 8 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31b3d1b..ccb8c6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-08-24
+
+	* otr-plugin.c: Turn off the beta dialog
+	* README:
+	* INSTALL.mingw:
+	* Makefile.mingw:
+	* packaging/windows/pidgin-otr.nsi:
+	* configure.ac: Change version number to 4.0.0
+
 2012-08-22
 
 	* configure.ac:
diff --git a/INSTALL.mingw b/INSTALL.mingw
index d672d3c..eb4becd 100644
--- a/INSTALL.mingw
+++ b/INSTALL.mingw
@@ -116,5 +116,5 @@ pidgin-otr:
 The pidgin-otr plugin is now available in the current working directory -
 inspect it with unzip:
 
-  unzip -l pidgin-otr-4.0.0-beta2.zip
+  unzip -l pidgin-otr-4.0.0.zip
 
diff --git a/Makefile.mingw b/Makefile.mingw
index 2d40d23..4a0bd8d 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -1,7 +1,7 @@
 WIN32=1
 
 # The version number to put in the plugin info
-PIDGIN_OTR_VERSION = 4.0.0-beta2
+PIDGIN_OTR_VERSION = 4.0.0
 
 # Name of the gettext domain
 GETTEXT_PACKAGE = pidgin-otr
diff --git a/NEWS b/NEWS
index 66029fd..b6eec40 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+24 Aug 2012:
+
+- Release 4.0.0
+
 21 Jun 2012:
 
 - Fixed an issue that happened when enabling the OTR plugin while a
diff --git a/README b/README
index ed6c87d..d4d2963 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 	       Off-the-Record Messaging plugin for pidgin
-			  v4.0.0, 2012
+			  v4.0.0, 24 Aug 2012
 
 This is a pidgin plugin which implements Off-the-Record (OTR) Messaging.
 It is known to work (at least) under the Linux and Windows versions of
diff --git a/configure.ac b/configure.ac
index c48f1e5..7e23e42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce configure.
 
-AC_INIT(pidgin-otr, 4.0.0-beta2)
+AC_INIT(pidgin-otr, 4.0.0)
 
 AM_CONFIG_HEADER(config.h)
 
diff --git a/otr-plugin.c b/otr-plugin.c
index f9ba9f9..143f01d 100644
--- a/otr-plugin.c
+++ b/otr-plugin.c
@@ -78,7 +78,7 @@
 #include "gtk-dialog.h"
 
 /* Controls a beta warning/expiry dialog */
-#define BETA_DIALOG 1
+#define BETA_DIALOG 0
 
 #if BETA_DIALOG && defined USING_GTK /* Only for beta */
 #include "gtkblist.h"
diff --git a/packaging/windows/pidgin-otr.nsi b/packaging/windows/pidgin-otr.nsi
index 9c9eb5a..26d8b30 100644
--- a/packaging/windows/pidgin-otr.nsi
+++ b/packaging/windows/pidgin-otr.nsi
@@ -26,7 +26,7 @@
 ; todo: SetBrandingImage
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "pidgin-otr"
-!define PRODUCT_VERSION "4.0.0-0-beta2"
+!define PRODUCT_VERSION "4.0.0-0"
 !define PRODUCT_PUBLISHER "Cypherpunks CA"
 !define PRODUCT_WEB_SITE "http://otr.cypherpunks.ca/"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git