From 6bc003a0b0fed2af526a7c4fe15ba971d5836455 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Wed, 1 Feb 2017 14:50:58 +0100
Subject: [PATCH] This is release 2.3.5a

---
 distrib/core/HOWTO | 21 +++++++--------------
 pub/CHANGELOG      |  2 +-
 pub/CMakeLists.txt |  2 +-
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/distrib/core/HOWTO b/distrib/core/HOWTO
index 2a920455..43c8263b 100755
--- a/distrib/core/HOWTO
+++ b/distrib/core/HOWTO
@@ -1,17 +1,13 @@
 cd /G/f2
-
-### merge devel into master
-# git rebase -i HEAD~99 # correct commit messages; do not go past last tag or branch from master
 git checkout master
 git pull origin master
 git merge --no-ff devel
-git push origin master
 
-### prepare
+git push origin master
 vi pub/CMakeLists.txt # increment version number, remove "post-"
+
 vi pub/CHANGELOG
 
-### purge
 rm -r /G/f2/pub/build
 rm -r /G/f2/pub/qtbuild
 cd /G/f2/pub
@@ -19,18 +15,16 @@ rm *~
 rm */*~
 rm */*/*~
 rm */Doxyfile.bak
-
-### pack
 export V=2.  # 2.<major>.<minor><bugfix>
+
 export A=frida$V
 cd /tmp
 rm $A
 slink /G/f2/pub $A
 tar czvfh ~/data/tgz/$A.tgz $A/*
 dl ~/data/tgz/frida2.* # CHECK size
-rm $A
 
-### update git
+rm $A
 cd /G/f2
 kcom -m "This is release $V"
 kush
@@ -38,10 +32,10 @@ k tag v$V # Yes! Our IT wants version tags to start with "v".
 # to delete erroneous tag: git tag -d $X; git push origin :refs/tags/$X
 kush --tags
 
-### upload tgz
-
 ssh wuttke@a mv /www/apps/src/frida/frida2.* /www/apps/src/frida/old/
+
 scp ~/data/tgz/$A.tgz wuttke@a:/www/apps/src/frida/
+
 scp /G/f2/pub/CHANGELOG wuttke@a:/www/apps/src/frida/frida2-CHANGELOG
 
 ### advertise
@@ -54,10 +48,9 @@ git checkout devel
 git rebase master
 cd /G/f2/pub
 vi CMakeLists.txt # version becomes "post-<release>"
+
 kcom -m "Starting post-$V"
 kush
-
-### rebuild
 cd /G/f2/pub
 mkdir build
 cd build
diff --git a/pub/CHANGELOG b/pub/CHANGELOG
index 2899c558..5cf3b1b8 100644
--- a/pub/CHANGELOG
+++ b/pub/CHANGELOG
@@ -1,4 +1,4 @@
-Release 2.3.5a of
+Release 2.3.5a of 01feb17:
 
 - CMake machinery now uses variables like ${library_name}_LIBRARY
 - Renamed libfrida -> libfridacore, libtrivia -> libfridatrivia
diff --git a/pub/CMakeLists.txt b/pub/CMakeLists.txt
index 86416d7f..0d4f7f01 100644
--- a/pub/CMakeLists.txt
+++ b/pub/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 
 project(Frida)
 
-set(Frida_VERSION post-2.3.4d)
+set(Frida_VERSION 2.3.5a)
 
 include(CTest) # equivalent to "enable_testing() ???
 add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) # => 'make check' is an alias for 'ctest'
-- 
GitLab