[evolution-kolab/ek-wip-porting-imapx: 3/3] src/camel/providers: minor docs update

[Christian Hilberg <chilberg src gnome org>]

commit 93a58ed7d14ba727edca87b16f9d1e49cb673926
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Jan 16 20:02:41 2012 +0100

    src/camel/providers: minor docs update
    
    * adjust git commit information in VERSIONS file
      to the upstream commit numbers as of
      EVOLUTION_DATA_SERVER_3_3_4
    * in the README, refer to the new branch name
      EDS_IMAPX_nobuild which now holds the upstream
      sources

 src/camel/providers/README   |    8 ++++----
 src/camel/providers/VERSIONS |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/camel/providers/README b/src/camel/providers/README
index be6ce76..7384ebd 100644
--- a/src/camel/providers/README
+++ b/src/camel/providers/README
@@ -2,15 +2,15 @@ The source tree starting here keeps the (verbatim) upstream sources which
 we need to access for subclassing them and which are not accessible from outside
 the evolution-data-server sources (which is where we are as standalone plugin).
 
-There is a dedicated branch (currently dev_kc_EDS_IMAPX_nobuild) for keeping
+There is a dedicated branch (currently EDS_IMAPX_nobuild) for keeping
 verbatim copies of upstream sources. Do add new upstream sources there, but
 do not edit them. Instead, do a merge into your own devel branch and apply
-the changes there in a way which allows to diff against the dev_kc_EDS_IMAPX_nobuild
+the changes there in a way which allows to diff against the EDS_IMAPX_nobuild
 branch.
 
-When adding new upstream sources, do so in the dev_kc_EDS_IMAPX_nobuild branch
+When adding new upstream sources, do so in the EDS_IMAPX_nobuild branch
 and edit the VERSIONS file accompanying this readme to reflect your additions
 (i.e., add the exact upstream version from where you took the sources).
 
-The dev_kc_EDS_IMAPX_nobuild branch is a temporary solution which we hopefully
+The EDS_IMAPX_nobuild branch is a temporary solution which we hopefully
 will be able to decommission in future.
diff --git a/src/camel/providers/VERSIONS b/src/camel/providers/VERSIONS
index c8ce7cf..03740e6 100644
--- a/src/camel/providers/VERSIONS
+++ b/src/camel/providers/VERSIONS
@@ -1,3 +1,3 @@
 imapx/
-  upstream		gnome-2.30, c26662e2125144cf2378b5fdf0dd02a618b32fed
-  libcamel1.2-14	2.30.3-0ubuntu1~ppa1
+  upstream		master, 4ce9fbe5debb223d3c0d92c9c5062a3e14d81a5c
+  libcamel1.2           (same as upstream)