[SCM] Debian branch, master, updated. debian/1.2.2-2-15-g7313963

[Xavier Guimard]

The following commit has been merged in the master branch:
commit 29bcfb58f7772bcb6ff5bb440a1e15b747de960b
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Tue Dec 11 21:46:29 2012 +0100

    Update debian/copyright

diff --git a/debian/copyright b/debian/copyright
index f1d679d..77ab06e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,18 @@ Upstream-Name: lemonldap-ng
 Upstream-Contact: Xavier Guimard <x.guimard at free.fr>
 Source: http://forge.objectweb.org/project/showfiles.php?group_id=274
 
+Files: *
+Copyright: 2004-2012, Xavier Guimard <x.guimard at free.fr>
+ 2004-2012, Clement Oudot <clem.oudot at gmail.com>
+ 2004-2012, Thomas Chemineau <thomas.chemineau at gmail.com>
+License: Artistic or GPL-1+
+
+Files: *.js
+Copyright: 2004-2012, Xavier Guimard <x.guimard at free.fr>
+ 2004-2012, Clement Oudot <clem.oudot at gmail.com>
+ 2004-2012, Thomas Chemineau <thomas.chemineau at gmail.com>
+License: GPL-2+
+
 Files: tree.js
 Copyright: 2008, Peter Panov <panov at elcat.kg>
 License: BSD-3-Clause
@@ -19,28 +31,53 @@ Files: jquery.elastic.source.js
 Copyright: Jan Jarfalk - http://www.unwrongest.com
 License: MIT
 
+Files: jquery-ui*.js
+Homepage: http://jqueryui.com/
+Copyright: 2008 Paul Bakaus (ui.jquery.com)
+ Brandon Aaron
+ David Bolter
+ Rich Caloggero
+ Chi Cheng (cloudream at gmail.com)
+ Colin Clark (http://colin.atrc.utoronto.ca/)
+ Michelle D'Souza
+ Aaron Eisenberger (aaronchi at gmail.com)
+ Ariel Flesler
+ Bohdan Ganicky
+ Scott González
+ Marc Grabanski (m at marcgrabanski.com)
+ Klaus Hartl (stilbuero.de)
+ Scott Jehl
+ Cody Lindley
+ Eduardo Lundgren (eduardolundgren at gmail.com)
+ Todd Parker
+ John Resig
+ Patty Toland
+ Ca-Phun Ung (yelotofu.com)
+ Keith Wood (kbwood at virginbroadband.com.au)
+ Maggie Costello Wachs
+ Richard D. Worth (rdworth.org)
+ Jörn Zaefferer (bassistance.de)
+License: GPL-2 or MIT
+
 Files: jquery*.js
 Copyright: 2010, The jQuery project and the jQuery UI team
-License: GPL-2+ or MIT
+License: GPL-2 or MIT
 
 Files: lemonldap-ng-portal/examples/skins/common/apps/*.png
 Copyright: 2006-2007 Everaldo Coelho, Crystal Project
 License: LGPL-3
 
-Files: *.js
-Copyright: 2004-2012, Xavier Guimard <x.guimard at free.fr>
- 2004-2012, Clement Oudot <clem.oudot at gmail.com>
- 2004-2012, Thomas Chemineau <thomas.chemineau at gmail.com>
-License: GPL-2+
+Files: scripts/CSS/Minifier.pm scripts/JavaScript/Minifier.pm
+Copyright: 2007, Peter Michaux <petermichaux at gmail.com>
+License: Artistic or GPL-1+
 
-Files: debian/*
-Copyright: 2004-2012, Xavier Guimard <x.guimard at free.fr>
+Files: scripts/doxygenfilter scripts/DoxyGen/Filter.pm
+Copyright: 2002, Bart Schuller
+ 2006, Phinex Informatik AG <tom.aeby at phinex.ch>
 License: Artistic or GPL-1+
 
-Files: *
+Files: debian/*
 Copyright: 2004-2012, Xavier Guimard <x.guimard at free.fr>
- 2004-2012, Clement Oudot <clem.oudot at gmail.com>
- 2004-2012, Thomas Chemineau <thomas.chemineau at gmail.com>
 License: Artistic or GPL-1+
 
 License: Artistic
@@ -59,6 +96,14 @@ License: GPL-1+
  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'.
 
+License: 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; version 2.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'
+
 License: 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

-- 
Debian