From 3126fa49d61708abf339231a956f30bb24b6018c Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 21 Mar 2013 09:32:16 -0500 Subject: Version bump to 1.3.1 Signed-off-by: Sol Jerome --- debian/changelog | 6 ++++++ doc/conf.py | 2 +- misc/bcfg2-selinux.spec | 7 +++++-- misc/bcfg2.spec | 13 ++++++++----- osx/Makefile | 4 ++-- osx/macports/Portfile | 2 +- redhat/VERSION | 2 +- redhat/bcfg2.spec.in | 3 +++ setup.py | 2 +- solaris/Makefile | 2 +- solaris/pkginfo.bcfg2 | 2 +- solaris/pkginfo.bcfg2-server | 2 +- src/lib/Bcfg2/Reporting/templates/base.html | 2 +- src/lib/Bcfg2/version.py | 2 +- 14 files changed, 33 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index f7c3b0474..298e695c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bcfg2 (1.3.1-0.0) unstable; urgency=low + + * New upstream release + + -- Sol Jerome Thu, 21 Mar 2013 09:32:16 -0500 + bcfg2 (1.3.0-0.0) unstable; urgency=low * New upstream release diff --git a/doc/conf.py b/doc/conf.py index a1bceb1b1..d3d30687b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -66,7 +66,7 @@ else: # The short X.Y version. version = '1.3' # The full version, including alpha/beta/rc tags. -release = '1.3.0' +release = '1.3.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/misc/bcfg2-selinux.spec b/misc/bcfg2-selinux.spec index 59718a2de..4c05f4959 100644 --- a/misc/bcfg2-selinux.spec +++ b/misc/bcfg2-selinux.spec @@ -8,8 +8,8 @@ %global selinux_variants %([ -z "%{selinux_types}" ] && echo mls strict targeted || echo %{selinux_types}) Name: bcfg2-selinux -Version: 1.3.0 -Release: 0.0 +Version: 1.3.1 +Release: 1 Summary: Bcfg2 Client and Server SELinux policy %if 0%{?suse_version} @@ -120,6 +120,9 @@ if [ $1 -eq 0 ] ; then fi %changelog +* Thu Mar 21 2013 Sol Jerome 1.3.1-1 +- New upstream release + * Fri Mar 15 2013 Sol Jerome 1.3.0-0.0 - New upstream release diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index c40f0eb63..e6b21d76c 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -5,8 +5,8 @@ %{!?_initrddir: %global _initrddir %{_sysconfdir}/rc.d/init.d} Name: bcfg2 -Version: 1.3.0 -Release: 0.0 +Version: 1.3.1 +Release: 1 Summary: Configuration management system %if 0%{?suse_version} @@ -87,7 +87,7 @@ deployment strategies. This package includes the Bcfg2 client software. %package server -Version: 1.3.0 +Version: 1.3.1 Summary: Bcfg2 Server %if 0%{?suse_version} Group: System/Management @@ -140,7 +140,7 @@ deployment strategies. This package includes the Bcfg2 server software. %package server-cherrypy -Version: 1.3.0 +Version: 1.3.1 Summary: Bcfg2 Server - CherryPy backend %if 0%{?suse_version} Group: System/Management @@ -220,7 +220,7 @@ deployment strategies. This package includes the Bcfg2 documentation. %package web -Version: 1.3.0 +Version: 1.3.1 Summary: Bcfg2 Web Reporting Interface %if 0%{?suse_version} Group: System/Management @@ -455,6 +455,9 @@ fi %endif %changelog +* Thu Mar 21 2013 Sol Jerome 1.3.1-1 +- New upstream release + * Fri Mar 15 2013 Sol Jerome 1.3.0-0.0 - New upstream release diff --git a/osx/Makefile b/osx/Makefile index dbd771ed8..f25e71927 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.3.0 +BCFGVER = 1.3.1 MAJOR = 1 -MINOR = 30 +MINOR = 31 default: clean client diff --git a/osx/macports/Portfile b/osx/macports/Portfile index d3c162176..45cf3dd2b 100644 --- a/osx/macports/Portfile +++ b/osx/macports/Portfile @@ -5,7 +5,7 @@ PortSystem 1.0 PortGroup python26 1.0 name bcfg2 -version 1.3.0 +version 1.3.1 categories sysutils python maintainers gmail.com:sol.jerome license BSD diff --git a/redhat/VERSION b/redhat/VERSION index f0bb29e76..3a3cd8cc8 100644 --- a/redhat/VERSION +++ b/redhat/VERSION @@ -1 +1 @@ -1.3.0 +1.3.1 diff --git a/redhat/bcfg2.spec.in b/redhat/bcfg2.spec.in index fdc506d16..b1cd0d097 100644 --- a/redhat/bcfg2.spec.in +++ b/redhat/bcfg2.spec.in @@ -262,6 +262,9 @@ fi %doc %{_defaultdocdir}/bcfg2-doc-%{version} %changelog +* Thu Mar 21 2013 Sol Jerome 1.3.1-1 +- New upstream release + * Fri Mar 15 2013 Sol Jerome 1.3.0-0.0 - New upstream release diff --git a/setup.py b/setup.py index 2cf68f230..99e1ef025 100755 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ if need_m2crypto: inst_reqs.append('M2Crypto') setup(name="Bcfg2", - version="1.3.0", + version="1.3.1", description="Bcfg2 Server", author="Narayan Desai", author_email="desai@mcs.anl.gov", diff --git a/solaris/Makefile b/solaris/Makefile index f9b376f50..fd2c254bb 100644 --- a/solaris/Makefile +++ b/solaris/Makefile @@ -1,7 +1,7 @@ #!/usr/sfw/bin/gmake PYTHON="/usr/local/bin/python" -VERS=1.3.0-1 +VERS=1.3.1-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 6126132ba..2bf3abaf5 100644 --- a/solaris/pkginfo.bcfg2 +++ b/solaris/pkginfo.bcfg2 @@ -1,7 +1,7 @@ PKG="SCbcfg2" NAME="bcfg2" ARCH="sparc" -VERSION="1.3.0" +VERSION="1.3.1" 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 9ab846732..4425220c2 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.3.0" +VERSION="1.3.1" CATEGORY="application" VENDOR="Argonne National Labratory" EMAIL="bcfg-dev@mcs.anl.gov" diff --git a/src/lib/Bcfg2/Reporting/templates/base.html b/src/lib/Bcfg2/Reporting/templates/base.html index 67ff1fc36..c73339911 100644 --- a/src/lib/Bcfg2/Reporting/templates/base.html +++ b/src/lib/Bcfg2/Reporting/templates/base.html @@ -88,7 +88,7 @@
diff --git a/src/lib/Bcfg2/version.py b/src/lib/Bcfg2/version.py index 9ecd7f32d..6f3ba3e49 100644 --- a/src/lib/Bcfg2/version.py +++ b/src/lib/Bcfg2/version.py @@ -2,7 +2,7 @@ import re -__version__ = "1.3.0" +__version__ = "1.3.1" class Bcfg2VersionInfo(tuple): -- cgit v1.2.3-1-g7c22