Fix some differences with Debian official

ae81c62f · Xavier Guimard · 3ac5f0f0 · ae81c62f · ae81c62f · ae81c62f
Commit ae81c62f authored Oct 30, 2018 by Xavier Guimard
Hide whitespace changes
Inline Side-by-side

Showing with 36 additions and 36 deletions

COPYING COPYING +16 -16

debian/control debian/control +1 -1

debian/copyright debian/copyright +19 -19

No files found.
--- a/COPYING
+++ b/COPYING
@@ -4,7 +4,7 @@ Upstream-Contact: https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues
 Source: https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/tags?sort=updated_desc

 Files: *
-Copyright: 2005-2018, Xavier Guimard <x.guimard@free.fr>
+Copyright: 2005-2018, Xavier Guimard <yadd@debian.org>
 2006-2018, Clement Oudot <clem.oudot@gmail.com>
 2008, Mikael Ates <mikael.ates@univ-st-etienne.fr>
 2008-2011, Thomas Chemineau <thomas.chemineau@gmail.com>
@@ -29,18 +29,18 @@ Copyright: 2011, Tatsuhiko Miyagawa <miyagawa@bulknews.net>
 License: Artistic or GPL-1+

 Files: *.js
-Copyright: 2005-2018, Xavier Guimard <x.guimard@free.fr>
+Copyright: 2005-2018, Xavier Guimard <yadd@debian.org>
 2006-2018, Clement Oudot <clem.oudot@gmail.com>
 2008-2012, Thomas Chemineau <thomas.chemineau@gmail.com>
 License: GPL-2+

 Files: lemonldap-ng-portal/site/htdocs/static/common/js/portal.js
-Copyright: 2005-2018, Xavier Guimard <x.guimard@free.fr>
+Copyright: 2005-2018, Xavier Guimard <yadd@debian.org>
 2006-2018, Clement Oudot <clem.oudot@gmail.com>
 2008-2012, Thomas Chemineau <thomas.chemineau@gmail.com>
 License: GPL-2+
 Comment: a little part of it comes from JQuery-UI examples
- (http://snipplr.com/view/29434/)
+ (https://snipplr.com/view/29434/)

 Files: lemonldap-ng-portal/site/htdocs/static/common/modules/Apache.png
 Copyright: Apache Software Foundation (ASF)
@@ -58,7 +58,7 @@ Comment: Downloaded from http://www.iconspedia.com/
 Files: lemonldap-ng-portal/site/htdocs/static/common/modules/OpenIDConnect.png
 Copyright: https://www.customicondesign.com
 License: CC-BY-NC-ND-3.0
-Comment: Downloaded from http://www.iconspedia.com/
+Comment: Downloaded from https://www.iconspedia.com/

 Files: lemonldap-ng-portal/site/htdocs/static/common/icons/oidc.png
 Copyright: http://www.customicondesign.com
@@ -66,15 +66,15 @@ License: CC-BY-NC-ND-3.0
 Comment: Downloaded from http://www.iconspedia.com/

 Files: lemonldap-ng-portal/site/htdocs/static/common/modules/Twitter.png
-Copyright: Paul Schulerr, http://schulerr.deviantart.com
+Copyright: Paul Schulerr, https://schulerr.deviantart.com
 License: CC-3
-Comment: Downloaded from http://www.iconspedia.com/
+Comment: Downloaded from https://www.iconspedia.com/

 Files: lemonldap-ng-portal/site/htdocs/static/common/modules/WebID.png
 Copyright: unknown
 License: W3C
 Comment: downloaded from
- http://www.w3.org/2005/Incubator/webid/wiki/Main_Page#Other_resources
+ https://www.w3.org/2005/Incubator/webid/wiki/Main_Page#Other_resources
 .
 Author is unknown and license may be W3C or public-domain

@@ -100,7 +100,7 @@ Comment: This work, "sfa_manager.png", is a derivative of
 Files: lemonldap-ng-portal/site/htdocs/static/common/backgrounds/*
 Copyright: Various artists
 License: CC-BY-NC-ND-3.0 or GFDL-1.3
-Comment: dowloaded from http://commons.wikimedia.org
+Comment: downloaded from https://commons.wikimedia.org

 Files: lemonldap-ng-manager/site/htdocs/static/bwr/angular*
 Copyright: 2010-2017, Google, Inc. http://angularjs.org
@@ -128,7 +128,7 @@ Copyright: 2009-2015, Kristopher Michael Kowal and contributors
 License: Expat

 Files: lemonldap-ng-manager/site/htdocs/static/bwr/file-saver.js/*
-Copyright: 2015, Eli Grey http://eligrey.com
+Copyright: 2015, Eli Grey https://eligrey.com
 License: Expat

 Files: lemonldap-ng-portal/site/htdocs/static/bwr/fingerprintjs2/*
@@ -191,12 +191,12 @@ Copyright: 2004-2012 Andreas Gohr <andi@splitbrain.org>
 License: GPL-2

 Files: doc/pages/documentation/current/documentation/lasso*.png
-Copyright: 2004, Entr'ouvert <http://www.entrouvert.com/>
+Copyright: 2004, Entr'ouvert <https://www.entrouvert.com/>
 2004, Florent Monnier
 License: GPL-2+

 Files: debian/*
-Copyright: 2005-2018, Xavier Guimard <x.guimard@free.fr>
+Copyright: 2005-2018, Xavier Guimard <yadd@debian.org>
 License: GPL-2+

 License: Apache-2.0
@@ -204,7 +204,7 @@ License: Apache-2.0
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 .
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 .
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -517,7 +517,7 @@ License: CC-3
 made available upon request from time to time. For the avoidance of doubt,
 this trademark restriction does not form part of this License.
 .
- Creative Commons may be contacted at http://creativecommons.org/.
+ Creative Commons may be contacted at https://creativecommons.org/.

 License: CC-BY-NC-ND-3.0
 CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
@@ -1154,7 +1154,7 @@ License: SIL-OFL
 License: W3C
 Copyright © 1994-2001 World Wide Web Consortium, (Massachusetts Institute of
 Technology, Institut National de Recherche en Informatique et en Automatique,
- Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
+ Keio University). All Rights Reserved. https://www.w3.org/Consortium/Legal/
 .
 This W3C work (including software, documents, or other related items) is being
 provided by the copyright holders under the following license. By obtaining,
@@ -1175,7 +1175,7 @@ License: W3C
     redistributed or derivative code: "Copyright © [$date-of-software] World
     Wide Web Consortium, (Massachusetts Institute of Technology, Institut
     National de Recherche en Informatique et en Automatique, Keio University).
-     All Rights Reserved. http://www.w3.org/Consortium/Legal/"
+     All Rights Reserved. https://www.w3.org/Consortium/Legal/"
  3. Notice of any changes or modifications to the W3C files, including the
     date changes were made. (We recommend you provide URIs to the location
     from which the code is derived.)

--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,7 @@ Build-Depends-Indep: libapache-session-perl,
                     libxml-libxslt-perl,
                     libxml-simple-perl,
                     perl
-Standards-Version: 4.2.0
+Standards-Version: 4.2.1
 Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/lemonldap-ng
 Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/lemonldap-ng.git
 Homepage: https://lemonldap-ng.org/

--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues
 Source: https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/tags?sort=updated_desc

 Files: *
-Copyright: 2005-2018, Xavier Guimard <x.guimard@free.fr>
+Copyright: 2005-2018, Xavier Guimard <yadd@debian.org>
 2006-2018, Clement Oudot <clem.oudot@gmail.com>
 2008, Mikael Ates <mikael.ates@univ-st-etienne.fr>
 2008-2011, Thomas Chemineau <thomas.chemineau@gmail.com>
@@ -29,18 +29,18 @@ Copyright: 2011, Tatsuhiko Miyagawa <miyagawa@bulknews.net>
 License: Artistic or GPL-1+

 Files: *.js
-Copyright: 2005-2018, Xavier Guimard <x.guimard@free.fr>
+Copyright: 2005-2018, Xavier Guimard <yadd@debian.org>
 2006-2018, Clement Oudot <clem.oudot@gmail.com>
 2008-2012, Thomas Chemineau <thomas.chemineau@gmail.com>
 License: GPL-2+

 Files: lemonldap-ng-portal/site/htdocs/static/common/js/portal.js
-Copyright: 2005-2018, Xavier Guimard <x.guimard@free.fr>
+Copyright: 2005-2018, Xavier Guimard <yadd@debian.org>
 2006-2018, Clement Oudot <clem.oudot@gmail.com>
 2008-2012, Thomas Chemineau <thomas.chemineau@gmail.com>
 License: GPL-2+
 Comment: a little part of it comes from JQuery-UI examples
- (http://snipplr.com/view/29434/)
+ (https://snipplr.com/view/29434/)

 Files: lemonldap-ng-portal/site/htdocs/static/common/modules/Apache.png
 Copyright: Apache Software Foundation (ASF)
@@ -58,7 +58,7 @@ Comment: Downloaded from http://www.iconspedia.com/
 Files: lemonldap-ng-portal/site/htdocs/static/common/modules/OpenIDConnect.png
 Copyright: https://www.customicondesign.com
 License: CC-BY-NC-ND-3.0
-Comment: Downloaded from http://www.iconspedia.com/
+Comment: Downloaded from https://www.iconspedia.com/

 Files: lemonldap-ng-portal/site/htdocs/static/common/icons/oidc.png
 Copyright: http://www.customicondesign.com
@@ -66,15 +66,15 @@ License: CC-BY-NC-ND-3.0
 Comment: Downloaded from http://www.iconspedia.com/

 Files: lemonldap-ng-portal/site/htdocs/static/common/modules/Twitter.png
-Copyright: Paul Schulerr, http://schulerr.deviantart.com
+Copyright: Paul Schulerr, https://schulerr.deviantart.com
 License: CC-3
-Comment: Downloaded from http://www.iconspedia.com/
+Comment: Downloaded from https://www.iconspedia.com/

 Files: lemonldap-ng-portal/site/htdocs/static/common/modules/WebID.png
 Copyright: unknown
 License: W3C
 Comment: downloaded from
- http://www.w3.org/2005/Incubator/webid/wiki/Main_Page#Other_resources
+ https://www.w3.org/2005/Incubator/webid/wiki/Main_Page#Other_resources
 .
 Author is unknown and license may be W3C or public-domain

@@ -100,7 +100,7 @@ Comment: This work, "sfa_manager.png", is a derivative of
 Files: lemonldap-ng-portal/site/htdocs/static/common/backgrounds/*
 Copyright: Various artists
 License: CC-BY-NC-ND-3.0 or GFDL-1.3
-Comment: dowloaded from http://commons.wikimedia.org
+Comment: downloaded from https://commons.wikimedia.org

 Files: lemonldap-ng-manager/site/htdocs/static/bwr/angular*
 Copyright: 2010-2017, Google, Inc. http://angularjs.org
@@ -128,7 +128,7 @@ Copyright: 2009-2015, Kristopher Michael Kowal and contributors
 License: Expat

 Files: lemonldap-ng-manager/site/htdocs/static/bwr/file-saver.js/*
-Copyright: 2015, Eli Grey http://eligrey.com
+Copyright: 2015, Eli Grey https://eligrey.com
 License: Expat

 Files: lemonldap-ng-portal/site/htdocs/static/bwr/fingerprintjs2/*
@@ -191,12 +191,12 @@ Copyright: 2004-2012 Andreas Gohr <andi@splitbrain.org>
 License: GPL-2

 Files: doc/pages/documentation/current/documentation/lasso*.png
-Copyright: 2004, Entr'ouvert <http://www.entrouvert.com/>
+Copyright: 2004, Entr'ouvert <https://www.entrouvert.com/>
 2004, Florent Monnier
 License: GPL-2+

 Files: debian/*
-Copyright: 2005-2018, Xavier Guimard <x.guimard@free.fr>
+Copyright: 2005-2018, Xavier Guimard <yadd@debian.org>
 License: GPL-2+

 License: Apache-2.0
@@ -204,7 +204,7 @@ License: Apache-2.0
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 .
-     http://www.apache.org/licenses/LICENSE-2.0
+     https://www.apache.org/licenses/LICENSE-2.0
 .
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -212,8 +212,8 @@ License: Apache-2.0
 See the License for the specific language governing permissions and
 limitations under the License.
 .
- On Debian systems, the complete text of the Apache License 2.0 can be
- found in "/usr/share/common-licenses/Apache-2.0"
+ On Debian systems, the complete text of the Apache License 2.0 can
+ be found in "/usr/share/common-licenses/Apache-2.0"

 License: Artistic
 This program is free software; you can redistribute it and/or modify
@@ -520,7 +520,7 @@ License: CC-3
 made available upon request from time to time. For the avoidance of doubt,
 this trademark restriction does not form part of this License.
 .
- Creative Commons may be contacted at http://creativecommons.org/.
+ Creative Commons may be contacted at https://creativecommons.org/.

 License: CC-BY-NC-ND-3.0
 CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
@@ -1011,7 +1011,7 @@ License: GPL-1+
 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'
+ 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
@@ -1157,7 +1157,7 @@ License: SIL-OFL
 License: W3C
 Copyright © 1994-2001 World Wide Web Consortium, (Massachusetts Institute of
 Technology, Institut National de Recherche en Informatique et en Automatique,
- Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
+ Keio University). All Rights Reserved. https://www.w3.org/Consortium/Legal/
 .
 This W3C work (including software, documents, or other related items) is being
 provided by the copyright holders under the following license. By obtaining,
@@ -1178,7 +1178,7 @@ License: W3C
     redistributed or derivative code: "Copyright © [$date-of-software] World
     Wide Web Consortium, (Massachusetts Institute of Technology, Institut
     National de Recherche en Informatique et en Automatique, Keio University).
-     All Rights Reserved. http://www.w3.org/Consortium/Legal/"
+     All Rights Reserved. https://www.w3.org/Consortium/Legal/"
  3. Notice of any changes or modifications to the W3C files, including the
     date changes were made. (We recommend you provide URIs to the location
     from which the code is derived.)