summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--misc/bcfg2.spec2
-rw-r--r--redhat/RELEASE2
-rw-r--r--redhat/VERSION2
-rw-r--r--setup.py2
-rw-r--r--solaris/Makefile2
6 files changed, 11 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index eaadca55d..61ea813b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (1.2.0-0.0pre1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sol Jerome <sol.jerome@gmail.com> Sun, 23 Jan 2011 16:33:00 -0600
+
bcfg2 (1.1.0-0.0) unstable; urgency=low
* New upstream release
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index 30fadf206..e6ca86191 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.0pre1
Release: %{release}
Summary: Configuration management system
diff --git a/redhat/RELEASE b/redhat/RELEASE
index ba66466c2..22a4ba1bd 100644
--- a/redhat/RELEASE
+++ b/redhat/RELEASE
@@ -1 +1 @@
-0.0
+0.0pre1
diff --git a/redhat/VERSION b/redhat/VERSION
index 9084fa2f7..26aaba0e8 100644
--- a/redhat/VERSION
+++ b/redhat/VERSION
@@ -1 +1 @@
-1.1.0
+1.2.0
diff --git a/setup.py b/setup.py
index d1c443450..ad2fa7331 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ from glob import glob
setup(cmdclass=cmdclass,
name="Bcfg2",
- version="1.1.0",
+ version="1.2.0pre1",
description="Bcfg2 Server",
author="Narayan Desai",
author_email="desai@mcs.anl.gov",
diff --git a/solaris/Makefile b/solaris/Makefile
index d571da2b9..730505cda 100644
--- a/solaris/Makefile
+++ b/solaris/Makefile
@@ -1,6 +1,6 @@
#!/usr/sfw/bin/gmake
-VERS=1.1.0-1
+VERS=1.2.0pre1-1
PYVERSION := $(shell /opt/csw/bin/python -c "import sys; print sys.version[0:3]")
default: clean package