[SCM] Debian branch, master, updated. debian/1.2.2-1-15-gd6ca6d0

Thu Nov 29 20:54:34 UTC 2012

The following commit has been merged in the master branch:
commit d6ca6d0fafcedbf1aeca1c00cef5c46c0620ce4a
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Thu Nov 29 21:53:50 2012 +0100

    Update copyrights and TODO comments

diff --git a/debian/changelog b/debian/changelog
index ef285ff..5cf02c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,10 @@ lemonldap-ng (1.2.2-2) UNRELEASED; urgency=low
   - if the brazilian debconf template should go into wheezy, we need a
     package for wheezy (separate branch, based on 1.1.2-5, versioned as
     1.1.2-5+deb7u1, and then, after an t-p-u unblock, uploaded to t-p-u)
+    => I'm asking this to #debian-release
   - d/changelog: why "team upload"?
-  - d/copyright:
-    + "grep -ir copyright ." shows tons of additional copyright holders
-    + license stanzas could be refreshed (remove "GNU/Linux")
+   => I'd like to say that maintainer is changed to Debian Perl Group ;)
+    Change now
   - d/control:
     + B-D-I: "perl" missing?
     + Vcs-* missing
@@ -17,12 +17,17 @@ lemonldap-ng (1.2.2-2) UNRELEASED; urgency=low
   - lintian:
     lemonldap-ng: package-contains-empty-directory usr/share/doc/lemonldap-ng/examples/
     (also in lemonldap-ng-doc!)
+   => Those dirs are not really empty but contains links to
+    liblemon*/examples. It's perhaps a bad idea...
   - from a quick look, most lines in the *.dirs files are probably useless,
     since dh_install creates directories (for files mentioned in *.install)
     itself
   - d/rules: I don't understand "links are created by *.postinst scripts"
+    => lemonldap-ng uses perl scripts installed in /var, but for Debian, I've
+    installed them to /use/share and created links. It can perhaps be done by
+    dh_links ?
 
-  * Team upload
+  * Change maintainer to Debian Perl Group
   * Add Brazilian template translation (Closes: #693366)
   * Update debian/rules to modern format
   * Clean documentation
diff --git a/debian/copyright b/debian/copyright
index 92a3229..265fc92 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,10 +11,24 @@ Files: jquery.base64.js
 Copyright: Muhammad Hussein Fattahizadeh <muhammad at semnanweb.com>
 License: GPL-2+
 
+Files: jquery.elastic.source.js
+Copyright: Jan Jarfalk - http://www.unwrongest.com
+License: 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: debian/*
+Copyright: 2004-2012, Xavier Guimard <x.guimard at free.fr>
+License: Artistic or GPL-1+
+
 Files: *
 Copyright: 2004-2012, Xavier Guimard <x.guimard at free.fr>
  2004-2012, Clement Oudot <clem.oudot at gmail.com>
@@ -22,51 +36,81 @@ Copyright: 2004-2012, Xavier Guimard <x.guimard at free.fr>
 License: Artistic or GPL-1+
 
 License: Artistic
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the Artistic License, which comes with Perl.
-    On Debian GNU/Linux systems, the complete text of the Artistic License
-    can be found in `/usr/share/common-licenses/Artistic'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian systems, the complete text of the Artistic License can be
+ found in `/usr/share/common-licenses/Artistic'.
 
 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'
+ 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 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; 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'
+ 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 systems, the complete text of version 2 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
+ published by the Free Software Foundation; version 3.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public License
+ version 3 can be found in the file `/usr/share/common-licenses/LGPL-3'.
 
 License: BSD-3-Clause
-    Copyright (c) The Regents of the University of California.
-    All rights reserved.
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-    3. Neither the name of the University nor the names of its contributors
-       may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-    .
-    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
+ Copyright (c) The Regents of the University of California.
+ All rights reserved.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
 

-- 
Debian

