[SCM] Debian branch, master, updated. debian/1.2.2-1-7-g305c040

[Xavier Guimard]

The following commit has been merged in the master branch:
commit 305c040d803542dcd74a5bb1dad00dd4f3de0d43
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Mon Nov 26 21:43:46 2012 +0100

    Clean d/copyright

diff --git a/debian/changelog b/debian/changelog
index fc24782..d7df593 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 lemonldap-ng (1.2.2-2) UNRELEASED; urgency=low
 
-  * Add Brazilian template translation
   * Team upload
+  * Add Brazilian template translation (Closes: #693366)
   * Update debian/rules to modern format
+  * Clean documentation
+  * Clean postinst scripts
+  * Update debian/copyright
 
  -- Xavier Guimard <x.guimard at free.fr>  Mon, 26 Nov 2012 21:23:58 +0100
 
diff --git a/debian/copyright b/debian/copyright
index bb95701..92a3229 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,20 +4,22 @@ Upstream-Contact: Xavier Guimard <x.guimard at free.fr>
 Source: http://forge.objectweb.org/project/showfiles.php?group_id=274
 
 Files: tree.js
-Copyright: 2008, Peter Panov <panov at elcat.kg>, IKEEN Group http://www.ikeen.com
+Copyright: 2008, Peter Panov <panov at elcat.kg>
 License: BSD-3-Clause
 
 Files: jquery.base64.js
-Copyright: Muhammad Hussein Fattahizadeh < muhammad [AT] semnanweb [DOT] com >
-License: GPL-2
+Copyright: Muhammad Hussein Fattahizadeh <muhammad at semnanweb.com>
+License: GPL-2+
 
 Files: lemonldap-ng-portal/examples/skins/common/apps/*.png
 Copyright: 2006-2007 Everaldo Coelho, Crystal Project
-License: GPL-2
+License: GPL-2+
 
 Files: *
-Copyright: 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Xavier Guimard <x.guimard at free.fr>, Clement Oudot <clem.oudot at gmail.com>, Thomas Chemineau <thomas.chemineau at gmail.com>
-License: Artistic or GPL-2
+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
     This program is free software; you can redistribute it and/or modify
@@ -25,12 +27,20 @@ License: Artistic
     On Debian GNU/Linux systems, the complete text of the Artistic License
     can be found in `/usr/share/common-licenses/Artistic'
 
-License: GPL-2
+License: GPL-1+
     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 1, or (at your option)
     any later version.
     On Debian GNU/Linux systems, the complete text 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; either version 2, or (at your option)
+    any later version.
+    On Debian GNU/Linux systems, the complete text of the GNU General
     Public License can be found in `/usr/share/common-licenses/GPL-2'
 
 License: BSD-3-Clause

-- 
Debian