[med-svn] [SCM] prime-phylo branch, master, updated. upstream/1.0.10-3-g9785bae

[Erik Sjölund]

The following commit has been merged in the master branch:
commit 9785baea0e5efe3f80f1970183e3ec109bb40e51
Author: Erik Sjölund <erik.sjolund at gmail.com>
Date:   Mon Dec 17 16:08:39 2012 +0000

    new upstream release and modifications to debian/copyright

diff --git a/debian/changelog b/debian/changelog
index f3cc97d..9c2465f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+prime-phylo (1.0.11-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/copyright Corrected copyright for the file beep2blas.hh
+
+ -- Erik Sjolund <erik.sjolund at gmail.com>  Mon, 17 Dec 2012 14:11:13 +0100
+
 prime-phylo (1.0.10-2) unstable; urgency=low
 
   * debian/control modifications for the debian-med project
diff --git a/debian/copyright b/debian/copyright
index cbc4e3a..54dc6b6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -46,8 +46,10 @@ Copyright: 1997 - 2002 Takuji Nishimura, Makoto Matsumoto
 License: BSD-3-clause
 
 Files: src/cxx/libraries/prime/beep2blas.hh
-Copyright: 2002 - 2007 The Maxtrix Template Library authors
-           2007 - 2012 Bengt Sennblad<bengt.sennblad at ki.se>
+Copyright: 2001-2005 The Trustees of Indiana University. All rights reserved.
+           1998-2001 University of Notre Dame. All rights reserved
+                     Andrew Lumsdaine, Jeremy G. Siek, Lie-Quan Lee
+           2007-2012 Bengt Sennblad <bengt.sennblad at ki.se>
 License: MTL
 
 License: GPL-3
@@ -87,12 +89,6 @@ License: BSD-3-clause
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 License: MTL
- Copyright (c) 2001-2005 The Trustees of Indiana University. All rights reserved.
- Copyright (c) 1998-2001 University of Notre Dame. All rights reserved.
- Authors: Andrew Lumsdaine, Jeremy G. Siek, Lie-Quan Lee
- .
- This file is part of the Matrix Template Library
- .
  Indiana University has the exclusive rights to license this product under the following license.
  .
  Redistribution and use in source and binary forms, with or without modification, are permitted 

-- 
Packaging of prime-phylo in Debian