From fc47d3f057344bf12d2eef1cce9cb986795620a6 Mon Sep 17 00:00:00 2001
From: Sol Jerome <sol.jerome@gmail.com>
Date: Tue, 26 Mar 2013 12:46:15 -0500
Subject: Version bump to 1.2.4

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
---
 debian/changelog                                   | 6 ++++++
 doc/conf.py                                        | 2 +-
 misc/bcfg2.spec                                    | 6 +++---
 osx/Makefile                                       | 4 ++--
 redhat/VERSION                                     | 2 +-
 setup.py                                           | 2 +-
 solaris/Makefile                                   | 2 +-
 solaris/pkginfo.bcfg2                              | 2 +-
 solaris/pkginfo.bcfg2-server                       | 2 +-
 src/lib/Server/Reports/reports/templates/base.html | 2 +-
 10 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c77acc0e7..b0e37dfa4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (1.2.4-0.0) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sol Jerome <sol.jerome@gmail.com>  Tue, 26 Mar 2013 12:46:15 -0500
+
 bcfg2 (1.2.3-0.0) unstable; urgency=low
 
   * New upstream release
diff --git a/doc/conf.py b/doc/conf.py
index 01ea6ad30..b7f8f2715 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -55,7 +55,7 @@ else:
 # The short X.Y version.
 version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.3'
+release = '1.2.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index 53ec70bf9..931d3770e 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -6,7 +6,7 @@
 %{!?_initrddir: %define _initrddir %{_sysconfdir}/rc.d/init.d}
 
 Name:             bcfg2
-Version:          1.2.3
+Version:          1.2.4
 Release:          %{release}
 Summary:          Configuration management system
 
@@ -91,7 +91,7 @@ deployment strategies.
 This package includes the Bcfg2 client software.
 
 %package -n bcfg2-server
-Version:          1.2.3
+Version:          1.2.4
 Summary:          Bcfg2 Server
 %if 0%{?suse_version}
 Group:            System/Management
@@ -173,7 +173,7 @@ deployment strategies.
 This package includes the Bcfg2 documentation.
 
 %package -n bcfg2-web
-Version:          1.2.3
+Version:          1.2.4
 Summary:          Bcfg2 Web Reporting Interface
 %if 0%{?suse_version}
 Group:            System/Management
diff --git a/osx/Makefile b/osx/Makefile
index d3a2d4b90..193d751cf 100644
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -29,9 +29,9 @@ SITELIBDIR = /Library/Python/${PYVERSION}/site-packages
 # an Info.plist file for packagemaker to look at for package creation
 # and substitute the version strings. Major/Minor versions can only be
 # integers (e.g. "1" and "00" for bcfg2 version 1.0.0.
-BCFGVER = 1.2.3
+BCFGVER = 1.2.4
 MAJOR = 1
-MINOR = 23
+MINOR = 24
 
 default: clean client
 
diff --git a/redhat/VERSION b/redhat/VERSION
index 0495c4a88..e8ea05db8 100644
--- a/redhat/VERSION
+++ b/redhat/VERSION
@@ -1 +1 @@
-1.2.3
+1.2.4
diff --git a/setup.py b/setup.py
index e6a08b172..8fd385953 100755
--- a/setup.py
+++ b/setup.py
@@ -131,7 +131,7 @@ if need_m2crypto:
 
 setup(cmdclass=cmdclass,
       name="Bcfg2",
-      version="1.2.3",
+      version="1.2.4",
       description="Bcfg2 Server",
       author="Narayan Desai",
       author_email="desai@mcs.anl.gov",
diff --git a/solaris/Makefile b/solaris/Makefile
index 39a279bb8..1826cafef 100644
--- a/solaris/Makefile
+++ b/solaris/Makefile
@@ -1,7 +1,7 @@
 #!/usr/sfw/bin/gmake
 
 PYTHON="/usr/local/bin/python"
-VERS=1.2.3-1
+VERS=1.2.4-1
 PYVERSION := $(shell $(PYTHON) -c "import sys; print sys.version[0:3]")
 
 default: clean package
diff --git a/solaris/pkginfo.bcfg2 b/solaris/pkginfo.bcfg2
index 73696651c..90c628c53 100644
--- a/solaris/pkginfo.bcfg2
+++ b/solaris/pkginfo.bcfg2
@@ -1,7 +1,7 @@
 PKG="SCbcfg2"
 NAME="bcfg2"
 ARCH="sparc"
-VERSION="1.2.3"
+VERSION="1.2.4"
 CATEGORY="application"
 VENDOR="Argonne National Labratory"
 EMAIL="bcfg-dev@mcs.anl.gov"
diff --git a/solaris/pkginfo.bcfg2-server b/solaris/pkginfo.bcfg2-server
index af2f016b0..0e865522c 100644
--- a/solaris/pkginfo.bcfg2-server
+++ b/solaris/pkginfo.bcfg2-server
@@ -1,7 +1,7 @@
 PKG="SCbcfg2-server"
 NAME="bcfg2-server"
 ARCH="sparc"
-VERSION="1.2.3"
+VERSION="1.2.4"
 CATEGORY="application"
 VENDOR="Argonne National Labratory"
 EMAIL="bcfg-dev@mcs.anl.gov"
diff --git a/src/lib/Server/Reports/reports/templates/base.html b/src/lib/Server/Reports/reports/templates/base.html
index dc073d29b..42cf213bf 100644
--- a/src/lib/Server/Reports/reports/templates/base.html
+++ b/src/lib/Server/Reports/reports/templates/base.html
@@ -87,7 +87,7 @@
   <div style='clear:both'></div>
 </div><!-- document -->
   <div id="footer">
-    <span>Bcfg2 Version 1.2.3</span>
+    <span>Bcfg2 Version 1.2.4</span>
     </div>
 
 <div id="calendar_div" style='position:absolute; visibility:hidden; background-color:white; layer-background-color:white;'></div>
-- 
cgit v1.2.3-1-g7c22