[adios] 06/12: Add mxml license to debian/copyright
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Sep 20 15:17:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository adios.
commit 580986a18c83c19a187334db95a5a2725685b66e
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Aug 14 08:11:48 2017 +0100
Add mxml license to debian/copyright
---
debian/changelog | 1 +
debian/copyright | 71 ++++++++++++++++++++++++++++++++---------------
debian/rules | 4 +--
src/mxml/mxml-2.9/COPYING | 23 ---------------
4 files changed, 52 insertions(+), 47 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2386b82..b78593f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
adios (1.12.0-1) experimental; urgency=medium
* New upstream release
+ * Add mxml license to debian/copyright
* Split examples into separate package (40+MB of Arch: all)
* Add gdb.conf file
* Typo in rules: make sure builds for all py3 versions
diff --git a/debian/copyright b/debian/copyright
index 69bb532..b52a00a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,25 +1,52 @@
-ADIOS is freely available under the terms of the BSD license given below.
-
-Copyright (c) 2008 - 2009. UT-BATTELLE, LLC. All rights reserved.
-Copyright (c) 2008 - 2009. Georgia Institute of Technology. All rights reserved.
-
-Produced at the National Center for Computational Sciences in Oak Ridge National Laboratory.
-
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
+Files: *
+Copyright: (c) 2008 - 2009. UT-BATTELLE, LLC. All rights reserved.
+Copyright: (c) 2008 - 2009. Georgia Institute of Technology. All rights reserved.
+License: BSD
+ ADIOS is freely available under the terms of the BSD license given below.
+ .
+ Produced at the National Center for Computational Sciences in Oak Ridge National Laboratory.
+ .
+ .
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ .
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the disclaimer (as noted below) in the documentation and/or other materials provided with the distribution.
* Neither the name of the UT-BATTELLE, LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROF [...]
-
-
-Additional BSD Notice
-
-1. This notice is required to be provided under our contract with the U.S. Department of Energy (DOE). This work was produced at Oak Ridge National Laboratory under Contract No. DEAC05-00OR22725 with the DOE.
-
-2. Neither the United States Government nor UT-BATTELLE, LLC nor any of their employees, makes any warranty, express or implied, or assumes any liability or responsibility for the accuracy, completeness, or usefulness of any information, apparatus, product, or process disclosed, or represents that its use would not infringe privately-owned rights.
-
-3. Also, reference herein to any specific commercial products, process, or services by trade name, trademark, manufacturer or otherwise does not necessarily constitute or imply its endorsement, recommendation, or favoring by the United States Government or UT-BATTELLE, LLC. The views and opinions of authors expressed herein do not necessarily state or reflect those of the United States Government or UT-BATTELLE, LLC, and shall not be used for advertising or product endorsement purposes.
-
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PRO [...]
+ .
+ .
+ Additional BSD Notice
+ .
+ 1. This notice is required to be provided under our contract with the U.S. Department of Energy (DOE). This work was produced at Oak Ridge National Laboratory under Contract No. DEAC05-00OR22725 with the DOE.
+ .
+ 2. Neither the United States Government nor UT-BATTELLE, LLC nor any of their employees, makes any warranty, express or implied, or assumes any liability or responsibility for the accuracy, completeness, or usefulness of any information, apparatus, product, or process disclosed, or represents that its use would not infringe privately-owned rights.
+ .
+ 3. Also, reference herein to any specific commercial products, process, or services by trade name, trademark, manufacturer or otherwise does not necessarily constitute or imply its endorsement, recommendation, or favoring by the United States Government or UT-BATTELLE, LLC. The views and opinions of authors expressed herein do not necessarily state or reflect those of the United States Government or UT-BATTELLE, LLC, and shall not be used for advertising or product endorsement purposes.
+
+
+Files: src/mxml/*
+License: MXML
+ Mini-XML License
+ September 18, 2010
+ .
+ .
+ The Mini-XML library and included programs are provided under the
+ terms of the GNU Library General Public License version 2 (LGPL2)
+ with the following exceptions:
+ .
+ 1. Static linking of applications to the Mini-XML library
+ does not constitute a derivative work and does not require
+ the author to provide source code for the application, use
+ the shared Mini-XML libraries, or link their applications
+ against a user-supplied version of Mini-XML.
+ .
+ If you link the application to a modified version of
+ Mini-XML, then the changes to Mini-XML must be provided
+ under the terms of the LGPL2 in sections 1, 2, and 4.
+ .
+ 2. You do not have to provide a copy of the Mini-XML license
+ with programs that are linked to the Mini-XML library, nor
+ do you have to identify the Mini-XML license in your
+ program or documentation as required by section 6 of the
+ LGPL2.
diff --git a/debian/rules b/debian/rules
index 546ac59..34e5324 100755
--- a/debian/rules
+++ b/debian/rules
@@ -126,5 +126,5 @@ override_dh_installexamples:
override_dh_fixperms:
dh_fixperms
- chmod +x debian/libadios-bin/etc/adios/skel/templates/*.tpl
- chmod -x debian/libadios-bin/etc/adios/skel/templates/*.tmpl
+ chmod -x debian/libadios-bin/etc/adios/skel/templates/*.tpl
+ chmod +x debian/libadios-bin/etc/adios/skel/templates/*.tmpl
diff --git a/src/mxml/mxml-2.9/COPYING b/src/mxml/mxml-2.9/COPYING
index 4d0aa78..941a8cb 100644
--- a/src/mxml/mxml-2.9/COPYING
+++ b/src/mxml/mxml-2.9/COPYING
@@ -1,26 +1,3 @@
- Mini-XML License
- September 18, 2010
-
-
-The Mini-XML library and included programs are provided under the
-terms of the GNU Library General Public License version 2 (LGPL2)
-with the following exceptions:
-
- 1. Static linking of applications to the Mini-XML library
-does not constitute a derivative work and does not require
-the author to provide source code for the application, use
-the shared Mini-XML libraries, or link their applications
-against a user-supplied version of Mini-XML.
-
-If you link the application to a modified version of
-Mini-XML, then the changes to Mini-XML must be provided
-under the terms of the LGPL2 in sections 1, 2, and 4.
-
- 2. You do not have to provide a copy of the Mini-XML license
-with programs that are linked to the Mini-XML library, nor
-do you have to identify the Mini-XML license in your
-program or documentation as required by section 6 of the
-LGPL2.
GNU LIBRARY GENERAL PUBLIC LICENSE
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git
More information about the debian-science-commits
mailing list