[SCM] Packaging for hkl library branch, master, updated. upstream/4.0.3-10-g3151d16
Picca Frédéric-Emmanuel
picca at synchrotron-soleil.fr
Sat Jun 12 13:42:33 UTC 2010
The following commit has been merged in the master branch:
commit 3151d16586fae54ce46e7de9972e990f48df7fec
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Sat Jun 12 15:35:44 2010 +0200
correct the GPL2+ -> LGPL2+ hkl-error licence.
diff --git a/debian/copyright b/debian/copyright
index 03ccf59..53c01dd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,14 +8,14 @@ Authors: GLIB team with modifications by
Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Copyright: (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
(C) 2010, Synchrotron SOLEIL L'Orme des Merisiers Saint-Aubin BP 48 91192 GIF-sur-YVETTE CEDEX
-License: GPL-2+
+License: LGPL-2+
Files: hkl/hkl-error.h
Authors: GLIB team with modifications by
Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Copyright: (C) 2000 Red Hat, Inc.
(C) 2010, Synchrotron SOLEIL L'Orme des Merisiers Saint-Aubin BP 48 91192 GIF-sur-YVETTE CEDEX
-License: GPL-2+
+License: LGPL-2+
Files: *
Authors: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
@@ -27,23 +27,23 @@ Copyright: 2003-2010, Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
2009-2010, Jens Krüger <Jens.Krueger at frm2.tum.de>
License: GPL-3+
-Licence: GPL-2+
- This program 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; either version 2 of the License, or
- (at your option) any later version.
+Licence: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, 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.
+ On Debian systems, the complete text of the GNU Library General Public
+ License can be found in /usr/share/common-licenses/LGPL-2.
License: GPL-3+
This program is free software: you can redistribute it and/or modify
--
Packaging for hkl library
More information about the debian-science-commits
mailing list