[SCM] Core functionality for performing astronomy and astrophysics with Python branch, debian, updated. 2347cc4d420f2590e2c52c98d2f88a04debe6526

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 5e19df918c8f7f554057361de384977cbe8d7eeb
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Feb 13 00:01:30 2013 +0100

    fix license names and reference

diff --git a/debian/copyright b/debian/copyright
index 3087bef..8fa138d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,7 +12,7 @@ Copyright: Copyright (c) 2011, Astropy Developers,
  2010-2011 Smithsonian Astrophysical Observatory,
  2003-2010, Michael Foord, Mark Andrews, Nicola Larosa,
  1995-2010 Jean-loup Gailly and Mark Adler
-License: BSD (3-Clause)
+License: BSD-3-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
@@ -45,7 +45,7 @@ License: BSD (3-Clause)
 Files: cextern/expat/*
 Copyright: 2001-2007 Expat maintainers,
  1998-2003 Thai Open Source Software Center Ltd and Clark Cooper
-License: MIT/X11 (BSD like)
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, includingwithout limitation the rights
@@ -66,9 +66,11 @@ License: MIT/X11 (BSD like)
 
 Files: astropy/sphinx/ext/numpydoc.py astropy/sphinx/ext/docscrape.py
  astropy/sphinx/ext/docscrape_sphinx.py astropy/sphinx/ext/phantom_import.py
+ debian/*
 Copyright: Copyright (C) 2008 Stefan van der Walt <stefan at mentat.za.net>,
- Pauli Virtanen <pav at iki.fi>
-License: BSD (2-Clause)
+ Pauli Virtanen <pav at iki.fi>,
+ 2012 Ole Streicher <debian at liska.ath.cx>
+License: BSD-2-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
@@ -204,8 +206,3 @@ License: SOFA
                 United Kingdom
 Comment: Note that these files are not used in the package build process, so
  the copyright information is included here only as a reference.
-
-Files: debian/*
-Copyright: 2012 Ole Streicher <debian at liska.ath.cx>
-License: BSD (2-Clause)
- See above.

-- 
Core functionality for performing astronomy and astrophysics with Python