[SCM] Packaging for hkl library branch, master, updated. upstream/4.0.2-9-g65dfcee

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit 22f50e9d21c02afd8f502f4e0fd02f6fd379cfe5
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Sun Jun 6 09:39:06 2010 +0200

    * fix the copyright for the upcomming 4.0.3 version
    
    fix a GPL2/GPL3+ incompatibility.

diff --git a/debian/copyright b/debian/copyright
index 4a4c886..03ccf59 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,18 +7,15 @@ Files: hkl/hkl-error.c
 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+
 
 Files: hkl/hkl-error.h
-Authors:
-Copyright:
-
-Files: hkl/usage.c
-Author:     Linus Torvalds
-            Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
-Copyright: (C) Linus Torvalds, 2005-2006.
-	   (C) Synchrotron Soleil 2007-2008.
-License: GPL-1+
+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+
 
 Files: *
 Authors:   Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
@@ -29,6 +26,26 @@ Copyright: 2003-2010, Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
  	   2009-2010, Maria-Teresa Nunez-Pardo-de-Verra <tnunez at mail.desy.de>
  	   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.
+
+  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 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.
+  
+  On Debian systems, the complete text of the GNU General Public License
+  can be found in /usr/share/common-licenses/GPL-2.
+
+License: GPL-3+
   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 3 of the License, or
@@ -43,5 +60,5 @@ License: GPL-3+
   with the Debian GNU/Linux distribution in /etc/share/common-licenses/GPL.
   If not, see <http://www.gnu.org/licenses/>.
 
-On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL.
+  On Debian systems, the complete text of the GNU General Public License
+  can be found in /usr/share/common-licenses/GPL.

-- 
Packaging for hkl library