Merge branch 'glue-1-58-branch' into 'master'

Glue 1 58 branch See merge request lscsoft/glue!34

Merge branch 'glue-1-58-branch' into 'master'
Glue 1 58 branch See merge request lscsoft/glue!34
c8d0b23e · Ryan Fisher · e058b062 · d91e329f · c8d0b23e · c8d0b23e
Commit c8d0b23e authored Feb 20, 2018 by Ryan Fisher
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 3 deletions

debian/changelog debian/changelog +12 -0

etc/glue.spec etc/glue.spec +2 -2

setup.py setup.py +1 -1

No files found.
--- a/debian/changelog
+++ b/debian/changelog
+lscsoft-glue (1.58.1-1) unstable; urgency=low
+
+  * February 2018 1.58.1 release with correct package numbering.
+
+ -- Ryan Fisher <ryan.fisher@ligo.org>  Tue, 20 Feb 2018 15:57:00 -0500
+
+lscsoft-glue (1.58.0-1) unstable; urgency=low
+
+  * February 2018 1.58.0 release to include python 3 and other updates.
+
+ -- Ryan Fisher <ryan.fisher@ligo.org>  Tue, 20 Feb 2018 15:53:00 -0500
+
 lscsoft-glue (1.57.0-2) UNRELEASED; urgency=medium

  * local package

--- a/etc/glue.spec
+++ b/etc/glue.spec
@@ -8,7 +8,7 @@

 Name: 		glue
 Summary:	The Grid LSC User Environment
-Version:	1.57.0
+Version:	1.58.1
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Libraries
@@ -56,7 +56,7 @@ rm -rf %{buildroot}
        --skip-build \
        --root=%{buildroot} \
        --prefix=%{_glue_prefix}
-rm -rf $RPM_BUILD_ROOT/usr/lib64/python2.?/site-packages/glue-1.57.0-py2.?.egg-info
+rm -rf $RPM_BUILD_ROOT/usr/lib64/python2.?/site-packages/glue-1.58.1-py2.?.egg-info

 %check
 PYTHONPATH="$RPM_BUILD_ROOT/usr/lib64/python2.7/site-packages" \

--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ from distutils import log

 from misc import generate_vcs_info as gvcsi

-ver = "1.57.0"
+ver = "1.58.1"

 def remove_root(path,root):
  if root: