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