Version bump to 1.4.0pre1v1.4.0pre1

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

17 files changed, 28 insertions, 24 deletions

diff --git a/debian/changelog b/debian/changelog
index b6d7644b9..e30fba546 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (1.4.0pre1-0.0) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sol Jerome <sol.jerome@gmail.com>  Mon, 16 Jun 2014 09:36:13 -0500
+
 bcfg2 (1.3.4-0.0) unstable; urgency=low
 
   * New upstream release
diff --git a/doc/conf.py b/doc/conf.py
index 1b19d92c7..1da6b3b01 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -64,9 +64,9 @@ else:
 # built documents.
 #
 # The short X.Y version.
-version = '1.3'
+version = '1.4'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.4'
+release = '1.4.0'
 
 # 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 d33953e08..e3701bbdd 100644
--- a/misc/bcfg2-selinux.spec
+++ b/misc/bcfg2-selinux.spec
@@ -12,11 +12,11 @@
 #
 # Don't forget to change the Release: tag below to something like 0.1
 #%%global _rc 1
-#%%global _pre 2
+%global _pre pre1
 %global _pre_rc %{?_pre:.pre%{_pre}}%{?_rc:.rc%{_rc}}
 
 Name:             bcfg2-selinux
-Version:          1.3.4
+Version:          1.4.0
 Release:          1%{?_pre_rc}%{?dist}
 Summary:          Bcfg2 Client and Server SELinux policy
 
@@ -33,7 +33,7 @@ Conflicts:        selinux-policy = 3.11.1
 License:          BSD
 URL:              http://bcfg2.org
 Source0:          ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}%{?_pre_rc}.tar.gz
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:        %{_tmppath}/%{name}-%{version}%{?_pre_rc}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
 
 BuildRequires:    checkpolicy, selinux-policy-devel, hardlink
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index f6b718694..357afed4e 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 1
-#%%global _pre 2
+%global _pre pre1
 %global _nightly 1
 %global _date %(date +%Y%m%d)
 %global _pre_rc %{?_pre:pre%{_pre}}%{?_rc:rc%{_rc}}
@@ -48,7 +48,7 @@ Source0:          ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}%{?_pre_rc}.t
 Source1:          http://www.w3.org/2001/XMLSchema.xsd
 %if %{?rhel}%{!?rhel:10} <= 5 || 0%{?suse_version}
 # EL5 and OpenSUSE require the BuildRoot tag
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:        %{_tmppath}/%{name}-%{version}%{?_pre_rc}-%{release}-root-%(%{__id_u} -n)
 %endif
 BuildArch:        noarch
 
diff --git a/osx/Makefile b/osx/Makefile
index 3cc92f9dc..174eb53c8 100644
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -28,9 +28,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.4
+BCFGVER = 1.4.0pre1
 MAJOR = 1
-MINOR = 34
+MINOR = 40
 
 default: clean client
 
diff --git a/osx/macports/Portfile b/osx/macports/Portfile
index 28e345c3b..05ce40bf0 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.4
+version             1.4.0pre1
 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 b72adc486..5a837b5c7 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.3.4"
+set name=pkg.fmri value="pkg://bcfg2/bcfg2-server@1.4.0pre1"
diff --git a/solaris-ips/MANIFEST.bcfg2.header b/solaris-ips/MANIFEST.bcfg2.header
index 19fc567fe..5fd5c0c5d 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.3.4"
+set name=pkg.fmri value="pkg://bcfg2/bcfg2@1.4.0pre1"
 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 7d59e2456..63a1ac61e 100644
--- a/solaris-ips/Makefile
+++ b/solaris-ips/Makefile
@@ -1,6 +1,6 @@
 #!/usr/bin/gmake
 
-VERS=1.3.4-1
+VERS=1.4.0pre1-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 80f26fc0a..236009c8f 100644
--- a/solaris-ips/pkginfo.bcfg2
+++ b/solaris-ips/pkginfo.bcfg2
@@ -1,7 +1,7 @@
 PKG="SCbcfg2"
 NAME="bcfg2"
 ARCH="sparc"
-VERSION="1.3.4"
+VERSION="1.4.0pre1"
 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 88d0e6dff..af1ab36fc 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.3.4"
+VERSION="1.4.0pre1"
 CATEGORY="application"
 VENDOR="Argonne National Labratory"
 EMAIL="bcfg-dev@mcs.anl.gov"
diff --git a/solaris/Makefile b/solaris/Makefile
index 995253ea8..cdf61d8f7 100644
--- a/solaris/Makefile
+++ b/solaris/Makefile
@@ -1,7 +1,7 @@
 #!/usr/sfw/bin/gmake
 
 PYTHON="/usr/local/bin/python"
-VERS=1.3.4-1
+VERS=1.4.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 80f26fc0a..236009c8f 100644
--- a/solaris/pkginfo.bcfg2
+++ b/solaris/pkginfo.bcfg2
@@ -1,7 +1,7 @@
 PKG="SCbcfg2"
 NAME="bcfg2"
 ARCH="sparc"
-VERSION="1.3.4"
+VERSION="1.4.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 88d0e6dff..af1ab36fc 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.4"
+VERSION="1.4.0pre1"
 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 ef6799c2b..8b197231c 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
   <div style='clear:both'></div>
 </div><!-- document -->
   <div id="footer">
-    <span>Bcfg2 Version 1.3.4</span>
+    <span>Bcfg2 Version 1.4.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 ae82724f3..196d77273 100644
--- a/src/lib/Bcfg2/version.py
+++ b/src/lib/Bcfg2/version.py
@@ -2,7 +2,7 @@
 
 import re
 
-__version__ = "1.3.4"
+__version__ = "1.4.0pre1"
 
 
 class Bcfg2VersionInfo(tuple):  # pylint: disable=E0012,R0924
diff --git a/tools/export.py b/tools/export.py
index 6b0238bbb..df3c810d5 100755
--- a/tools/export.py
+++ b/tools/export.py
@@ -257,13 +257,11 @@ E.G. 1.2.0pre1 is a valid version.
                      startswith=True,
                      dryrun=options.dryrun)
     find_and_replace('misc/bcfg2.spec', 'BuildRoot',
-                     'BuildRoot:        %%{_tmppath}/%%{name}-%%{version}%s-%%{release}-root-%%(%%{__id_u} -n)\n' %
-                     version_info['build'],
+                     'BuildRoot:        %{_tmppath}/%{name}-%{version}%{?_pre_rc}-%{release}-root-%(%{__id_u} -n)\n',
                      startswith=True,
                      dryrun=options.dryrun)
     find_and_replace('misc/bcfg2-selinux.spec', 'BuildRoot',
-                     'BuildRoot:        %%{_tmppath}/%%{name}-%%{version}%s-%%{release}-root-%%(%%{__id_u} -n)\n' %
-                     version_info['build'],
+                     'BuildRoot:        %{_tmppath}/%{name}-%{version}%{?_pre_rc}-%{release}-root-%(%{__id_u} -n)\n',
                      startswith=True,
                      dryrun=options.dryrun)
     # fix pre problem noted in