summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--doc/conf.py4
-rw-r--r--misc/bcfg2.spec11
-rw-r--r--osx/Makefile4
-rw-r--r--osx/macports/Portfile2
-rw-r--r--redhat/RELEASE2
-rw-r--r--redhat/VERSION2
-rw-r--r--redhat/bcfg2.spec.in3
-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/Bcfg2/Server/Reports/reports/templates/base.html2
-rw-r--r--src/lib/Bcfg2/version.py2
14 files changed, 29 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog
index c77acc0e7..629a090e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (1.3.0pre1-0.0) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sol Jerome <sol.jerome@gmail.com> Fri, 31 Aug 2012 13:16:05 -0500
+
bcfg2 (1.2.3-0.0) unstable; urgency=low
* New upstream release
diff --git a/doc/conf.py b/doc/conf.py
index b3d6ade7a..97a094a59 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -53,9 +53,9 @@ else:
# built documents.
#
# The short X.Y version.
-version = '1.2'
+version = '1.3'
# The full version, including alpha/beta/rc tags.
-release = '1.2.3'
+release = '1.3.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index 62b94f827..954c892ba 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -6,8 +6,8 @@
%{!?_initrddir: %define _initrddir %{_sysconfdir}/rc.d/init.d}
Name: bcfg2
-Version: 1.2.3
-Release: %{release}
+Version: 1.3.0
+Release: 0.0pre1
Summary: Configuration management system
%if 0%{?suse_version}
@@ -98,7 +98,7 @@ deployment strategies.
This package includes the Bcfg2 client software.
%package server
-Version: 1.2.3
+Version: 1.3.0
Summary: Bcfg2 Server
%if 0%{?suse_version}
Group: System/Management
@@ -182,7 +182,7 @@ deployment strategies.
This package includes the Bcfg2 documentation.
%package web
-Version: 1.2.3
+Version: 1.3.0
Summary: Bcfg2 Web Reporting Interface
%if 0%{?suse_version}
Group: System/Management
@@ -394,6 +394,9 @@ fi
%endif
%changelog
+* Fri Aug 31 2012 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0pre1
+- New upstream release
+
* Wed Aug 15 2012 Chris St. Pierre <chris.a.st.pierre@gmail.com> 1.2.3-0.1
- Added tools/ as doc for bcfg2-server subpackage
diff --git a/osx/Makefile b/osx/Makefile
index d3a2d4b90..a6f8bae74 100644
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -29,9 +29,9 @@ 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.3
+BCFGVER = 1.3.0pre1
MAJOR = 1
-MINOR = 23
+MINOR = 30
default: clean client
diff --git a/osx/macports/Portfile b/osx/macports/Portfile
index 59de46f8c..f4d856368 100644
--- a/osx/macports/Portfile
+++ b/osx/macports/Portfile
@@ -5,7 +5,7 @@ PortSystem 1.0
PortGroup python26 1.0
name bcfg2
-version 1.2.0
+version 1.3.0pre1
categories sysutils python
maintainers gmail.com:sol.jerome
license BSD
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 0495c4a88..f0bb29e76 100644
--- a/redhat/VERSION
+++ b/redhat/VERSION
@@ -1 +1 @@
-1.2.3
+1.3.0
diff --git a/redhat/bcfg2.spec.in b/redhat/bcfg2.spec.in
index 64adbe5c2..4a5f05bc6 100644
--- a/redhat/bcfg2.spec.in
+++ b/redhat/bcfg2.spec.in
@@ -254,6 +254,9 @@ fi
%doc %{_defaultdocdir}/bcfg2-doc-%{version}
%changelog
+* Fri Aug 31 2012 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0pre1
+- New upstream release
+
* Thu Jan 27 2011 Chris St. Pierre <stpierreca@ornl.gov> 1.2.0pre1-0.0
- Added -doc sub-package
diff --git a/setup.py b/setup.py
index a9f728fb1..6f8ac98cf 100755
--- a/setup.py
+++ b/setup.py
@@ -130,7 +130,7 @@ if need_m2crypto:
setup(cmdclass=cmdclass,
name="Bcfg2",
- version="1.2.3",
+ version="1.3.0pre1",
description="Bcfg2 Server",
author="Narayan Desai",
author_email="desai@mcs.anl.gov",
diff --git a/solaris/Makefile b/solaris/Makefile
index 39a279bb8..61bbe2db1 100644
--- a/solaris/Makefile
+++ b/solaris/Makefile
@@ -1,7 +1,7 @@
#!/usr/sfw/bin/gmake
PYTHON="/usr/local/bin/python"
-VERS=1.2.3-1
+VERS=1.3.0pre1-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 73696651c..0df8a5e8b 100644
--- a/solaris/pkginfo.bcfg2
+++ b/solaris/pkginfo.bcfg2
@@ -1,7 +1,7 @@
PKG="SCbcfg2"
NAME="bcfg2"
ARCH="sparc"
-VERSION="1.2.3"
+VERSION="1.3.0pre1"
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 af2f016b0..607dfcd33 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.3"
+VERSION="1.3.0pre1"
CATEGORY="application"
VENDOR="Argonne National Labratory"
EMAIL="bcfg-dev@mcs.anl.gov"
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/base.html b/src/lib/Bcfg2/Server/Reports/reports/templates/base.html
index 3fa482a19..6d20f86d9 100644
--- a/src/lib/Bcfg2/Server/Reports/reports/templates/base.html
+++ b/src/lib/Bcfg2/Server/Reports/reports/templates/base.html
@@ -88,7 +88,7 @@
<div style='clear:both'></div>
</div><!-- document -->
<div id="footer">
- <span>Bcfg2 Version 1.2.3</span>
+ <span>Bcfg2 Version 1.3.0pre1</span>
</div>
<div id="calendar_div" style='position:absolute; visibility:hidden; background-color:white; layer-background-color:white;'></div>
diff --git a/src/lib/Bcfg2/version.py b/src/lib/Bcfg2/version.py
index ac10dac94..cd622eafc 100644
--- a/src/lib/Bcfg2/version.py
+++ b/src/lib/Bcfg2/version.py
@@ -1,6 +1,6 @@
import re
-__version__ = "1.3.0"
+__version__ = "1.3.0pre1"
class Bcfg2VersionInfo(tuple):
v_re = re.compile(r'(\d+)(\w+)(\d+)')