[SCM] Packaging for hkl library branch, master, updated. debian/4.0.3-4-1-g43498ff

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit 43498ff105c77193ad74b40654f110bdcf4d759d
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Mon Jul 25 23:02:35 2011 +0200

    debian/copyright fixed using config-edit

diff --git a/debian/changelog b/debian/changelog
index 76f83ff..b26e532 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hkl (4.0.3-5) UNRELEASED; urgency=low
+
+  * debian/copyright fixed using config-edit
+
+ -- Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>  Mon, 25 Jul 2011 23:02:27 +0200
+
 hkl (4.0.3-4) unstable; urgency=low
 
   * debian/control
diff --git a/debian/copyright b/debian/copyright
index 4bd4de7..3d4d66f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,61 +4,62 @@ Upstream-Contact: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
 Source: http://www.tango-controls.org/Members/picca
 
 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-2011, Synchrotron SOLEIL L'Orme des Merisiers Saint-Aubin BP 48 91192 GIF-sur-YVETTE CEDEX
-License:   LGPL-2+
+           (C) 2010-2011, Synchrotron SOLEIL L'Orme des Merisiers Saint-Aubin BP 48 91192 GIF-sur-YVETTE CEDEX
+License: LGPL-2+
+Authors: GLIB team with modifications by
+           Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
 
 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-2011, Synchrotron SOLEIL L'Orme des Merisiers Saint-Aubin BP 48 91192 GIF-sur-YVETTE CEDEX
-License:   LGPL-2+
+           (C) 2010-2011, Synchrotron SOLEIL L'Orme des Merisiers Saint-Aubin BP 48 91192 GIF-sur-YVETTE CEDEX
+License: LGPL-2+
+Authors: GLIB team with modifications by
+           Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
 
 Files: *
-Authors:   Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
+Copyright: 2003-2011, Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
+           2003-2011, Synchrotron SOLEIL L'Orme des Merisiers Saint-Aubin BP 48 91192 GIF-sur-YVETTE CEDEX
+           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+
+Authors: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
            Maria-Teresa Nunez-Pardo-de-Verra <tnunez at mail.desy.de>
            Jens Krüger <Jens.Krueger at frm2.tum.de>
-Copyright: 2003-2011, Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
-	   2003-2011, Synchrotron SOLEIL L'Orme des Merisiers Saint-Aubin BP 48 91192 GIF-sur-YVETTE CEDEX
- 	   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+
+  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
+  (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 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.
 
-Licence: LGPL-2+
+License: 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 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
   Library General Public License for more details.
-
+ .
   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 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
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 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 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.

-- 
Packaging for hkl library