summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--doc/conf.py2
-rw-r--r--misc/bcfg2.spec6
-rw-r--r--osx/Makefile4
-rw-r--r--redhat/VERSION2
-rwxr-xr-xsetup.py1
-rw-r--r--solaris/Makefile2
-rw-r--r--solaris/pkginfo.bcfg22
-rw-r--r--solaris/pkginfo.bcfg2-server2
-rw-r--r--src/lib/Bcfg2/Server/Reports/reports/templates/base.html2
10 files changed, 18 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 2557dd66a..c77acc0e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (1.2.3-0.0) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sol Jerome <sol.jerome@gmail.com> Tue, 03 Jul 2012 09:33:50 -0500
+
bcfg2 (1.2.2-0.0) unstable; urgency=low
* New upstream release
diff --git a/doc/conf.py b/doc/conf.py
index 5903b009a..b3d6ade7a 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.2'
+release = '1.2.3'
# 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 d4d5c5f1c..e46d32c88 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.2
+Version: 1.2.3
Release: %{release}
Summary: Configuration management system
@@ -98,7 +98,7 @@ deployment strategies.
This package includes the Bcfg2 client software.
%package server
-Version: 1.2.2
+Version: 1.2.3
Summary: Bcfg2 Server
%if 0%{?suse_version}
Group: System/Management
@@ -182,7 +182,7 @@ deployment strategies.
This package includes the Bcfg2 documentation.
%package web
-Version: 1.2.2
+Version: 1.2.3
Summary: Bcfg2 Web Reporting Interface
%if 0%{?suse_version}
Group: System/Management
diff --git a/osx/Makefile b/osx/Makefile
index 72751ff32..d3a2d4b90 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.2
+BCFGVER = 1.2.3
MAJOR = 1
-MINOR = 22
+MINOR = 23
default: clean client
diff --git a/redhat/VERSION b/redhat/VERSION
index 23aa83906..0495c4a88 100644
--- a/redhat/VERSION
+++ b/redhat/VERSION
@@ -1 +1 @@
-1.2.2
+1.2.3
diff --git a/setup.py b/setup.py
index 3e5cd1ddc..0d9bb5cd9 100755
--- a/setup.py
+++ b/setup.py
@@ -124,6 +124,7 @@ if need_m2crypto:
setup(cmdclass=cmdclass,
name="Bcfg2",
+ version="1.2.3",
description="Bcfg2 Server",
author="Narayan Desai",
author_email="desai@mcs.anl.gov",
diff --git a/solaris/Makefile b/solaris/Makefile
index 9ca87fc48..39a279bb8 100644
--- a/solaris/Makefile
+++ b/solaris/Makefile
@@ -1,7 +1,7 @@
#!/usr/sfw/bin/gmake
PYTHON="/usr/local/bin/python"
-VERS=1.2.2-1
+VERS=1.2.3-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 0ff18516d..73696651c 100644
--- a/solaris/pkginfo.bcfg2
+++ b/solaris/pkginfo.bcfg2
@@ -1,7 +1,7 @@
PKG="SCbcfg2"
NAME="bcfg2"
ARCH="sparc"
-VERSION="1.2.2"
+VERSION="1.2.3"
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 a0958f9e4..af2f016b0 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.2"
+VERSION="1.2.3"
CATEGORY="application"
VENDOR="Argonne National Labratory"
EMAIL="bcfg-dev@mcs.anl.gov"
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/base.html b/src/lib/Bcfg2/Server/Reports/reports/templates/base.html
index 625177390..3fa482a19 100644
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/base.html
+++ b/src/lib/Bcfg2/Server/Reports/reports/templates/base.html
@@ -88,7 +88,7 @@
<div style='clear:both'></div>
</div><!-- document -->
<div id="footer">
- <span>Bcfg2 Version 1.2.2</span>
+ <span>Bcfg2 Version 1.2.3</span>
</div>
<div id="calendar_div" style='position:absolute; visibility:hidden; background-color:white; layer-background-color:white;'></div>