summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2011-12-07 20:22:57 -0600
committerSol Jerome <sol.jerome@gmail.com>2011-12-07 20:22:57 -0600
commit0dad8cbb8fe8ff6287fb193a1a66bb5e536e20de (patch)
treee451d5487fc793fc92b5ae5bf17ba36eea9ce8f9
parentdcfc8525df6e7ffda75f55691dd67d2544c24347 (diff)
downloadbcfg2-0dad8cbb8fe8ff6287fb193a1a66bb5e536e20de.tar.gz
bcfg2-0dad8cbb8fe8ff6287fb193a1a66bb5e536e20de.tar.bz2
bcfg2-0dad8cbb8fe8ff6287fb193a1a66bb5e536e20de.zip
Version bump to 1.2.0v1.2.0
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r--debian/changelog6
-rw-r--r--misc/bcfg2.spec2
-rw-r--r--osx/Makefile2
-rw-r--r--redhat/RELEASE2
-rwxr-xr-xsetup.py2
-rw-r--r--solaris/Makefile2
-rw-r--r--solaris/pkginfo.bcfg22
-rw-r--r--solaris/pkginfo.bcfg2-server2
-rw-r--r--src/lib/Server/Reports/reports/templates/base.html2
9 files changed, 14 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 4ffb409b5..d6f08a101 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (1.2.0-0.0) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sol Jerome <sol.jerome@gmail.com> Wed, 07 Dec 2011 20:22:57 -0600
+
bcfg2 (1.2.0rc2-0.0) unstable; urgency=low
* New upstream release
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index 6ea3e14a8..d19fc0b2d 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.0rc2
+Version: 1.2.0
Release: %{release}
Summary: Configuration management system
diff --git a/osx/Makefile b/osx/Makefile
index 09be89f74..aa0c13650 100644
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -29,7 +29,7 @@ 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.0rc2
+BCFGVER = 1.2.0
MAJOR = 1
MINOR = 20
diff --git a/redhat/RELEASE b/redhat/RELEASE
index c39908ef3..ba66466c2 100644
--- a/redhat/RELEASE
+++ b/redhat/RELEASE
@@ -1 +1 @@
-0.0rc2
+0.0
diff --git a/setup.py b/setup.py
index ed7e0a965..8787680aa 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.0rc2",
+ version="1.2.0",
description="Bcfg2 Server",
author="Narayan Desai",
author_email="desai@mcs.anl.gov",
diff --git a/solaris/Makefile b/solaris/Makefile
index 5f5caa397..816f93e14 100644
--- a/solaris/Makefile
+++ b/solaris/Makefile
@@ -1,7 +1,7 @@
#!/usr/sfw/bin/gmake
PYTHON="/opt/csw/bin/python"
-VERS=1.2.0rc2-1
+VERS=1.2.0-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 3e1aadde2..aa57a7c19 100644
--- a/solaris/pkginfo.bcfg2
+++ b/solaris/pkginfo.bcfg2
@@ -1,7 +1,7 @@
PKG="SCbcfg2"
NAME="bcfg2"
ARCH="sparc"
-VERSION="1.2.0rc2"
+VERSION="1.2.0"
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 1ac36461d..485eda903 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.0rc2"
+VERSION="1.2.0"
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 5be0c8679..75f46c426 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.0rc2</span>
+ <span>Bcfg2 Version 1.2.0</span>
</div>
<div id="calendar_div" style='position:absolute; visibility:hidden; background-color:white; layer-background-color:white;'></div>