switch-to-experimental.diff
author Myhailo Danylenko <isbear@ukrpost.net>
Wed, 15 May 2013 13:07:05 +0300
changeset 85 93c3cc0d7891
parent 59 a7e239972130
child 87 78238d26911a
permissions -rw-r--r--
[refresh] Add round-high-priority.diff, refresh => API 41-42 * add round-high-priority.diff * refresh patches according to changes in upstream * API version bump - 41-42

[local] Switch to experimental branch and api version

diff -r 6dca189957d2 mcabber/ChangeLog.api
--- a/mcabber/ChangeLog.api	Wed May 15 12:48:53 2013 +0300
+++ b/mcabber/ChangeLog.api	Wed May 15 12:52:07 2013 +0300
@@ -1,3 +1,12 @@
+experimental (41)
+
+ * Change branch to "experimental".
+ * Api as defined by dev:26
+ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
+ * MQ Patch: switch-to-experimental.diff
+
+  -- Myhailo Danylenko, 2012-11-30
+
 dev (26)
 
  * Changeset 69699ba3010f
@@ -7,6 +16,15 @@
 
   -- Mikael Berthe, 2013-04-28
 
+experimental (39)
+
+ * Change branch to "experimental".
+ * Api as defined by dev:25
+ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
+ * MQ Patch: switch-to-experimental.diff
+
+  -- Myhailo Danylenko, 2012-11-30
+
 dev (25)
 
  * Stable api 0.10.2:1
@@ -15,6 +33,15 @@
 
   -- Mikael Berthe, 2012-11-28
 
+experimental (37)
+
+ * 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-10-18
+
 dev (24)
 
  * Changeset 0cb8ea02e472
@@ -24,6 +51,15 @@
 
   -- Myhailo Danylenko, 2012-10-20
 
+experimental (35)
+
+ * Change branch to "experimental".
+ * Api as defined by dev:23
+ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
+ * MQ Patch: switch-to-experimental
+
+  -- Myhailo Danylenko, 2012-04-30
+
 dev (23)
 
  * Changeset 8dc418af3e72
@@ -45,6 +81,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 6dca189957d2 mcabber/configure.ac
--- a/mcabber/configure.ac	Wed May 15 12:48:53 2013 +0300
+++ b/mcabber/configure.ac	Wed May 15 12:52:07 2013 +0300
@@ -281,7 +281,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 6dca189957d2 mcabber/mcabber/api.h
--- a/mcabber/mcabber/api.h	Wed May 15 12:48:53 2013 +0300
+++ b/mcabber/mcabber/api.h	Wed May 15 12:52:07 2013 +0300
@@ -4,10 +4,10 @@
 #include <glib.h>
 #include <mcabber/config.h> // For MCABBER_BRANCH
 
-#define MCABBER_API_VERSION 26
-#define MCABBER_API_MIN     24
-
-#define MCABBER_BRANCH_DEV  1
+#define MCABBER_API_VERSION 41
+#define MCABBER_API_MIN     41
+ 
+#define MCABBER_BRANCH_EXPERIMENTAL 1
 
 // cmd_add returns gpointer id
 #define MCABBER_API_HAVE_CMD_ID 1