From b6a7c56ad3d584d71136e469d40edea28ea43f19 Mon Sep 17 00:00:00 2001 From: tgoff0 Date: Fri, 5 Jun 2015 22:02:08 +0000 Subject: [PATCH] Declare version 4.8. --- Changelog | 2 +- configure.ac | 4 ++-- packaging/deb/changelog | 4 ++-- packaging/rpm/core.spec.in | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Changelog b/Changelog index fd104f0a..27a081a6 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,4 @@ -2015-05-21 CORE 4.8rc1 +2015-06-05 CORE 4.8 * EMANE: - support for EMANE 0.9.2 - run emane in each container when using EMANE 0.9.2 diff --git a/configure.ac b/configure.ac index 5568f934..dc5803e8 100644 --- a/configure.ac +++ b/configure.ac @@ -12,10 +12,10 @@ # # this defines the CORE version number, must be static for AC_INIT # -AC_INIT(core, 4.8rc1, core-dev@pf.itd.nrl.navy.mil) +AC_INIT(core, 4.8, core-dev@pf.itd.nrl.navy.mil) VERSION=$PACKAGE_VERSION CORE_VERSION=$PACKAGE_VERSION -CORE_VERSION_DATE=20141010 +CORE_VERSION_DATE=20150605 COREDPY_VERSION=$PACKAGE_VERSION # diff --git a/packaging/deb/changelog b/packaging/deb/changelog index e185faf2..1f9f83fe 100644 --- a/packaging/deb/changelog +++ b/packaging/deb/changelog @@ -1,8 +1,8 @@ -core (4.8rc1-0ubuntu1) precise; urgency=low +core (4.8-0ubuntu1) precise; urgency=low * Support for NRL Network Modeling Framework (NMF) XML representation, bugfixes - -- CORE Developers Thu, 21 May 2015 10:37:10 -0700 + -- CORE Developers Fri, 05 Jun 2015 00:00:00 -0700 core (4.7-0ubuntu1) precise; urgency=low diff --git a/packaging/rpm/core.spec.in b/packaging/rpm/core.spec.in index ff79c00e..3ad71c69 100644 --- a/packaging/rpm/core.spec.in +++ b/packaging/rpm/core.spec.in @@ -383,7 +383,7 @@ sed -i 's/emane_realtime = True/emane_realtime = False/' /etc/core/core.conf %{_sbindir}/vnoded %changelog -* Thu May 21 2015 CORE Developers - 4.8rc1 +* Thu Jun 5 2015 CORE Developers - 4.8 - Support for NRL Network Modeling Framework (NMF) XML representation, bugfixes * Wed Aug 6 2014 Jeff Ahrenholz - 4.7 - EMANE 0.9.1, asymmetric links, bugfixes