[pyfai] 02/10: fix the copyright

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository pyfai.

commit f0c1132c0ddd313ac44d3bde16f8fa3137ef7bba
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Fri Jul 24 10:09:18 2015 +0200

    fix the copyright
---
 debian/copyright | 50 ++++++++++----------------------------------------
 1 file changed, 10 insertions(+), 40 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index bb7f564..d2f7242 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: pyfai
-Source: https://github.com/kif/pyFAI
+Source: https://github.com/pyFAI/pyFAI
 Files-Excluded: third_party
+                dll
 
 Files: *
 Copyright: 2011-2014 European Synchrotron Radiation Facility
@@ -11,36 +12,18 @@ License: GPL-3.0+
 Files: debian/*
 Copyright: 2012 Jerome Kieffer <jerome.kieffer at esrf.fr>
 	   2013-2014 Picca Frédéric-Emmanuel <picca at debian.org>
-License: GPL-2.0+
+License: GPL-3.0+
 
-Files: pyFAI-src/argparse.py
-Copyright: 2006-2009 Steven J. Bethard <steven.bethard at gmail.com>.
-License: Apache 2.0
+Files: openCL/bitonic.cl
+       openCL/bsort.cl
+Copyright: Matthew Scarpino
+License: public-domain
 
 Files: src/marchingsquares.pyx
 Copyright: 2012, Almar Klein
 	   2014, Jerome Kieffer
 License: BSD-3
 
-License: Apache 2.0
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
- .
-      http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- On Debian systems, the full text of the Apache Software License version 2 can
- be found in the file `/usr/share/common-licenses/Apache-2.0'.
-
 License: BSD-3
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -101,19 +84,6 @@ License: GPL-3.0+
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 
-License: LGPL-3.0+
- This package 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.
- .
- This package 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 General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
+License: public-domain
+ You can use this free for any purpose. It's in the public domain. It
+ has no warranty

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