Module: sems Branch: 1.4 Commit: 8a6f63b6eb1e5a016e929549af897e93b56c5df0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=8a6f63b6eb1e5a016e929549af897e93b56c5df0
Author: Stefan Sayer <[email protected]> Committer: Stefan Sayer <[email protected]> Date: Thu Aug 25 19:27:02 2011 +0200 1.4 branch build version --- Makefile.defs | 26 +++++++++++++------------- doc/CHANGELOG | 11 +++++++++++ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index c2183c2..d34eb9f 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -3,20 +3,20 @@ else makefile_defs=1 export makefile_defs -#GIT = $(shell which git) -#SVNVERSION = $(shell which svnversion) - -#ifneq ($(GIT),) -# SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \ -# then git describe --always --dirty 2>/dev/null; \ -# else git describe --always 2>/dev/null; fi) -#endif -# -#ifeq ($(SCM_REV),) -#ifneq ($(SVNVERSION),) -# SCM_REV = r$(shell svnversion -n .) -#endif -#endif +GIT = $(shell which git) +SVNVERSION = $(shell which svnversion) + +ifneq ($(GIT),) + SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \ + then git describe --always --dirty 2>/dev/null; \ + else git describe --always 2>/dev/null; fi) +endif + +ifeq ($(SCM_REV),) +ifneq ($(SVNVERSION),) + SCM_REV = r$(shell svnversion -n .) +endif +endif #version number VERSION = 1 diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 139e2d7..97225e0 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,5 +1,16 @@ Changelog for SEMS +Version 1.4.2 + - auth'ed BYE (wait_for_bye_transaction) + - fixes SIP auth for qop header format + - xmlrpc: fix busyloop with keep-alive + - a few minor SST issues + - builds on Ubuntu 11.4 (build-deps) + - ivr: release GIL on blocking file I/O + - SBC: fix codec filter for unnamed payloads<96 + - fixed DSM variables to outgoing call + - some examples and documentation added + Version 1.4.1 make system: _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
