From 65c2ffb97e22478c5476a12bbc1c8f023d79bdfb Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Tue, 27 Apr 2010 16:18:09 +0000
Subject: Version bump to 1.1.0rc1

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5841 ce84e21b-d406-0410-9b95-82705330c041
---
 debian/changelog             |  6 +++++
 gentoo/bcfg2-1.0.0.ebuild    | 54 --------------------------------------------
 gentoo/bcfg2-1.1.0rc1.ebuild | 54 ++++++++++++++++++++++++++++++++++++++++++++
 misc/bcfg2.spec              |  4 ++--
 redhat/VERSION               |  2 +-
 setup.py                     |  2 +-
 6 files changed, 64 insertions(+), 58 deletions(-)
 delete mode 100644 gentoo/bcfg2-1.0.0.ebuild
 create mode 100644 gentoo/bcfg2-1.1.0rc1.ebuild

diff --git a/debian/changelog b/debian/changelog
index 721314fd0..930aa9726 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (1.1.0-0.1rc1) unstable; urgency=low
+
+  * release candidate
+
+ -- Narayan Desai <desai@mcs.anl.gov>  Tue, 27 Apr 2010 11:17:26 -0600
+
 bcfg2 (1.0.1-1) unstable; urgency=low
 
   * Remove unnecessary python-lxml dependency (for the client package)
diff --git a/gentoo/bcfg2-1.0.0.ebuild b/gentoo/bcfg2-1.0.0.ebuild
deleted file mode 100644
index c482a5d70..000000000
--- a/gentoo/bcfg2-1.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit distutils
-
-DESCRIPTION="Bcfg2 is a configuration management tool."
-HOMEPAGE="http://trac.mcs.anl.gov/projects/bcfg2"
-
-# handle the "pre" case
-MY_P="${P/_/}"
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE="server"
-
-DEPEND=">=dev-lang/python-2.5"
-
-RDEPEND="app-portage/gentoolkit
-	>=dev-lang/python-2.6
-	server? (
-		dev-python/lxml
-		app-admin/gam-server )"
-
-src_install() {
-	distutils_src_install --record=PY_SERVER_LIBS --install-scripts /usr/sbin
-
-	# Remove files only necessary for a server installation
-	if ! use server; then
-		rm -rf "${D}"/usr/sbin/bcfg2-*
-		rm -rf "${D}"/usr/share/bcfg2
-		rm -rf "${D}"/usr/share/man/man8
-	fi
-
-	# Install a server init.d script
-	if use server; then
-		newinitd "${FILESDIR}"/bcfg2-server.rc bcfg2-server
-	fi
-
-	insinto /etc
-	doins "${S}"/examples/bcfg2.conf
-}
-
-pkg_postinst () {
-	use server && einfo "If this is a new installation, you probably need to run: "
-	use server && einfo "    bcfg2-admin init"
-}
-
-pkg_postrm () {
-	python_mod_cleanup
-}
diff --git a/gentoo/bcfg2-1.1.0rc1.ebuild b/gentoo/bcfg2-1.1.0rc1.ebuild
new file mode 100644
index 000000000..c482a5d70
--- /dev/null
+++ b/gentoo/bcfg2-1.1.0rc1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit distutils
+
+DESCRIPTION="Bcfg2 is a configuration management tool."
+HOMEPAGE="http://trac.mcs.anl.gov/projects/bcfg2"
+
+# handle the "pre" case
+MY_P="${P/_/}"
+SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="server"
+
+DEPEND=">=dev-lang/python-2.5"
+
+RDEPEND="app-portage/gentoolkit
+	>=dev-lang/python-2.6
+	server? (
+		dev-python/lxml
+		app-admin/gam-server )"
+
+src_install() {
+	distutils_src_install --record=PY_SERVER_LIBS --install-scripts /usr/sbin
+
+	# Remove files only necessary for a server installation
+	if ! use server; then
+		rm -rf "${D}"/usr/sbin/bcfg2-*
+		rm -rf "${D}"/usr/share/bcfg2
+		rm -rf "${D}"/usr/share/man/man8
+	fi
+
+	# Install a server init.d script
+	if use server; then
+		newinitd "${FILESDIR}"/bcfg2-server.rc bcfg2-server
+	fi
+
+	insinto /etc
+	doins "${S}"/examples/bcfg2.conf
+}
+
+pkg_postinst () {
+	use server && einfo "If this is a new installation, you probably need to run: "
+	use server && einfo "    bcfg2-admin init"
+}
+
+pkg_postrm () {
+	python_mod_cleanup
+}
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index e9693c754..91f2b9765 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -1,4 +1,4 @@
-%define release 1
+%define release 0.1
 %define __python python
 %{!?py_ver: %define py_ver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
 %define pythonversion %{py_ver}
@@ -13,7 +13,7 @@
 %define lxmldep %(rpm -q %{alt_lxml} 2>&1 > /dev/null && echo %{alt_lxml} || echo %{dfl_lxml})
 
 Name:             bcfg2
-Version:          1.0.0
+Version:          1.1.0rc1
 Release: %{release}
 Summary:          Configuration management system
 
diff --git a/redhat/VERSION b/redhat/VERSION
index 3eefcb9dd..686366e4b 100644
--- a/redhat/VERSION
+++ b/redhat/VERSION
@@ -1 +1 @@
-1.0.0
+1.1.0rc1
diff --git a/setup.py b/setup.py
index 3ea700475..92fc734bd 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ from glob import glob
 
 setup(cmdclass=cmdclass,
       name="Bcfg2",
-      version="1.0.0",
+      version="1.1.0rc1",
       description="Bcfg2 Server",
       author="Narayan Desai",
       author_email="desai@mcs.anl.gov",
-- 
cgit v1.2.3-1-g7c22