summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2010-06-09 17:42:55 +0000
committerSol Jerome <sol.jerome@gmail.com>2010-06-09 16:39:39 -0500
commit3a22e1e107844e2603c2c4848263dda974e6f110 (patch)
treed81208e8a7f5c5f833557e2cbfec263033338e31
parent14dc50e942076807092870a2910a05dcb0c25aed (diff)
downloadbcfg2-3a22e1e107844e2603c2c4848263dda974e6f110.tar.gz
bcfg2-3a22e1e107844e2603c2c4848263dda974e6f110.tar.bz2
bcfg2-3a22e1e107844e2603c2c4848263dda974e6f110.zip
Version bump to 1.1.0rc2
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5908 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--debian/changelog6
-rw-r--r--misc/bcfg2.spec4
-rw-r--r--redhat/RELEASE2
-rw-r--r--redhat/VERSION2
-rw-r--r--setup.py2
-rw-r--r--solaris/Makefile2
-rwxr-xr-xtools/export.sh1
7 files changed, 12 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 930aa9726..c0f1bb10e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (1.1.0-0.0rc2) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sol Jerome <sol.jerome@gmail.com> Wed, 09 Jun 2010 12:42:54 -0500
+
bcfg2 (1.1.0-0.1rc1) unstable; urgency=low
* release candidate
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index 91f2b9765..8a87bd5dc 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -13,14 +13,14 @@
%define lxmldep %(rpm -q %{alt_lxml} 2>&1 > /dev/null && echo %{alt_lxml} || echo %{dfl_lxml})
Name: bcfg2
-Version: 1.1.0rc1
+Version: 1.1.0rc2
Release: %{release}
Summary: Configuration management system
Group: Applications/System
License: BSD
URL: http://trac.mcs.anl.gov/projects/bcfg2
-Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}.tar.gz
+Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-1.1.0rc2.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
diff --git a/redhat/RELEASE b/redhat/RELEASE
index 3b04cfb60..c39908ef3 100644
--- a/redhat/RELEASE
+++ b/redhat/RELEASE
@@ -1 +1 @@
-0.2
+0.0rc2
diff --git a/redhat/VERSION b/redhat/VERSION
index 686366e4b..9084fa2f7 100644
--- a/redhat/VERSION
+++ b/redhat/VERSION
@@ -1 +1 @@
-1.1.0rc1
+1.1.0
diff --git a/setup.py b/setup.py
index 92fc734bd..92c99ddc6 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ from glob import glob
setup(cmdclass=cmdclass,
name="Bcfg2",
- version="1.1.0rc1",
+ version="1.1.0rc2",
description="Bcfg2 Server",
author="Narayan Desai",
author_email="desai@mcs.anl.gov",
diff --git a/solaris/Makefile b/solaris/Makefile
index 893ccbd8e..922b124ca 100644
--- a/solaris/Makefile
+++ b/solaris/Makefile
@@ -1,6 +1,6 @@
#!/usr/sfw/bin/gmake
-VERS=1.0.0-1
+VERS=1.1.0rc2-1
PYVERSION := $(shell /opt/csw/bin/python -c "import sys; print sys.version[0:3]")
default: clean package
diff --git a/tools/export.sh b/tools/export.sh
index 7fe73224e..419b2117b 100755
--- a/tools/export.sh
+++ b/tools/export.sh
@@ -31,7 +31,6 @@ bcfg2 (${majorver}-0.0${minorver}) unstable; urgency=low
EOF
sed -i "s/^\(Version:\) [:digits:]*.*$/\1 ${version}/" misc/bcfg2.spec
sed -i "s|^\(Source0:\).*$|\1 ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-${version}.tar.gz|" misc/bcfg2.spec
-sed -i "s/^\(%setup -q -n\).*/\1 bcfg2-${version}/" misc/bcfg2.spec
cat debian/changelog >> deblogtmp
mv deblogtmp debian/changelog
echo ${majorver} > redhat/VERSION