Skip to content

Commit

Permalink
Version bump to 1.3.0pre1
Browse files Browse the repository at this point in the history
Signed-off-by: Sol Jerome <[email protected]>
  • Loading branch information
solj committed Aug 31, 2012
1 parent 242e66c commit 0653b0a
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 17 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
bcfg2 (1.3.0pre1-0.0) unstable; urgency=low

* New upstream release

-- Sol Jerome <[email protected]> Fri, 31 Aug 2012 13:06:44 -0500

bcfg2 (1.2.3-0.0) unstable; urgency=low

* New upstream release
Expand Down
4 changes: 2 additions & 2 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
# 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.
Expand Down
11 changes: 7 additions & 4 deletions misc/bcfg2.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -394,6 +394,9 @@ fi
%endif

%changelog
* Fri Aug 31 2012 Sol Jerome <[email protected]> 1.3.0-0.0pre1
- New upstream release

* Wed Aug 15 2012 Chris St. Pierre <[email protected]> 1.2.3-0.1
- Added tools/ as doc for bcfg2-server subpackage

Expand Down
4 changes: 2 additions & 2 deletions osx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion osx/macports/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion redhat/RELEASE
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0
0.0pre1
2 changes: 1 addition & 1 deletion redhat/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.3
1.3.0
3 changes: 3 additions & 0 deletions redhat/bcfg2.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,9 @@ fi
%doc %{_defaultdocdir}/bcfg2-doc-%{version}

%changelog
* Fri Aug 31 2012 Sol Jerome <[email protected]> 1.3.0-0.0pre1
- New upstream release

* Thu Jan 27 2011 Chris St. Pierre <[email protected]> 1.2.0pre1-0.0
- Added -doc sub-package

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def run(self):

setup(cmdclass=cmdclass,
name="Bcfg2",
version="1.2.3",
version="1.3.0pre1",
description="Bcfg2 Server",
author="Narayan Desai",
author_email="[email protected]",
Expand Down
2 changes: 1 addition & 1 deletion solaris/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion solaris/pkginfo.bcfg2
Original file line number Diff line number Diff line change
@@ -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="[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion solaris/pkginfo.bcfg2-server
Original file line number Diff line number Diff line change
@@ -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="[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Bcfg2/Server/Reports/reports/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ <h1>{% block pagebanner %}Page Banner{% endblock %}</h1>
<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>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Bcfg2/version.py
Original file line number Diff line number Diff line change
@@ -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+)')
Expand Down

0 comments on commit 0653b0a

Please sign in to comment.