[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-60-gcefa953
Radostan Riedel
raybuntu at googlemail.com
Thu Aug 2 15:41:27 UTC 2012
The following commit has been merged in the master branch:
commit cefa9536d7745fe7dabb44048367087149bffb83
Author: Radostan Riedel <raybuntu at googlemail.com>
Date: Wed Aug 1 23:27:44 2012 +0200
Syntax error in copyright and update control
diff --git a/debian/control b/debian/control
index 2baacc5..a75df46 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Priority: extra
Build-Depends: debhelper (>= 9),
python-all-dev,
libfftw3-dev,
- libantlr3c-dev (< 3.4),
+ libantlr3c-dev (<< 3.4),
libcbf-dev,
libgl2ps-dev,
libann-dev,
diff --git a/debian/copyright b/debian/copyright
index e8591cb..01d477d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,7 +21,6 @@ Copyright: Copyright © 2011-2012 Gregor Herrmann <gregoa at debian.org>
License: GPL-1 or Artistic
This document is free software; you may redistribute it and/or modify it under
the same terms as Perl itself.
-
Perl is distributed under your choice of the GNU General Public License or the
Artistic License. On Debian systems, the complete text of version 1 of the GNU
General Public License can be found in /usr/share/common-licenses/GPL-1 and the
@@ -48,12 +47,12 @@ License: LGPL-2.1
option) any later version.
On Debian systems, the complete text of the LGPL-2.1 License
can be found in /usr/share/common-licenses/LGPL-2.1.
-
+ ----------
This program 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
Lesser Public License for more details.
-
+ ----------
Disclaimer
----------
The University of Maryland and the authors make no representations about
@@ -71,7 +70,7 @@ License: LGPL-3
option) any later version.
On Debian systems, the complete text of the LGPL-3 License
can be found in /usr/share/common-licenses/LGPL-3.
-
+ ----------
This program 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
@@ -113,7 +112,7 @@ License: Expat
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+ ----------
Disclaimer
----------
The items furnished herewith were developed under the sponsorship
@@ -153,13 +152,10 @@ License: BSD-3-clause
other computer software, distribute, and sublicense such enhancements or
derivative works thereof, in binary and source code form.
- On Debian systems, the complete text of the BSD License
- can be found in /usr/share/common-licenses/BSD.
-
License: BSD-3-clause
Copyright (c) The Regents of the University of California.
All rights reserved.
-
+ ----------
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -171,7 +167,7 @@ License: BSD-3-clause
3. Neither the name of the University 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 REGENTS 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
@@ -186,38 +182,38 @@ License: BSD-3-clause
License: ZPL-2.1
Zope Public License (ZPL) Version 2.1
-
+ ----------
A copyright notice accompanies this license document that identifies the
copyright holders.
-
+ ----------
This license has been certified as open source. It has also been designated as
GPL compatible by the Free Software Foundation (FSF).
-
+ ----------
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
-
+ ----------
1. Redistributions in source code must retain the accompanying copyright
notice, this list of conditions, and the following disclaimer.
-
+ ----------
2. Redistributions in binary form must reproduce the accompanying copyright
notice, this list of conditions, and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-
+ ----------
3. Names of the copyright holders must not be used to endorse or promote
products derived from this software without prior written permission from the
copyright holders.
-
+ ----------
4. The right to distribute this software or to use it for any purpose does not
give you the right to use Servicemarks (sm) or Trademarks (tm) of the copyright
holders. Use of them is covered by separate agreement with the copyright
holders.
-
+ ----------
5. If any files are modified, you must cause the modified files to carry
prominent notices stating that you changed the files and the date of any
change.
-
+ ----------
Disclaimer
-
+ ----------
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
@@ -236,7 +232,7 @@ License: LGPL-2
option) any later version.
On Debian systems, the complete text of the LGPL-2 License
can be found in /usr/share/common-licenses/LGPL-2.
-
+ ----------
This program 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
@@ -245,12 +241,11 @@ License: LGPL-2
License:PSF-2
PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
--------------------------------------------
-
1. This LICENSE AGREEMENT is between the Python Software Foundation
("PSF"), and the Individual or Organization ("Licensee") accessing and
otherwise using this software ("Python") in source or binary form and
its associated documentation.
-
+ ----------
2. Subject to the terms and conditions of this License Agreement, PSF
hereby grants Licensee a nonexclusive, royalty-free, world-wide
license to reproduce, analyze, test, perform and/or display publicly,
@@ -260,49 +255,48 @@ License:PSF-2
2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
Reserved" are retained in Python alone or in any derivative version
prepared by Licensee.
-
+ ----------
3. In the event Licensee prepares a derivative work that is based on
or incorporates Python or any part thereof, and wants to make
the derivative work available to others as provided herein, then
Licensee hereby agrees to include in any such work a brief summary of
the changes made to Python.
-
+ ----------
4. PSF is making Python available to Licensee on an "AS IS"
basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
INFRINGE ANY THIRD PARTY RIGHTS.
-
+ ----------
5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
+ ----------
6. This License Agreement will automatically terminate upon a material
breach of its terms and conditions.
-
+ ----------
7. Nothing in this License Agreement shall be deemed to create any
relationship of agency, partnership, or joint venture between PSF and
Licensee. This License Agreement does not grant permission to use PSF
trademarks or trade name in a trademark sense to endorse or promote
products or services of Licensee, or any third party.
-
+ ----------
8. By copying, installing or otherwise using Python, Licensee
agrees to be bound by the terms and conditions of this License
Agreement.
-
+ ----------
BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
-------------------------------------------
-
BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
-
+ ----------
1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
Individual or Organization ("Licensee") accessing and otherwise using
this software in source or binary form and its associated
documentation ("the Software").
-
+ ----------
2. Subject to the terms and conditions of this BeOpen Python License
Agreement, BeOpen hereby grants Licensee a non-exclusive,
royalty-free, world-wide license to reproduce, analyze, test, perform
@@ -310,22 +304,22 @@ License:PSF-2
otherwise use the Software alone or in any derivative version,
provided, however, that the BeOpen Python License is retained in the
Software, alone or in any derivative version prepared by Licensee.
-
+ ----------
3. BeOpen is making the Software available to Licensee on an "AS IS"
basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
INFRINGE ANY THIRD PARTY RIGHTS.
-
+ ----------
4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
+ ----------
5. This License Agreement will automatically terminate upon a material
breach of its terms and conditions.
-
+ ----------
6. This License Agreement shall be governed by and interpreted in all
respects by the law of the State of California, excluding conflict of
law provisions. Nothing in this License Agreement shall be deemed to
@@ -336,21 +330,20 @@ License:PSF-2
third party. As an exception, the "BeOpen Python" logos available at
http://www.pythonlabs.com/logos.html may be used according to the
permissions granted on that web page.
-
+ ----------
7. By copying, installing or otherwise using the software, Licensee
agrees to be bound by the terms and conditions of this License
Agreement.
-
+ ----------
CNRI OPEN SOURCE LICENSE AGREEMENT (for Python 1.6b1)
--------------------------------------------------
-
IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
-
+ ----------
BY CLICKING ON "ACCEPT" WHERE INDICATED BELOW, OR BY COPYING,
INSTALLING OR OTHERWISE USING PYTHON 1.6, beta 1 SOFTWARE, YOU ARE
DEEMED TO HAVE AGREED TO THE TERMS AND CONDITIONS OF THIS LICENSE
AGREEMENT.
-
+ ----------
1. This LICENSE AGREEMENT is between the Corporation for National
Research Initiatives, having an office at 1895 Preston White Drive,
Reston, VA 20191 ("CNRI"), and the Individual or Organization
@@ -358,7 +351,7 @@ License:PSF-2
software in source or binary form and its associated documentation,
as released at the www.python.org Internet site on August 4, 2000
("Python 1.6b1").
-
+ ----------
2. Subject to the terms and conditions of this License Agreement, CNRI
hereby grants Licensee a non-exclusive, royalty-free, world-wide
license to reproduce, analyze, test, perform and/or display
@@ -366,7 +359,7 @@ License:PSF-2
Python 1.6b1 alone or in any derivative version, provided, however,
that CNRIs License Agreement is retained in Python 1.6b1, alone or
in any derivative version prepared by Licensee.
-
+ ----------
Alternately, in lieu of CNRIs License Agreement, Licensee may
substitute the following text (omitting the quotes): "Python 1.6,
beta 1, is made available subject to the terms and conditions in
@@ -375,29 +368,29 @@ License:PSF-2
as a handle): 1895.22/1011. This Agreement may also be obtained
from a proxy server on the Internet using the
URL:http://hdl.handle.net/1895.22/1011".
-
+ ----------
3. In the event Licensee prepares a derivative work that is based on
or incorporates Python 1.6b1 or any part thereof, and wants to make
the derivative work available to the public as provided herein,
then Licensee hereby agrees to indicate in any such work the nature
of the modifications made to Python 1.6b1.
-
+ ----------
4. CNRI is making Python 1.6b1 available to Licensee on an "AS IS"
basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR
FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6b1
WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
-
+ ----------
5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
LOSS AS A RESULT OF USING, MODIFYING OR DISTRIBUTING PYTHON 1.6b1,
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY
THEREOF.
-
+ ----------
6. This License Agreement will automatically terminate upon a material
breach of its terms and conditions.
-
+ ----------
7. This License Agreement shall be governed by and interpreted in all
respects by the law of the State of Virginia, excluding conflict of
law provisions. Nothing in this License Agreement shall be deemed
@@ -406,19 +399,18 @@ License:PSF-2
permission to use CNRI trademarks or trade name in a trademark
sense to endorse or promote products or services of Licensee, or
any third party.
-
+ ----------
8. By clicking on the "ACCEPT" button where indicated, or by copying,
installing or otherwise using Python 1.6b1, Licensee agrees to be
bound by the terms and conditions of this License Agreement.
-
+ ----------
ACCEPT
-
+ ----------
CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
--------------------------------------------------
-
Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
The Netherlands. All rights reserved.
-
+ ----------
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
@@ -427,7 +419,7 @@ License:PSF-2
Centrum or CWI not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior
permission.
-
+ ----------
STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
--
Packaging for cctbx
More information about the debian-science-commits
mailing list