[SCM] advene/master: Fix licenses' names, group files by licensing, fix Format: field as the old URL is dangling. Other small fixes.

Thu Jan 12 14:46:14 UTC 2012

The following commit has been merged in the master branch:
commit 133d3623ceb233e2680d04ad8c0a8be9bb0ae7ae
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jan 12 15:44:03 2012 +0100

    Fix licenses' names, group files by licensing, fix Format: field as the old URL is dangling. Other small fixes.

diff --git a/debian/copyright b/debian/copyright
index 071a9f0..2c3f9de 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
+Format: http://dep.debian.net/deps/dep5/
 Upstream-Name: Advene
 Upstream-Contact: Olivier Aubert <olivier.aubert at liris.cnrs.fr>
 Source: http://www.advene.org/
@@ -10,13 +10,61 @@ Copyright: 2003-2010 Olivier Aubert <olivier.aubert at liris.cnrs.fr>
            2009 Mathieu BEN <mben at irisa.fr>
            2002 Per Kristian Gjermshus <pergj at ifi.uio.no>
            2002 Tollef Fog Heen <tfheen at canonical.com>
-License: GPL-2
+License: GPL-2+
 
 Files: debian/*
  mac/*
  scripts/*
  doc/*
-Copyright: 2003-2010 Olivier Aubert <olivier.aubert at liris.cnrs.fr>
+ share/pixmaps/advene.icns
+ share/pixmaps/advene.ico
+ share/pixmaps/align.png
+ share/pixmaps/align.svg
+ share/pixmaps/begin-begin.png
+ share/pixmaps/begin-begin.svg
+ share/pixmaps/begin-end.png
+ share/pixmaps/begin-end.svg
+ share/pixmaps/create_at.png
+ share/pixmaps/create_query.png
+ share/pixmaps/create_rt.png
+ share/pixmaps/create_schema.png
+ share/pixmaps/create_view.png
+ share/pixmaps/end-begin.png
+ share/pixmaps/end-begin.svg
+ share/pixmaps/end-end.png
+ share/pixmaps/end-end.svg
+ share/pixmaps/exchange.png
+ share/pixmaps/filters_off.png
+ share/pixmaps/filters_on.png
+ share/pixmaps/icon_advene128.png
+ share/pixmaps/icon_advene16.png
+ share/pixmaps/icon_advene16.xpm
+ share/pixmaps/icon_advene32.png
+ share/pixmaps/icon_advene32.xpm
+ share/pixmaps/icon_advene48.png
+ share/pixmaps/icon_advene64.png
+ share/pixmaps/locked.png
+ share/pixmaps/logmessages.png
+ share/pixmaps/logo_advene.png
+ share/pixmaps/noplay.png
+ share/pixmaps/notavailable.png
+ share/pixmaps/notavailable.svg
+ share/pixmaps/rotate.png
+ share/pixmaps/set-to-now.png
+ share/pixmaps/selection.png
+ share/pixmaps/shape_arrow.png
+ share/pixmaps/shape_ellipse.png
+ share/pixmaps/shape_image.png
+ share/pixmaps/shape_rectangle.png
+ share/pixmaps/shape_text.png
+ share/pixmaps/small_attach.png
+ share/pixmaps/small_close.png
+ share/pixmaps/small_detach.png
+ share/pixmaps/small_ok.png
+ share/pixmaps/snapshotter-idle.png
+ share/pixmaps/snapshotter-running.png
+ share/pixmaps/small_locked.png
+Copyright: 2003-2011 Olivier Aubert <olivier.aubert at liris.cnrs.fr>
 License: GPL-2
 
 Files: mac/pkg-dmg
@@ -35,47 +83,19 @@ License: LGPL-2.1
 
 Files: ./lib/advene/util/handyxml.py
 Copyright: 2004 Ned Batchelder
-License: MIT
+License: Expat
 
 Files: ./lib/advene/util/odict.py
 Copyright: 2008 by Armin Ronacher and PEP 273 authors
-License: BSD
+License: BSD-3-clause
 
 Files: share/haars/Mouth.xml
 Copyright: 2006, Modesto Castrillon-Santana (IUSIANI, University of Las Palmas de Gran Canaria, Spain)
-License: BSD (2 clause)
- Copyright (c) 2006, Modesto Castrillon-Santana (IUSIANI, University of
- Las Palmas de Gran Canaria, Spain).
- All rights reserved.
- .
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
-    * Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    * 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.
-    * The name of Contributor may not used to endorse or promote products
-      derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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
- 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.  Back to
+License: BSD-3-clause
 
 Files: share/haars/haarcascade_frontalface_default.xml
 Copyright: 2000, Intel Corporation
-License: BSD
+License: BSD-3-clause
 
 Files: share/pixmaps/silk-sound.png
  share/pixmaps/silk-sound-mute.png
@@ -143,56 +163,22 @@ License: public-domain
  and in any way, including by methods that have not yet been invented or
  conceived.
 
-Files: share/pixmaps/advene.icns
- share/pixmaps/advene.ico
- share/pixmaps/align.png
- share/pixmaps/align.svg
- share/pixmaps/begin-begin.png
- share/pixmaps/begin-begin.svg
- share/pixmaps/begin-end.png
- share/pixmaps/begin-end.svg
- share/pixmaps/create_at.png
- share/pixmaps/create_query.png
- share/pixmaps/create_rt.png
- share/pixmaps/create_schema.png
- share/pixmaps/create_view.png
- share/pixmaps/end-begin.png
- share/pixmaps/end-begin.svg
- share/pixmaps/end-end.png
- share/pixmaps/end-end.svg
- share/pixmaps/exchange.png
- share/pixmaps/filters_off.png
- share/pixmaps/filters_on.png
- share/pixmaps/icon_advene128.png
- share/pixmaps/icon_advene16.png
- share/pixmaps/icon_advene16.xpm
- share/pixmaps/icon_advene32.png
- share/pixmaps/icon_advene32.xpm
- share/pixmaps/icon_advene48.png
- share/pixmaps/icon_advene64.png
- share/pixmaps/locked.png
- share/pixmaps/logmessages.png
- share/pixmaps/logo_advene.png
- share/pixmaps/noplay.png
- share/pixmaps/notavailable.png
- share/pixmaps/notavailable.svg
- share/pixmaps/rotate.png
- share/pixmaps/set-to-now.png
- share/pixmaps/selection.png
- share/pixmaps/shape_arrow.png
- share/pixmaps/shape_ellipse.png
- share/pixmaps/shape_image.png
- share/pixmaps/shape_rectangle.png
- share/pixmaps/shape_text.png
- share/pixmaps/small_attach.png
- share/pixmaps/small_close.png
- share/pixmaps/small_detach.png
- share/pixmaps/small_ok.png
- share/pixmaps/snapshotter-idle.png
- share/pixmaps/snapshotter-running.png
- share/pixmaps/small_locked.png
-Copyright: 2003-2011 Olivier Aubert <olivier.aubert at liris.cnrs.fr>
-License: 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+Comment:
+ On Debian systems the GNU General Public License (GPL) version 2 is
+ located in '/usr/share/common-licenses/GPL-2'.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 License: GPL-2
  This program is free software: you can redistribute it and/or modify
@@ -203,11 +189,12 @@ License: GPL-2
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU Lesser General Public License for more details.
- .
+Comment:
  On Debian systems the GNU General Public License (GPL) version 2 is
  located in '/usr/share/common-licenses/GPL-2'.
-  The full text of the GPL is distributed as in
-  /usr/share/common-licenses/GPL-2 on Debian systems.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 License: LGPL-2.1
  This program is free software: you can redistribute it and/or modify
@@ -218,7 +205,7 @@ License: LGPL-2.1
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU Lesser General Public License for more details.
- .
+Comment:
  On Debian systems the GNU Lesser General Public License (LGPL) version 2.1 is
  located in '/usr/share/common-licenses/LGPL-2.1'.
  .
@@ -236,24 +223,27 @@ License: MPL1.1
  for the specific language governing rights and limitations under the
  MPL.
 
-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.
+License: Expat
+ 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.
 
-License: BSD
+License: BSD-3-clause
  Copyright (C) 2000, Intel Corporation, all rights reserved.
  Third party copyrights are property of their respective owners.
  .

-- 
advene packaging

