1 [local] Switch to experimental branch and api version |
1 [local] Switch to experimental branch and api version |
2 |
2 |
3 diff -r dd8cbf58c62e mcabber/ChangeLog.api |
3 diff -r 6dca189957d2 mcabber/ChangeLog.api |
4 --- a/mcabber/ChangeLog.api Fri Nov 30 14:59:29 2012 +0200 |
4 --- a/mcabber/ChangeLog.api Wed May 15 12:48:53 2013 +0300 |
5 +++ b/mcabber/ChangeLog.api Fri Nov 30 15:00:22 2012 +0200 |
5 +++ b/mcabber/ChangeLog.api Wed May 15 12:52:07 2013 +0300 |
6 @@ -1,3 +1,12 @@ |
6 @@ -1,3 +1,12 @@ |
|
7 +experimental (41) |
|
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, 2012-11-30 |
|
15 + |
|
16 dev (26) |
|
17 |
|
18 * Changeset 69699ba3010f |
|
19 @@ -7,6 +16,15 @@ |
|
20 |
|
21 -- Mikael Berthe, 2013-04-28 |
|
22 |
7 +experimental (39) |
23 +experimental (39) |
8 + |
24 + |
9 + * Change branch to "experimental". |
25 + * Change branch to "experimental". |
10 + * Api as defined by dev:25 |
26 + * Api as defined by dev:25 |
11 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h |
27 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h |
59 + -- Myhailo Danylenko, 2011-06-01 |
75 + -- Myhailo Danylenko, 2011-06-01 |
60 + |
76 + |
61 dev (20) |
77 dev (20) |
62 |
78 |
63 * Add cmd_set_safe() and cmd_is_safe() |
79 * Add cmd_set_safe() and cmd_is_safe() |
64 diff -r dd8cbf58c62e mcabber/configure.ac |
80 diff -r 6dca189957d2 mcabber/configure.ac |
65 --- a/mcabber/configure.ac Fri Nov 30 14:59:29 2012 +0200 |
81 --- a/mcabber/configure.ac Wed May 15 12:48:53 2013 +0300 |
66 +++ b/mcabber/configure.ac Fri Nov 30 15:00:22 2012 +0200 |
82 +++ b/mcabber/configure.ac Wed May 15 12:52:07 2013 +0300 |
67 @@ -272,7 +272,7 @@ |
83 @@ -281,7 +281,7 @@ |
68 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno]) |
84 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno]) |
69 |
85 |
70 # Prepare some config.h variables |
86 # Prepare some config.h variables |
71 -AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch]) |
87 -AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch]) |
72 +AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch]) |
88 +AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch]) |
73 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string]) |
89 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string]) |
74 |
90 |
75 # We need _GNU_SOURCE for strptime() and strcasestr() |
91 # We need _GNU_SOURCE for strptime() and strcasestr() |
76 diff -r dd8cbf58c62e mcabber/mcabber/api.h |
92 diff -r 6dca189957d2 mcabber/mcabber/api.h |
77 --- a/mcabber/mcabber/api.h Fri Nov 30 14:59:29 2012 +0200 |
93 --- a/mcabber/mcabber/api.h Wed May 15 12:48:53 2013 +0300 |
78 +++ b/mcabber/mcabber/api.h Fri Nov 30 15:00:22 2012 +0200 |
94 +++ b/mcabber/mcabber/api.h Wed May 15 12:52:07 2013 +0300 |
79 @@ -4,10 +4,10 @@ |
95 @@ -4,10 +4,10 @@ |
80 #include <glib.h> |
96 #include <glib.h> |
81 #include <mcabber/config.h> // For MCABBER_BRANCH |
97 #include <mcabber/config.h> // For MCABBER_BRANCH |
82 |
98 |
83 -#define MCABBER_API_VERSION 25 |
99 -#define MCABBER_API_VERSION 26 |
84 -#define MCABBER_API_MIN 24 |
100 -#define MCABBER_API_MIN 24 |
85 +#define MCABBER_API_VERSION 39 |
101 - |
86 +#define MCABBER_API_MIN 39 |
|
87 |
|
88 -#define MCABBER_BRANCH_DEV 1 |
102 -#define MCABBER_BRANCH_DEV 1 |
|
103 +#define MCABBER_API_VERSION 41 |
|
104 +#define MCABBER_API_MIN 41 |
|
105 + |
89 +#define MCABBER_BRANCH_EXPERIMENTAL 1 |
106 +#define MCABBER_BRANCH_EXPERIMENTAL 1 |
90 |
107 |
91 // cmd_add returns gpointer id |
108 // cmd_add returns gpointer id |
92 #define MCABBER_API_HAVE_CMD_ID 1 |
109 #define MCABBER_API_HAVE_CMD_ID 1 |