Update series to current dev version
* old changes
* refresh patches
* add update-uk-translation.diff
* add fix-compilation-warning.diff
* add fix-changelog-api.diff
* temporarily deactivate timeformat patches
* new experimental versions 42/43
[local] Switch to experimental branch and api version
diff -r a466d2a1ca15 mcabber/ChangeLog.api
--- a/mcabber/ChangeLog.api Wed Nov 12 00:15:59 2014 +0200
+++ b/mcabber/ChangeLog.api Wed Nov 12 00:16:06 2014 +0200
@@ -1,3 +1,12 @@
+experimental (43)
+
+ * Change branch to "experimental".
+ * Api as defined by dev:26
+ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
+ * MQ Patch: switch-to-experimental.diff
+
+ -- Myhailo Danylenko, 2014-11-11
+
dev (36)
* process_command() does not return value
@@ -87,6 +96,15 @@
-- Mikael Berthe, 2013-09-29
+experimental (41)
+
+ * Change branch to "experimental".
+ * Api as defined by dev:26
+ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
+ * MQ Patch: switch-to-experimental.diff
+
+ -- Myhailo Danylenko, 2012-11-30
+
dev (26)
* Changeset 69699ba3010f
@@ -96,6 +114,15 @@
-- Mikael Berthe, 2013-04-28
+experimental (39)
+
+ * Change branch to "experimental".
+ * Api as defined by dev:25
+ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
+ * MQ Patch: switch-to-experimental.diff
+
+ -- Myhailo Danylenko, 2012-11-30
+
dev (25)
* Stable api 0.10.2:1
@@ -104,6 +131,15 @@
-- Mikael Berthe, 2012-11-28
+experimental (37)
+
+ * Change branch to "experimental".
+ * Api as defined by dev:24
+ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
+ * MQ Patch: switch-to-experimental
+
+ -- Myhailo Danylenko, 2012-10-18
+
dev (24)
* Changeset 0cb8ea02e472
@@ -113,6 +149,15 @@
-- Myhailo Danylenko, 2012-10-20
+experimental (35)
+
+ * Change branch to "experimental".
+ * Api as defined by dev:23
+ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
+ * MQ Patch: switch-to-experimental
+
+ -- Myhailo Danylenko, 2012-04-30
+
dev (23)
* Changeset 8dc418af3e72
@@ -134,6 +179,12 @@
-- Hermitifier, 2011-10-03
+experimental (34)
+
+ * Api as defined by dev:20
+
+ -- Myhailo Danylenko, 2011-06-01
+
dev (20)
* Add cmd_set_safe() and cmd_is_safe()
diff -r a466d2a1ca15 mcabber/configure.ac
--- a/mcabber/configure.ac Wed Nov 12 00:15:59 2014 +0200
+++ b/mcabber/configure.ac Wed Nov 12 00:16:06 2014 +0200
@@ -284,7 +284,7 @@
AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
# Prepare some config.h variables
-AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch])
+AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch])
AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
# We need _GNU_SOURCE for strptime() and strcasestr()
diff -r a466d2a1ca15 mcabber/mcabber/api.h
--- a/mcabber/mcabber/api.h Wed Nov 12 00:15:59 2014 +0200
+++ b/mcabber/mcabber/api.h Wed Nov 12 00:16:06 2014 +0200
@@ -4,10 +4,10 @@
#include <glib.h>
#include <mcabber/config.h> // For MCABBER_BRANCH
-#define MCABBER_API_VERSION 36
-#define MCABBER_API_MIN 36
+#define MCABBER_API_VERSION 43
+#define MCABBER_API_MIN 43
-#define MCABBER_BRANCH_DEV 1
+#define MCABBER_BRANCH_EXPERIMENTAL 1
// cmd_add returns gpointer id
#define MCABBER_API_HAVE_CMD_ID 1