[SCM] Debian branch, master, updated. debian/1.2.2-2-4-g5ffb72e

[Xavier Guimard]

The following commit has been merged in the master branch:
commit aa243685f0a75e42c9f279f6b13fccc9df14e674
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Sun Dec 2 01:05:06 2012 +0100

    In d/copyright, add license from files removed by the patch

diff --git a/debian/copyright b/debian/copyright
index 265fc92..f1d679d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,6 +7,10 @@ Files: tree.js
 Copyright: 2008, Peter Panov <panov at elcat.kg>
 License: BSD-3-Clause
 
+Files: jquery.cookie.js
+Copyright: 2010, Klaus Hartl (stilbuero.de)
+License: GPL-3+
+
 Files: jquery.base64.js
 Copyright: Muhammad Hussein Fattahizadeh <muhammad at semnanweb.com>
 License: GPL-2+
@@ -15,6 +19,10 @@ Files: jquery.elastic.source.js
 Copyright: Jan Jarfalk - http://www.unwrongest.com
 License: MIT
 
+Files: jquery*.js
+Copyright: 2010, The jQuery project and the jQuery UI team
+License: GPL-2+ or MIT
+
 Files: lemonldap-ng-portal/examples/skins/common/apps/*.png
 Copyright: 2006-2007 Everaldo Coelho, Crystal Project
 License: LGPL-3
@@ -60,6 +68,15 @@ License: GPL-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-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, or (at your option)
+ any later version.
+ .
+ On Debian systems, the complete text of version 3 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'
+
 License: LGPL-3
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as

-- 
Debian