From 00cd02a07beb445dd08025e352e45a270e9bfc9b Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 13 Nov 2015 12:01:49 -0600 Subject: Version bump to 1.4.0pre2 Signed-off-by: Sol Jerome --- debian/changelog | 6 ++++++ misc/bcfg2-selinux.spec | 2 +- misc/bcfg2.spec | 2 +- osx/Makefile | 2 +- osx/macports/Portfile | 2 +- solaris-ips/MANIFEST.bcfg2-server.header | 2 +- solaris-ips/MANIFEST.bcfg2.header | 2 +- solaris-ips/Makefile | 2 +- solaris-ips/pkginfo.bcfg2 | 2 +- solaris-ips/pkginfo.bcfg2-server | 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 +- tools/export.py | 4 ++-- 16 files changed, 22 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 59589de44..789891961 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bcfg2 (1.4.0pre2-0.0) unstable; urgency=low + + * New upstream release + + -- Sol Jerome Fri, 13 Nov 2015 12:01:49 -0600 + bcfg2 (1.4.0pre1-0.0) unstable; urgency=low * New upstream release diff --git a/misc/bcfg2-selinux.spec b/misc/bcfg2-selinux.spec index e3701bbdd..4c9ac9e91 100644 --- a/misc/bcfg2-selinux.spec +++ b/misc/bcfg2-selinux.spec @@ -12,7 +12,7 @@ # # Don't forget to change the Release: tag below to something like 0.1 #%%global _rc 1 -%global _pre pre1 +%global _pre pre2 %global _pre_rc %{?_pre:.pre%{_pre}}%{?_rc:.rc%{_rc}} Name: bcfg2-selinux diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 4b6da2441..5db928c3d 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -19,7 +19,7 @@ # # Don't forget to change the Release: tag below to something like 0.1 #%%global _rc rc1 -#%%global _pre pre1 +%global _pre pre2 %global _nightly 1 %global _date %(date +%Y%m%d) %global _pre_rc %{?_pre:%{_pre}}%{?_rc:%{_rc}} diff --git a/osx/Makefile b/osx/Makefile index 174eb53c8..e2fcf0c19 100644 --- a/osx/Makefile +++ b/osx/Makefile @@ -28,7 +28,7 @@ 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.4.0pre1 +BCFGVER = 1.4.0pre2 MAJOR = 1 MINOR = 40 diff --git a/osx/macports/Portfile b/osx/macports/Portfile index 05ce40bf0..93d27295c 100644 --- a/osx/macports/Portfile +++ b/osx/macports/Portfile @@ -5,7 +5,7 @@ PortSystem 1.0 PortGroup python26 1.0 name bcfg2 -version 1.4.0pre1 +version 1.4.0pre2 categories sysutils python maintainers gmail.com:sol.jerome license BSD diff --git a/solaris-ips/MANIFEST.bcfg2-server.header b/solaris-ips/MANIFEST.bcfg2-server.header index 5a837b5c7..e6b8abaf3 100644 --- a/solaris-ips/MANIFEST.bcfg2-server.header +++ b/solaris-ips/MANIFEST.bcfg2-server.header @@ -1,4 +1,4 @@ license ../../LICENSE license=simplified_bsd set name=description value="Configuration management server" set name=pkg.summary value="Configuration management server" -set name=pkg.fmri value="pkg://bcfg2/bcfg2-server@1.4.0pre1" +set name=pkg.fmri value="pkg://bcfg2/bcfg2-server@1.4.0pre2" diff --git a/solaris-ips/MANIFEST.bcfg2.header b/solaris-ips/MANIFEST.bcfg2.header index 5fd5c0c5d..6ec6642af 100644 --- a/solaris-ips/MANIFEST.bcfg2.header +++ b/solaris-ips/MANIFEST.bcfg2.header @@ -1,5 +1,5 @@ license ../../LICENSE license=simplified_bsd set name=description value="Configuration management client" set name=pkg.summary value="Configuration management client" -set name=pkg.fmri value="pkg://bcfg2/bcfg2@1.4.0pre1" +set name=pkg.fmri value="pkg://bcfg2/bcfg2@1.4.0pre2" file usr/bin/bcfg2 group=bin mode=0755 owner=root path=usr/bin/bcfg2 diff --git a/solaris-ips/Makefile b/solaris-ips/Makefile index 63a1ac61e..b280721dc 100644 --- a/solaris-ips/Makefile +++ b/solaris-ips/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/gmake -VERS=1.4.0pre1-1 +VERS=1.4.0pre2-1 PYVERSION := $(shell python -c "import sys; print sys.version[0:3]") default: clean package diff --git a/solaris-ips/pkginfo.bcfg2 b/solaris-ips/pkginfo.bcfg2 index 236009c8f..35a3be68a 100644 --- a/solaris-ips/pkginfo.bcfg2 +++ b/solaris-ips/pkginfo.bcfg2 @@ -1,7 +1,7 @@ PKG="SCbcfg2" NAME="bcfg2" ARCH="sparc" -VERSION="1.4.0pre1" +VERSION="1.4.0pre2" CATEGORY="application" VENDOR="Argonne National Labratory" EMAIL="bcfg-dev@mcs.anl.gov" diff --git a/solaris-ips/pkginfo.bcfg2-server b/solaris-ips/pkginfo.bcfg2-server index af1ab36fc..e2eb91174 100644 --- a/solaris-ips/pkginfo.bcfg2-server +++ b/solaris-ips/pkginfo.bcfg2-server @@ -1,7 +1,7 @@ PKG="SCbcfg2-server" NAME="bcfg2-server" ARCH="sparc" -VERSION="1.4.0pre1" +VERSION="1.4.0pre2" CATEGORY="application" VENDOR="Argonne National Labratory" EMAIL="bcfg-dev@mcs.anl.gov" diff --git a/solaris/Makefile b/solaris/Makefile index 38cf2547d..bac597afa 100644 --- a/solaris/Makefile +++ b/solaris/Makefile @@ -1,7 +1,7 @@ #!/usr/sfw/bin/gmake PYTHON="/usr/local/bin/python" -VERS=1.4.0pre1-1 +VERS=1.4.0pre2-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 236009c8f..35a3be68a 100644 --- a/solaris/pkginfo.bcfg2 +++ b/solaris/pkginfo.bcfg2 @@ -1,7 +1,7 @@ PKG="SCbcfg2" NAME="bcfg2" ARCH="sparc" -VERSION="1.4.0pre1" +VERSION="1.4.0pre2" 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 af1ab36fc..e2eb91174 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.4.0pre1" +VERSION="1.4.0pre2" 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 8b197231c..f6ecfd263 100644 --- a/src/lib/Bcfg2/Reporting/templates/base.html +++ b/src/lib/Bcfg2/Reporting/templates/base.html @@ -93,7 +93,7 @@ This is needed for Django versions less than 1.5
diff --git a/src/lib/Bcfg2/version.py b/src/lib/Bcfg2/version.py index 196d77273..ab5439528 100644 --- a/src/lib/Bcfg2/version.py +++ b/src/lib/Bcfg2/version.py @@ -2,7 +2,7 @@ import re -__version__ = "1.4.0pre1" +__version__ = "1.4.0pre2" class Bcfg2VersionInfo(tuple): # pylint: disable=E0012,R0924 diff --git a/tools/export.py b/tools/export.py index df3c810d5..77c7371b4 100755 --- a/tools/export.py +++ b/tools/export.py @@ -344,8 +344,8 @@ E.G. 1.2.0pre1 is a valid version. commando_orders = ["vcs_commit", "vcs_tag", "create_archive", - "gpg_encrypt", - "scp_archive"] + "gpg_encrypt"] + #"scp_archive"] if options.dryrun: for cmd in commando_orders: -- cgit v1.2.3-1-g7c22