[SCM] Algorithms for models in fundamental astronomy branch, master, updated. eb85aa1480308838604dbb024561e8d30735f9ef

[Ole Streicher]

The following commit has been merged in the master branch:
commit eb85aa1480308838604dbb024561e8d30735f9ef
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Mar 2 09:04:36 2012 +0100

    Copyright adjusted to new version
    Acknowledgement clause is now not mandatory.

diff --git a/debian/copyright b/debian/copyright
index c3a86a1..919c192 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -35,7 +35,8 @@ License: SOFA
      from the original SOFA software.
  .
   c) The name(s) of all routine(s) in your derived work shall not
-     include the prefix "iau".
+     include the prefix "iau" or "sofa" or trivial modifications
+     thereof such as changes of case.
  .
   d) The origin of the SOFA components of your derived work must
      not be misrepresented;  you must not claim that you wrote the
@@ -53,16 +54,11 @@ License: SOFA
  variations, no matter how minor, must be explicitly marked as
  such, as explained above.
  .
- 4. In any published work or commercial products which includes
- results achieved by using the SOFA software, you shall
- acknowledge that the SOFA software was used in obtaining those
- results.
- .
- 5. You shall not cause the SOFA software to be brought into
+ 4. You shall not cause the SOFA software to be brought into
  disrepute, either by misuse, or use for inappropriate tasks, or
  by inappropriate modification.
  .
- 6. The SOFA software is provided "as is" and SOFA makes no warranty
+ 5. The SOFA software is provided "as is" and SOFA makes no warranty
  as to its use or performance.   SOFA does not and cannot warrant
  the performance or results which the user may obtain by using the
  SOFA software.  SOFA makes no warranties, express or implied, as
@@ -73,11 +69,15 @@ License: SOFA
  SOFA representative has been advised of such damages, or for any
  claim by any third party.
  .
- 7. The provision of any version of the SOFA software under the terms
+ 6. The provision of any version of the SOFA software under the terms
  and conditions specified herein does not imply that future
  versions will also be made available under the same terms and
  conditions.
  .
+ In any published work or commercial product which uses the SOFA
+ software directly, acknowledgement (see www.iausofa.org) is
+ appreciated.
+ .
  Correspondence concerning SOFA software should be addressed as
  follows:
  .

-- 
Algorithms for models in fundamental astronomy