switch-to-experimental.diff
author Myhailo Danylenko <isbear@ukrpost.net>
Wed, 01 Aug 2012 23:31:49 +0300
changeset 40 9a0de2a8d877
parent 38 dfd761c2ef62
child 43 e0cda680d7a8
permissions -rw-r--r--
Add update-help.diff

[local] Switch to experimental branch and api version

diff -r 4eb2d00128c5 mcabber/ChangeLog.api
--- a/mcabber/ChangeLog.api	Tue Jul 31 23:59:24 2012 +0300
+++ b/mcabber/ChangeLog.api	Wed Aug 01 00:02:04 2012 +0300
@@ -1,3 +1,13 @@
+
+experimental (36)
+
+ * Change branch to "experimental".
+ * Api as defined by dev:24
+ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
+ * MQ Patch: switch-to-experimental
+
+  -- Myhailo Danylenko, 2012-04-30
+
 dev (24)
  * experimental patch add-offline-message
  * xmpp_disconnect now accepts status message
@@ -22,6 +32,12 @@
 
   -- Hermitifier, 2011-10-03
 
+experimental (34)
+
+ * Api as defined by dev:20
+
+  -- Myhailo Danylenko, 2011-06-01
+
 dev (20)
 
  * Add cmd_set_safe() and cmd_is_safe()
diff -r 4eb2d00128c5 mcabber/configure.ac
--- a/mcabber/configure.ac	Tue Jul 31 23:59:24 2012 +0300
+++ b/mcabber/configure.ac	Wed Aug 01 00:02:04 2012 +0300
@@ -272,7 +272,7 @@
 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
 
 # Prepare some config.h variables
-AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch])
+AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch])
 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
 
 # We need _GNU_SOURCE for strptime() and strcasestr()
diff -r 4eb2d00128c5 mcabber/mcabber/api.h
--- a/mcabber/mcabber/api.h	Tue Jul 31 23:59:24 2012 +0300
+++ b/mcabber/mcabber/api.h	Wed Aug 01 00:02:04 2012 +0300
@@ -3,10 +3,10 @@
 
 #include <mcabber/config.h> // For MCABBER_BRANCH
 
-#define MCABBER_API_VERSION 24
-#define MCABBER_API_MIN     24
+#define MCABBER_API_VERSION 36
+#define MCABBER_API_MIN     36
 
-#define MCABBER_BRANCH_DEV  1
+#define MCABBER_BRANCH_EXPERIMENTAL 1
 
 #define MCABBER_API_HAVE_CMD_ID 1