[SCM] Packaging for libqglviewer. OpenGL 3D viewer library branch, master, updated. 934a9b8b6360d70add79aa53e1c613c08e13260b
Anton Gladky
gladky.anton at gmail.com
Mon Sep 24 17:48:05 UTC 2012
The following commit has been merged in the master branch:
commit b79d40dc7fe6f03d78658c2b5331a5ba31acb20a
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Mon Sep 24 19:40:59 2012 +0200
Use DEP-5 for copyright-file. Remove adding exception in each package.
diff --git a/debian/copyright b/debian/copyright
index 8e649ee..237f9d6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,36 +1,85 @@
-This package was debianized by Artur R. Czechowski <arturcz at hell.pl> on
-Sat, 19 Feb 2005 00:57:26 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: libQGLViewer
+Upstream-Contact: Gilles Debunne <Gilles.Debunne at imag.fr>
+Source: http://www.libqglviewer.com/
-It was downloaded from
-http://www.libqglviewer.com/
-
-Copyright 2002-2003-2004-2005-2006-2007-2008-2009 Gilles Debunne <Gilles.Debunne at imag.fr>
-
-Copyright:
-
-Upstream Author: Gilles Debunne <Gilles.Debunne at imag.fr>
-
-License:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 dated June, 1991.
-
- 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 General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-libQGLViewer GPL Exception:
-
- As a special exception to the terms and conditions of GPL version 2.0
- or GPL version 3.0, Gilles Debunne hereby grants you the rights described
- in file GPL_EXCEPTION.
+Files: *
+Copyright: 2002-2012 Gilles Debunne <Gilles.Debunne at imag.fr>
+License: commercial or GPL-2.0 or GPL-3.0, with the following exception:
+ Additional rights granted beyond the GPL (the "Exception").
+ .
+ As a special exception to the terms and conditions of GPL version 2.0 or
+ GPL version 3.0, Gilles Debunne hereby grants you the rights described below,
+ provided you agree to the terms and conditions in this Exception, including
+ its obligations and restrictions on use.
+ .
+ Nothing in this Exception gives you or anyone else the right to change the
+ licensing terms of the libQGLViewer Open Source Edition.
+ .
+ Below, "Licensed Software" shall refer to the software licensed under the GPL
+ version 2.0 or GPL version 3.0 and this exception.
+ .
+ 1) The right to use Open Source Licenses not compatible with the GNU
+ General Public License version 2.0 or GNU General Public License version
+ 3.0: You may link software (hereafter referred to as "Your Software")
+ against the Licensed Software and/or distribute binaries of Your Software
+ linked against the Licensed Software, provided that:
+ .
+ A) Your Software is licensed under one of the following licenses:
+ .
+ .
+ License name Version(s)/Copyright Date
+ Academic Free License 2.0, 2.1, 3.0
+ Apache Software License 1.0 or 1.1
+ Apache License 2.0
+ Apple Public Source License 2.0
+ BSD license "July 22 1999"
+ Common Development and Distribution
+ License (CDDL) 1.0
+ Common Public License 1.0
+ Eclipse Public License 1.0
+ GNU Library or "Lesser"
+ General Public License (LGPL) 2.0, 2.1, 3.0
+ Jabber Open Source License 1.0
+ Mozilla Public License (MPL) 1.0 or 1.1
+ Open Software License 2.0, 3.0
+ PHP License 3.0
+ Python Software Foundation License 2.1.1
+ Q Public License 1.0
+ Sleepycat License "1999"
+ W3C License "2001"
+ X11 License X11R6.6
+ Zope Public License 2.0, 2.1
+ .
+ .
+ and
+ .
+ B) You must, on request, make a complete package including the complete
+ source code of Your Software (as defined in the GNU General Public
+ License version 2, section 3, but excluding anything excluded by the
+ special exception in the same section) available to Gilles Debunne
+ under the same license as that granted to other recipients of the
+ source code of Your Software.
+ .
+ and
+ .
+ C) Your or any other contributor's rights to:
+ .
+ i) distribute the source code of Your Software to anyone for
+ any purpose;
+ .
+ and
+ .
+ ii) publicly discuss the development project for Your
+ Software and its goals in any form and in any forum
+ .
+ are not prohibited by any legal instrument, including but not limited to
+ contracts, non-disclosure agreements, and employee contracts.
+ .
+ .
+ 2) The right to link non-Open Source applications with versions of the
+ Licensed Software: You may link applications with versions of the Licensed
+ Software, provided that such applications have been developed and are deployed
+ in accordance with the terms and conditions of the libQGLViewer Commercial
+ License Agreement.
+
diff --git a/debian/libqglviewer-dev.docs b/debian/libqglviewer-dev.docs
index d6bf2bb..e845566 100644
--- a/debian/libqglviewer-dev.docs
+++ b/debian/libqglviewer-dev.docs
@@ -1,3 +1 @@
-GPL_EXCEPTION
README
-#debian/tmp/usr/share/doc/QGLViewer usr/share/doc/libqglviewer-doc/doc
diff --git a/debian/libqglviewer-dev.install b/debian/libqglviewer-dev.install
index 87b67db..1cb1244 100644
--- a/debian/libqglviewer-dev.install
+++ b/debian/libqglviewer-dev.install
@@ -1,4 +1,3 @@
usr/lib/*/*.so
usr/lib/*/*.prl
usr/include
-GPL_EXCEPTION usr/share/doc/libqglviewer-dev
diff --git a/debian/libqglviewer-doc.docs b/debian/libqglviewer-doc.docs
index 720af8d..f528701 100644
--- a/debian/libqglviewer-doc.docs
+++ b/debian/libqglviewer-doc.docs
@@ -1,4 +1,2 @@
-GPL_EXCEPTION
README
-doc/
-#debian/tmp/usr/share/doc/QGLViewer
+doc
diff --git a/debian/libqglviewer-doc.install b/debian/libqglviewer-doc.install
deleted file mode 100644
index a5677f3..0000000
--- a/debian/libqglviewer-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-GPL_EXCEPTION usr/share/doc/libqglviewer-doc
diff --git a/debian/libqglviewer2.docs b/debian/libqglviewer2.docs
index 370431c..e845566 100644
--- a/debian/libqglviewer2.docs
+++ b/debian/libqglviewer2.docs
@@ -1,2 +1 @@
-GPL_EXCEPTION
README
diff --git a/debian/libqglviewer2.install b/debian/libqglviewer2.install
index 2c4ab4b..3de3b10 100644
--- a/debian/libqglviewer2.install
+++ b/debian/libqglviewer2.install
@@ -1,2 +1 @@
usr/lib/*/*.so.*
-GPL_EXCEPTION usr/share/doc/libqglviewer2
--
Packaging for libqglviewer. OpenGL 3D viewer library
More information about the debian-science-commits
mailing list