1 [local] Switch to experimental branch and api version |
1 [local] Switch to experimental branch and api version |
2 |
2 |
3 diff -r f83dee7bacc8 mcabber/ChangeLog.api |
3 diff -r dd8cbf58c62e mcabber/ChangeLog.api |
4 --- a/mcabber/ChangeLog.api Tue Nov 27 12:03:05 2012 +0200 |
4 --- a/mcabber/ChangeLog.api Fri Nov 30 14:59:29 2012 +0200 |
5 +++ b/mcabber/ChangeLog.api Tue Nov 27 12:03:13 2012 +0200 |
5 +++ b/mcabber/ChangeLog.api Fri Nov 30 15:00:22 2012 +0200 |
6 @@ -1,3 +1,12 @@ |
6 @@ -1,3 +1,12 @@ |
|
7 +experimental (39) |
|
8 + |
|
9 + * Change branch to "experimental". |
|
10 + * Api as defined by dev:25 |
|
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 (25) |
|
17 |
|
18 * MQ patch record_dev25_in_changelog.diff |
|
19 @@ -5,6 +14,15 @@ |
|
20 |
|
21 -- Mikael Berthe, 2012-11-28 |
|
22 |
7 +experimental (37) |
23 +experimental (37) |
8 + |
24 + |
9 + * Change branch to "experimental". |
25 + * Change branch to "experimental". |
10 + * Api as defined by dev:24 |
26 + * Api as defined by dev:24 |
11 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h |
27 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h |
43 + -- Myhailo Danylenko, 2011-06-01 |
59 + -- Myhailo Danylenko, 2011-06-01 |
44 + |
60 + |
45 dev (20) |
61 dev (20) |
46 |
62 |
47 * Add cmd_set_safe() and cmd_is_safe() |
63 * Add cmd_set_safe() and cmd_is_safe() |
48 diff -r f83dee7bacc8 mcabber/configure.ac |
64 diff -r dd8cbf58c62e mcabber/configure.ac |
49 --- a/mcabber/configure.ac Tue Nov 27 12:03:05 2012 +0200 |
65 --- a/mcabber/configure.ac Fri Nov 30 14:59:29 2012 +0200 |
50 +++ b/mcabber/configure.ac Tue Nov 27 12:03:13 2012 +0200 |
66 +++ b/mcabber/configure.ac Fri Nov 30 15:00:22 2012 +0200 |
51 @@ -272,7 +272,7 @@ |
67 @@ -272,7 +272,7 @@ |
52 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno]) |
68 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno]) |
53 |
69 |
54 # Prepare some config.h variables |
70 # Prepare some config.h variables |
55 -AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch]) |
71 -AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch]) |
56 +AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch]) |
72 +AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch]) |
57 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string]) |
73 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string]) |
58 |
74 |
59 # We need _GNU_SOURCE for strptime() and strcasestr() |
75 # We need _GNU_SOURCE for strptime() and strcasestr() |
60 diff -r f83dee7bacc8 mcabber/mcabber/api.h |
76 diff -r dd8cbf58c62e mcabber/mcabber/api.h |
61 --- a/mcabber/mcabber/api.h Tue Nov 27 12:03:05 2012 +0200 |
77 --- a/mcabber/mcabber/api.h Fri Nov 30 14:59:29 2012 +0200 |
62 +++ b/mcabber/mcabber/api.h Tue Nov 27 12:03:13 2012 +0200 |
78 +++ b/mcabber/mcabber/api.h Fri Nov 30 15:00:22 2012 +0200 |
63 @@ -4,10 +4,10 @@ |
79 @@ -4,10 +4,10 @@ |
64 #include <glib.h> |
80 #include <glib.h> |
65 #include <mcabber/config.h> // For MCABBER_BRANCH |
81 #include <mcabber/config.h> // For MCABBER_BRANCH |
66 |
82 |
67 -#define MCABBER_API_VERSION 24 |
83 -#define MCABBER_API_VERSION 25 |
68 -#define MCABBER_API_MIN 24 |
84 -#define MCABBER_API_MIN 24 |
69 +#define MCABBER_API_VERSION 37 |
85 +#define MCABBER_API_VERSION 39 |
70 +#define MCABBER_API_MIN 37 |
86 +#define MCABBER_API_MIN 39 |
71 |
87 |
72 -#define MCABBER_BRANCH_DEV 1 |
88 -#define MCABBER_BRANCH_DEV 1 |
73 +#define MCABBER_BRANCH_EXPERIMENTAL 1 |
89 +#define MCABBER_BRANCH_EXPERIMENTAL 1 |
74 |
90 |
75 // cmd_add returns gpointer id |
91 // cmd_add returns gpointer id |