author | Myhailo Danylenko <isbear@ukrpost.net> |
Wed, 15 May 2013 13:32:42 +0300 | |
changeset 86 | ac5fed257211 |
parent 85 | 93c3cc0d7891 |
child 87 | 78238d26911a |
permissions | -rw-r--r-- |
29
335662766a88
Some updates to add-cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
1 |
[local] Switch to experimental branch and api version |
335662766a88
Some updates to add-cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
2 |
|
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
3 |
diff -r 6dca189957d2 mcabber/ChangeLog.api |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
4 |
--- a/mcabber/ChangeLog.api Wed May 15 12:48:53 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
5 |
+++ b/mcabber/ChangeLog.api Wed May 15 12:52:07 2013 +0300 |
53
577410087c82
Completion finalizing, api fix
Myhailo Danylenko <isbear@ukrpost.net>
parents:
52
diff
changeset
|
6 |
@@ -1,3 +1,12 @@ |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
7 |
+experimental (41) |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
8 |
+ |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
9 |
+ * Change branch to "experimental". |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
10 |
+ * Api as defined by dev:26 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
11 |
+ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
12 |
+ * MQ Patch: switch-to-experimental.diff |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
13 |
+ |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
14 |
+ -- Myhailo Danylenko, 2012-11-30 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
15 |
+ |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
16 |
dev (26) |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
17 |
|
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
18 |
* Changeset 69699ba3010f |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
19 |
@@ -7,6 +16,15 @@ |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
20 |
|
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
21 |
-- Mikael Berthe, 2013-04-28 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
22 |
|
59
a7e239972130
Update help, bump api (dev:25 -> exp:39-40)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
58
diff
changeset
|
23 |
+experimental (39) |
a7e239972130
Update help, bump api (dev:25 -> exp:39-40)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
58
diff
changeset
|
24 |
+ |
a7e239972130
Update help, bump api (dev:25 -> exp:39-40)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
58
diff
changeset
|
25 |
+ * Change branch to "experimental". |
a7e239972130
Update help, bump api (dev:25 -> exp:39-40)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
58
diff
changeset
|
26 |
+ * Api as defined by dev:25 |
a7e239972130
Update help, bump api (dev:25 -> exp:39-40)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
58
diff
changeset
|
27 |
+ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h |
a7e239972130
Update help, bump api (dev:25 -> exp:39-40)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
58
diff
changeset
|
28 |
+ * MQ Patch: switch-to-experimental.diff |
a7e239972130
Update help, bump api (dev:25 -> exp:39-40)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
58
diff
changeset
|
29 |
+ |
a7e239972130
Update help, bump api (dev:25 -> exp:39-40)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
58
diff
changeset
|
30 |
+ -- Myhailo Danylenko, 2012-11-30 |
a7e239972130
Update help, bump api (dev:25 -> exp:39-40)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
58
diff
changeset
|
31 |
+ |
a7e239972130
Update help, bump api (dev:25 -> exp:39-40)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
58
diff
changeset
|
32 |
dev (25) |
a7e239972130
Update help, bump api (dev:25 -> exp:39-40)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
58
diff
changeset
|
33 |
|
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
34 |
* Stable api 0.10.2:1 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
35 |
@@ -15,6 +33,15 @@ |
59
a7e239972130
Update help, bump api (dev:25 -> exp:39-40)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
58
diff
changeset
|
36 |
|
a7e239972130
Update help, bump api (dev:25 -> exp:39-40)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
58
diff
changeset
|
37 |
-- Mikael Berthe, 2012-11-28 |
a7e239972130
Update help, bump api (dev:25 -> exp:39-40)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
58
diff
changeset
|
38 |
|
52
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
43
diff
changeset
|
39 |
+experimental (37) |
26
65d81aec6691
Resync to mainstream, drop extend-caps
Myhailo Danylenko <isbear@ukrpost.net>
parents:
24
diff
changeset
|
40 |
+ |
52
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
43
diff
changeset
|
41 |
+ * Change branch to "experimental". |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
43
diff
changeset
|
42 |
+ * Api as defined by dev:24 |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
43
diff
changeset
|
43 |
+ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
43
diff
changeset
|
44 |
+ * MQ Patch: switch-to-experimental |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
43
diff
changeset
|
45 |
+ |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
43
diff
changeset
|
46 |
+ -- Myhailo Danylenko, 2012-10-18 |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
43
diff
changeset
|
47 |
+ |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
43
diff
changeset
|
48 |
dev (24) |
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
43
diff
changeset
|
49 |
|
58
04cb7d38c438
Accepted upstream: completion-sorting, refresh
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
50 |
* Changeset 0cb8ea02e472 |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
51 |
@@ -24,6 +51,15 @@ |
58
04cb7d38c438
Accepted upstream: completion-sorting, refresh
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
52 |
|
04cb7d38c438
Accepted upstream: completion-sorting, refresh
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
53 |
-- Myhailo Danylenko, 2012-10-20 |
52
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
43
diff
changeset
|
54 |
|
43
e0cda680d7a8
Move add-offline-message to experimental
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
55 |
+experimental (35) |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
56 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
57 |
+ * Change branch to "experimental". |
52
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
43
diff
changeset
|
58 |
+ * Api as defined by dev:23 |
10
6327de0a7587
Add MCABBER_BRANCH_EXPERIMENTAL
Myhailo Danylenko <isbear@ukrpost.net>
parents:
4
diff
changeset
|
59 |
+ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
60 |
+ * MQ Patch: switch-to-experimental |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
61 |
+ |
26
65d81aec6691
Resync to mainstream, drop extend-caps
Myhailo Danylenko <isbear@ukrpost.net>
parents:
24
diff
changeset
|
62 |
+ -- Myhailo Danylenko, 2012-04-30 |
65d81aec6691
Resync to mainstream, drop extend-caps
Myhailo Danylenko <isbear@ukrpost.net>
parents:
24
diff
changeset
|
63 |
+ |
43
e0cda680d7a8
Move add-offline-message to experimental
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
64 |
dev (23) |
58
04cb7d38c438
Accepted upstream: completion-sorting, refresh
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
65 |
|
43
e0cda680d7a8
Move add-offline-message to experimental
Myhailo Danylenko <isbear@ukrpost.net>
parents:
38
diff
changeset
|
66 |
* Changeset 8dc418af3e72 |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
67 |
@@ -45,6 +81,12 @@ |
26
65d81aec6691
Resync to mainstream, drop extend-caps
Myhailo Danylenko <isbear@ukrpost.net>
parents:
24
diff
changeset
|
68 |
|
65d81aec6691
Resync to mainstream, drop extend-caps
Myhailo Danylenko <isbear@ukrpost.net>
parents:
24
diff
changeset
|
69 |
-- Hermitifier, 2011-10-03 |
65d81aec6691
Resync to mainstream, drop extend-caps
Myhailo Danylenko <isbear@ukrpost.net>
parents:
24
diff
changeset
|
70 |
|
65d81aec6691
Resync to mainstream, drop extend-caps
Myhailo Danylenko <isbear@ukrpost.net>
parents:
24
diff
changeset
|
71 |
+experimental (34) |
65d81aec6691
Resync to mainstream, drop extend-caps
Myhailo Danylenko <isbear@ukrpost.net>
parents:
24
diff
changeset
|
72 |
+ |
65d81aec6691
Resync to mainstream, drop extend-caps
Myhailo Danylenko <isbear@ukrpost.net>
parents:
24
diff
changeset
|
73 |
+ * Api as defined by dev:20 |
65d81aec6691
Resync to mainstream, drop extend-caps
Myhailo Danylenko <isbear@ukrpost.net>
parents:
24
diff
changeset
|
74 |
+ |
65d81aec6691
Resync to mainstream, drop extend-caps
Myhailo Danylenko <isbear@ukrpost.net>
parents:
24
diff
changeset
|
75 |
+ -- Myhailo Danylenko, 2011-06-01 |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
76 |
+ |
19
300fb879c393
Fix api defines and changelog
Mikael Berthe <mikael@lilotux.net>
parents:
18
diff
changeset
|
77 |
dev (20) |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
78 |
|
19
300fb879c393
Fix api defines and changelog
Mikael Berthe <mikael@lilotux.net>
parents:
18
diff
changeset
|
79 |
* Add cmd_set_safe() and cmd_is_safe() |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
80 |
diff -r 6dca189957d2 mcabber/configure.ac |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
81 |
--- a/mcabber/configure.ac Wed May 15 12:48:53 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
82 |
+++ b/mcabber/configure.ac Wed May 15 12:52:07 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
83 |
@@ -281,7 +281,7 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
84 |
AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno]) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
85 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
86 |
# Prepare some config.h variables |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
87 |
-AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch]) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
88 |
+AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch]) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
89 |
AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string]) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
90 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
91 |
# We need _GNU_SOURCE for strptime() and strcasestr() |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
92 |
diff -r 6dca189957d2 mcabber/mcabber/api.h |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
93 |
--- a/mcabber/mcabber/api.h Wed May 15 12:48:53 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
94 |
+++ b/mcabber/mcabber/api.h Wed May 15 12:52:07 2013 +0300 |
53
577410087c82
Completion finalizing, api fix
Myhailo Danylenko <isbear@ukrpost.net>
parents:
52
diff
changeset
|
95 |
@@ -4,10 +4,10 @@ |
577410087c82
Completion finalizing, api fix
Myhailo Danylenko <isbear@ukrpost.net>
parents:
52
diff
changeset
|
96 |
#include <glib.h> |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
97 |
#include <mcabber/config.h> // For MCABBER_BRANCH |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
98 |
|
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
99 |
-#define MCABBER_API_VERSION 26 |
53
577410087c82
Completion finalizing, api fix
Myhailo Danylenko <isbear@ukrpost.net>
parents:
52
diff
changeset
|
100 |
-#define MCABBER_API_MIN 24 |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
101 |
- |
19
300fb879c393
Fix api defines and changelog
Mikael Berthe <mikael@lilotux.net>
parents:
18
diff
changeset
|
102 |
-#define MCABBER_BRANCH_DEV 1 |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
103 |
+#define MCABBER_API_VERSION 41 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
104 |
+#define MCABBER_API_MIN 41 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
59
diff
changeset
|
105 |
+ |
52
887f44e99aa1
Bump API (v37/38), fix completion flags setting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
43
diff
changeset
|
106 |
+#define MCABBER_BRANCH_EXPERIMENTAL 1 |
19
300fb879c393
Fix api defines and changelog
Mikael Berthe <mikael@lilotux.net>
parents:
18
diff
changeset
|
107 |
|
53
577410087c82
Completion finalizing, api fix
Myhailo Danylenko <isbear@ukrpost.net>
parents:
52
diff
changeset
|
108 |
// cmd_add returns gpointer id |
20 | 109 |
#define MCABBER_API_HAVE_CMD_ID 1 |