From 4eacf6985d2724f85f0384b1d44ba8992bed3372 Mon Sep 17 00:00:00 2001
From: Sol Jerome <sol.jerome@gmail.com>
Date: Fri, 28 Oct 2011 14:30:45 -0500
Subject: Version bump to 1.2.0rc2

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
---
 debian/changelog                                   | 6 ++++++
 misc/bcfg2.spec                                    | 2 +-
 osx/Makefile                                       | 2 +-
 redhat/RELEASE                                     | 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 +-
 9 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 05ee3e404..4ffb409b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (1.2.0rc2-0.0) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sol Jerome <sol.jerome@gmail.com>  Fri, 28 Oct 2011 14:30:45 -0500
+
 bcfg2 (1.2.0rc1-0.0) unstable; urgency=low
 
   * New upstream release
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index 33a3c8d71..6ea3e14a8 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.0rc1
+Version:          1.2.0rc2
 Release:          %{release}
 Summary:          Configuration management system
 
diff --git a/osx/Makefile b/osx/Makefile
index b5585fb54..09be89f74 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.0rc1
+BCFGVER = 1.2.0rc2
 MAJOR = 1
 MINOR = 20
 
diff --git a/redhat/RELEASE b/redhat/RELEASE
index 888c3a4b3..c39908ef3 100644
--- a/redhat/RELEASE
+++ b/redhat/RELEASE
@@ -1 +1 @@
-0.0rc1
+0.0rc2
diff --git a/setup.py b/setup.py
index 2498bb8d5..ed7e0a965 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.0rc1",
+      version="1.2.0rc2",
       description="Bcfg2 Server",
       author="Narayan Desai",
       author_email="desai@mcs.anl.gov",
diff --git a/solaris/Makefile b/solaris/Makefile
index 74098f54f..5f5caa397 100644
--- a/solaris/Makefile
+++ b/solaris/Makefile
@@ -1,7 +1,7 @@
 #!/usr/sfw/bin/gmake
 
 PYTHON="/opt/csw/bin/python"
-VERS=1.2.0rc1-1
+VERS=1.2.0rc2-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 b9705a927..3e1aadde2 100644
--- a/solaris/pkginfo.bcfg2
+++ b/solaris/pkginfo.bcfg2
@@ -1,7 +1,7 @@
 PKG="SCbcfg2"
 NAME="bcfg2"
 ARCH="sparc"
-VERSION="1.2.0rc1"
+VERSION="1.2.0rc2"
 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 836207b74..1ac36461d 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.0rc1"
+VERSION="1.2.0rc2"
 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 7044db5b3..5be0c8679 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.0rc1</span>
+    <span>Bcfg2 Version 1.2.0rc2</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