From 9bd0dc42c6df7fbf3878187638da8c8276a1254b Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 11 Nov 2018 12:20:51 +0100
Subject: [PATCH] 3.9 develop branch

---
 CHANGELOG.md                    | 11 +++++++++++
 README_DEVELOP.md => DEVELOP.md | 10 +++++++++-
 configure                       |  4 ++--
 configure.ac                    |  4 ++--
 docker/Makefile.in              |  2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)
 rename README_DEVELOP.md => DEVELOP.md (92%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fdfe034..dccf9718 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Clixon Changelog
 
+## 3.9.0 (Preliminary Target: 31 December 2018)
+
+### Planned new features
+* [Roadmap](ROADMAP.md) (Uncommitted and unprioritized)
+
+### Major New features
+### API changes on existing features (you may need to change your code)
+### Minor changes
+### Corrected Bugs
+### Known issues
+
 ## 3.8.0 (6 Nov 2018)
 
 ### Major New features
diff --git a/README_DEVELOP.md b/DEVELOP.md
similarity index 92%
rename from README_DEVELOP.md
rename to DEVELOP.md
index 350d3636..fb66e641 100644
--- a/README_DEVELOP.md
+++ b/DEVELOP.md
@@ -4,6 +4,7 @@
   * [How to work in git (branching)](#branching)
   * [How the meta-configure stuff works](#meta-configure)
   * [How to debug](#debug)
+  * [New release](#new-release)
 
 ## Documentation
 How to document the code
@@ -92,4 +93,11 @@ EOF
   valgrind --leak-check=full --show-leak-kinds=all clixon_netconf -qf /tmp/myconf.xml -y /tmp/my.yang
   valgrind --tool=callgrind clixon_netconf -qf /tmp/myconf.xml -y /tmp/my.yang
   sudo kcachegrind
- ```
\ No newline at end of file
+ ```
+
+## New release
+What to think about when doing a new release.
+* git merge --no-ff develop
+* change CLIXON_VERSION in configure.ac
+* git tag -a <version"
+* git push origin <version>
diff --git a/configure b/configure
index 27dc733f..9428e91f 100755
--- a/configure
+++ b/configure
@@ -2161,9 +2161,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 : ${INSTALLFLAGS="-s"}
 
 CLIXON_VERSION_MAJOR="3"
-CLIXON_VERSION_MINOR="8"
+CLIXON_VERSION_MINOR="9"
 CLIXON_VERSION_PATCH="0"
-CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
+CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\""
 
 # Fix to specific CLIgen version (eg 3.5) or head (3)
 CLIGEN_VERSION="3"
diff --git a/configure.ac b/configure.ac
index e6c08194..c46628fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,9 +43,9 @@ AC_INIT(lib/clixon/clixon.h.in)
 : ${INSTALLFLAGS="-s"}
 
 CLIXON_VERSION_MAJOR="3"
-CLIXON_VERSION_MINOR="8"
+CLIXON_VERSION_MINOR="9"
 CLIXON_VERSION_PATCH="0"
-CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
+CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\""
 
 # Fix to specific CLIgen version (eg 3.5) or head (3) 
 CLIGEN_VERSION="3" 
diff --git a/docker/Makefile.in b/docker/Makefile.in
index 23d0a7e8..c18b9fad 100644
--- a/docker/Makefile.in
+++ b/docker/Makefile.in
@@ -55,7 +55,7 @@ distclean: clean
 	rm -f Makefile *~ .depend
 
 docker:
-	sudo docker build -t $(IMAGE) .
+	sudo docker build -t $(IMAGE) .  # --no-cache
 	echo "cd ../example; make docker to build example application"
 
 push: