From 06d72e3ce7eb99ea0b904583cf7f21d014ea4948 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 27 Jan 2012 13:55:45 -0600 Subject: Version bump to 1.2.1 Signed-off-by: Sol Jerome --- debian/changelog | 6 ++++++ doc/conf.py | 2 +- misc/bcfg2.spec | 2 +- 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, 16 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index d6f08a101..5722eeb97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bcfg2 (1.2.1-0.0) unstable; urgency=low + + * New upstream release + + -- Sol Jerome Fri, 27 Jan 2012 13:55:45 -0600 + bcfg2 (1.2.0-0.0) unstable; urgency=low * New upstream release diff --git a/doc/conf.py b/doc/conf.py index 96d2d715d..7e9c8b59c 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.0' +release = '1.2.1' # 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 a3554c6fa..2d7854cb5 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -13,7 +13,7 @@ %define lxmldep %(rpm -q %{alt_lxml} 2>&1 > /dev/null && echo %{alt_lxml} || echo %{dfl_lxml}) Name: bcfg2 -Version: 1.2.0 +Version: 1.2.1 Release: %{release} Summary: Configuration management system diff --git a/osx/Makefile b/osx/Makefile index aa0c13650..279ad0f6f 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.0 +BCFGVER = 1.2.1 MAJOR = 1 -MINOR = 20 +MINOR = 21 default: clean client diff --git a/redhat/VERSION b/redhat/VERSION index 26aaba0e8..6085e9465 100644 --- a/redhat/VERSION +++ b/redhat/VERSION @@ -1 +1 @@ -1.2.0 +1.2.1 diff --git a/setup.py b/setup.py index 0f51ed4c5..da84b9756 100755 --- a/setup.py +++ b/setup.py @@ -121,7 +121,7 @@ if sys.hexversion < 0x03000000 and os.path.exists(py3lib): setup(cmdclass=cmdclass, name="Bcfg2", - version="1.2.1a1", + version="1.2.1", description="Bcfg2 Server", author="Narayan Desai", author_email="desai@mcs.anl.gov", diff --git a/solaris/Makefile b/solaris/Makefile index 816f93e14..be98f345d 100644 --- a/solaris/Makefile +++ b/solaris/Makefile @@ -1,7 +1,7 @@ #!/usr/sfw/bin/gmake PYTHON="/opt/csw/bin/python" -VERS=1.2.0-1 +VERS=1.2.1-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 aa57a7c19..c4633f209 100644 --- a/solaris/pkginfo.bcfg2 +++ b/solaris/pkginfo.bcfg2 @@ -1,7 +1,7 @@ PKG="SCbcfg2" NAME="bcfg2" ARCH="sparc" -VERSION="1.2.0" +VERSION="1.2.1" 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 485eda903..762625967 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.0" +VERSION="1.2.1" 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 75f46c426..a12bf66ba 100644 --- a/src/lib/Server/Reports/reports/templates/base.html +++ b/src/lib/Server/Reports/reports/templates/base.html @@ -87,7 +87,7 @@
-- cgit v1.2.3-1-g7c22