[hdf-compass] 248/295: Add cartopy license and some BAG-plugin related updates

Sun May 8 10:35:50 UTC 2016

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository hdf-compass.

commit 03ee2ddfa28321de736517582691c38cc2c20894
Author: giumas <giumas at yahoo.it>
Date:   Sat Nov 7 13:16:39 2015 -0500

    Add cartopy license and some BAG-plugin related updates
---
 .../cartopy_Copyrights_and_Licenses.txt            | 51 ++++++++++++++++++++++
 .../hydroffice_bag_Copyrights_and_Licenses.txt     | 24 +++++-----
 hdf_compass/bag_model/model.py                     | 10 +++--
 hdf_compass/utils/__init__.py                      |  2 +-
 4 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/additional_legal/cartopy_Copyrights_and_Licenses.txt b/additional_legal/cartopy_Copyrights_and_Licenses.txt
new file mode 100644
index 0000000..be9c413
--- /dev/null
+++ b/additional_legal/cartopy_Copyrights_and_Licenses.txt
@@ -0,0 +1,51 @@
+=============================================
+Cartopy copyright, licensing and contributors
+=============================================
+
+.. |copy|   unicode:: U+000A9 .. COPYRIGHT SIGN
+
+Cartopy code
+------------
+
+All Iris source code, unless explicitly stated, is |copy| ``British Crown copyright, 2014`` and
+is licensed under the **GNU Lesser General Public License** as published by the
+Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+You should find all source files with the following header:
+
+.. admonition:: Code License
+
+    |copy| British Crown Copyright 2011 - 2014, Met Office
+
+    This file is part of cartopy.
+
+    Cartopy is free software: you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Cartopy 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
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with cartopy.  If not, see `<http://www.gnu.org/licenses/>`_.
+
+
+Cartopy documentation and examples
+----------------------------------
+
+All documentation, examples and sample data found on this website and in source repository
+are licensed under the UK's Open Government Licence:
+
+.. admonition:: Documentation, example and data license
+
+    |copy| British Crown copyright, 2014.
+
+    You may use and re-use the information featured on this website (not including logos) free of
+    charge in any format or medium, under the terms of the
+    `Open Government Licence <http://reference.data.gov.uk/id/open-government-licence>`_.
+    We encourage users to establish hypertext links to this website.
+
+    Any email enquiries regarding the use and re-use of this information resource should be
+    sent to: psi at nationalarchives.gsi.gov.uk.
diff --git a/additional_legal/hydroffice_bag_Copyrights_and_Licenses.txt b/additional_legal/hydroffice_bag_Copyrights_and_Licenses.txt
index 09e083e..96df476 100644
--- a/additional_legal/hydroffice_bag_Copyrights_and_Licenses.txt
+++ b/additional_legal/hydroffice_bag_Copyrights_and_Licenses.txt
@@ -1,36 +1,38 @@
 
 Copyright Notice and License Terms for 
 hydroffice.bag - BAG package for HydrOffice
+
 -----------------------------------------------------------------------------
 
 hydroffice.bag
-Copyright 2015- by G.Masetti and B.R.Calder (CCOM, UNH).
+
+Copyright 2015 - G.Masetti and B.R.Calder.
 
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted for any purpose (including commercial purposes) 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for any purpose (including commercial purposes)
 provided that the following conditions are met:
 
-1. Redistributions of source code must retain the above copyright notice, 
+1. Redistributions of source code must retain the above copyright notice,
    this list of conditions, and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the above copyright notice, 
-   this list of conditions, and the following disclaimer in the documentation 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions, and the following disclaimer in the documentation
    and/or materials provided with the distribution.
 
-3. In addition, redistributions of modified forms of the source or binary 
-   code must carry prominent notices stating that the original code was 
+3. In addition, redistributions of modified forms of the source or binary
+   code must carry prominent notices stating that the original code was
    changed and the date of the change.
 
-4. All publications or advertising materials mentioning features or use of 
-   this software are asked, but not required, to acknowledge that it was 
+4. All publications or advertising materials mentioning features or use of
+   this software are asked, but not required, to acknowledge that it was
    developed by G.Masetti and B.R.Calder and credit the contributors.
 
 5. Neither the name of G.Masetti and B.R.Calder, nor the name
    of any Contributor may be used to endorse or promote products derived
    from this software without specific prior written permission
-   from Giuseppe Masetti and Brian R. Calder or the Contributor, respectively.
+   from G.Masetti and B.R. Calder or the Contributor, respectively.
 
 DISCLAIMER: 
 THIS SOFTWARE IS PROVIDED BY THE CCOM AND THE CONTRIBUTORS 
diff --git a/hdf_compass/bag_model/model.py b/hdf_compass/bag_model/model.py
index cb345fe..8dcf2ef 100644
--- a/hdf_compass/bag_model/model.py
+++ b/hdf_compass/bag_model/model.py
@@ -40,8 +40,7 @@ def sort_key(name):
 
 
 class BAGStore(compass_model.Store):
-    """
-    Data store implementation using a BAG file (closely mimicking HDF5Store).
+    """ Data store implementation using a BAG file (closely mimicking HDF5Store).
 
     Keys are the full names of objects in the file.
     """
@@ -51,7 +50,12 @@ class BAGStore(compass_model.Store):
 
     @staticmethod
     def plugin_description():
-        return "A plugin used to browse Open Navigation Surface BAG files."
+        return """A plugin used to browse Open Navigation Surface BAG files.
+        It provides additional features that are not available with the general HDF5 plugin:
+        - View of metadata information as XML (+ content validation).
+        - Plot of elevation and uncertainty using their geographic extent/
+        The plugin is developed and maintained by G.Masetti [gmasetti at ccom.unh.edu].
+        """
 
     file_extensions = {'BAG File': ['*.bag']}
 
diff --git a/hdf_compass/utils/__init__.py b/hdf_compass/utils/__init__.py
index 26f8107..2a2f7a3 100644
--- a/hdf_compass/utils/__init__.py
+++ b/hdf_compass/utils/__init__.py
@@ -19,4 +19,4 @@ log.addHandler(logging.NullHandler())
 from .utils import is_darwin, is_win, is_linux, url2path, path2url, data_url
 
 
-__version__ = "0.6.0"
+__version__ = "0.6.0b2"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hdf-compass.git

