diff options
| author | Elizabeth Fischer <elizabeth.fischer@columbia.edu> | 2016-06-30 09:13:24 -0400 |
|---|---|---|
| committer | Elizabeth Fischer <elizabeth.fischer@columbia.edu> | 2016-06-30 09:13:24 -0400 |
| commit | 50ac98bc04d9be2eead0b31e0a898a2dfd24a7a4 (patch) | |
| tree | e190a29f85712b580d48d0ae6bca24367245f42c /var/spack/repos/builtin.mock/packages/libdwarf/package.py | |
| parent | efa506b235523c8a9a925c1ecf91690266da4fd4 (diff) | |
| parent | 0e422dec8c8d075e68c31b032628b7d4db96c552 (diff) | |
| download | spack-50ac98bc04d9be2eead0b31e0a898a2dfd24a7a4.tar.gz spack-50ac98bc04d9be2eead0b31e0a898a2dfd24a7a4.tar.bz2 spack-50ac98bc04d9be2eead0b31e0a898a2dfd24a7a4.tar.xz spack-50ac98bc04d9be2eead0b31e0a898a2dfd24a7a4.zip | |
Merge remote-tracking branch 'upstream/develop' into efischer/160630-StagedPackage
# Conflicts:
# lib/spack/docs/packaging_guide.rst
# lib/spack/spack/package.py
Mostly minor/formatting issues in lib/spack/spack/package.py (the heavyweight merge was already done recently). Only one serious issue: it looks like the feature branch had accidentally deleted the line `spack.hooks.post_install(self)`. This got added back in from develop.
Diffstat (limited to 'var/spack/repos/builtin.mock/packages/libdwarf/package.py')
| -rw-r--r-- | var/spack/repos/builtin.mock/packages/libdwarf/package.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/var/spack/repos/builtin.mock/packages/libdwarf/package.py b/var/spack/repos/builtin.mock/packages/libdwarf/package.py index e486a5de03..b53e295e23 100644 --- a/var/spack/repos/builtin.mock/packages/libdwarf/package.py +++ b/var/spack/repos/builtin.mock/packages/libdwarf/package.py @@ -1,26 +1,26 @@ ############################################################################## -# Copyright (c) 2013, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. -# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # # For details, see https://github.com/llnl/spack # Please also see the LICENSE file for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License (as published by -# the Free Software Foundation) version 2.1 dated February 1999. +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU General Public License for more details. +# conditions of the GNU Lesser General Public License for more details. # -# You should have received a copy of the GNU Lesser General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * import os |