1 [local] Switch to experimental branch and api version |
1 [local] Switch to experimental branch and api version |
2 |
2 |
3 diff -r 6dca189957d2 mcabber/ChangeLog.api |
3 diff -r a466d2a1ca15 mcabber/ChangeLog.api |
4 --- a/mcabber/ChangeLog.api Wed May 15 12:48:53 2013 +0300 |
4 --- a/mcabber/ChangeLog.api Wed Nov 12 00:15:59 2014 +0200 |
5 +++ b/mcabber/ChangeLog.api Wed May 15 12:52:07 2013 +0300 |
5 +++ b/mcabber/ChangeLog.api Wed Nov 12 00:16:06 2014 +0200 |
6 @@ -1,3 +1,12 @@ |
6 @@ -1,3 +1,12 @@ |
|
7 +experimental (43) |
|
8 + |
|
9 + * Change branch to "experimental". |
|
10 + * Api as defined by dev:26 |
|
11 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h |
|
12 + * MQ Patch: switch-to-experimental.diff |
|
13 + |
|
14 + -- Myhailo Danylenko, 2014-11-11 |
|
15 + |
|
16 dev (36) |
|
17 |
|
18 * process_command() does not return value |
|
19 @@ -87,6 +96,15 @@ |
|
20 |
|
21 -- Mikael Berthe, 2013-09-29 |
|
22 |
7 +experimental (41) |
23 +experimental (41) |
8 + |
24 + |
9 + * Change branch to "experimental". |
25 + * Change branch to "experimental". |
10 + * Api as defined by dev:26 |
26 + * Api as defined by dev:26 |
11 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h |
27 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h |
75 + -- Myhailo Danylenko, 2011-06-01 |
91 + -- Myhailo Danylenko, 2011-06-01 |
76 + |
92 + |
77 dev (20) |
93 dev (20) |
78 |
94 |
79 * Add cmd_set_safe() and cmd_is_safe() |
95 * Add cmd_set_safe() and cmd_is_safe() |
80 diff -r 6dca189957d2 mcabber/configure.ac |
96 diff -r a466d2a1ca15 mcabber/configure.ac |
81 --- a/mcabber/configure.ac Wed May 15 12:48:53 2013 +0300 |
97 --- a/mcabber/configure.ac Wed Nov 12 00:15:59 2014 +0200 |
82 +++ b/mcabber/configure.ac Wed May 15 12:52:07 2013 +0300 |
98 +++ b/mcabber/configure.ac Wed Nov 12 00:16:06 2014 +0200 |
83 @@ -281,7 +281,7 @@ |
99 @@ -284,7 +284,7 @@ |
84 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno]) |
100 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno]) |
85 |
101 |
86 # Prepare some config.h variables |
102 # Prepare some config.h variables |
87 -AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch]) |
103 -AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch]) |
88 +AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch]) |
104 +AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch]) |
89 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string]) |
105 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string]) |
90 |
106 |
91 # We need _GNU_SOURCE for strptime() and strcasestr() |
107 # We need _GNU_SOURCE for strptime() and strcasestr() |
92 diff -r 6dca189957d2 mcabber/mcabber/api.h |
108 diff -r a466d2a1ca15 mcabber/mcabber/api.h |
93 --- a/mcabber/mcabber/api.h Wed May 15 12:48:53 2013 +0300 |
109 --- a/mcabber/mcabber/api.h Wed Nov 12 00:15:59 2014 +0200 |
94 +++ b/mcabber/mcabber/api.h Wed May 15 12:52:07 2013 +0300 |
110 +++ b/mcabber/mcabber/api.h Wed Nov 12 00:16:06 2014 +0200 |
95 @@ -4,10 +4,10 @@ |
111 @@ -4,10 +4,10 @@ |
96 #include <glib.h> |
112 #include <glib.h> |
97 #include <mcabber/config.h> // For MCABBER_BRANCH |
113 #include <mcabber/config.h> // For MCABBER_BRANCH |
98 |
114 |
99 -#define MCABBER_API_VERSION 26 |
115 -#define MCABBER_API_VERSION 36 |
100 -#define MCABBER_API_MIN 24 |
116 -#define MCABBER_API_MIN 36 |
101 - |
117 +#define MCABBER_API_VERSION 43 |
|
118 +#define MCABBER_API_MIN 43 |
|
119 |
102 -#define MCABBER_BRANCH_DEV 1 |
120 -#define MCABBER_BRANCH_DEV 1 |
103 +#define MCABBER_API_VERSION 41 |
|
104 +#define MCABBER_API_MIN 41 |
|
105 + |
|
106 +#define MCABBER_BRANCH_EXPERIMENTAL 1 |
121 +#define MCABBER_BRANCH_EXPERIMENTAL 1 |
107 |
122 |
108 // cmd_add returns gpointer id |
123 // cmd_add returns gpointer id |
109 #define MCABBER_API_HAVE_CMD_ID 1 |
124 #define MCABBER_API_HAVE_CMD_ID 1 |