[SCM] multicat packaging branch, master, updated. upstream/1.0-6-ga22265e

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 869123d71681add582f56d0664d2f29fb94ce981
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Aug 24 09:48:46 2010 +0200

    Update debian/copyright as per DEP-5 proposal.

diff --git a/debian/copyright b/debian/copyright
index ae4c454..2e3015f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,43 +1,27 @@
-This work was packaged for Debian by:
-
-    Rémi Duraffort <ivoire at videolan.org> on Sun, 21 Mar 2010 22:11:01 +0100
-
-It was downloaded from:
-
-    http://downloads.videolan.org/pub/videolan/multicat/
-
-Upstream Author:
-
-    Christophe Massiot <massiot at via.ecp.fr>
-
-Copyright:
-
-    Copyright (C) 2010 Christophe Massiot <massiot at via.ecp.fr>
-
-License:
-
-    This package 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 package 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.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>
-
-On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Rémi Duraffort <ivoire at videolan.org>
-
-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.
-
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: Multicat
+Maintainer: Christophe Massiot <massiot at via.ecp.fr>
+Source: http://downloads.videolan.org/pub/videolan/multicat/
+
+Copyright: 2004, 2009 VideoLAN
+License: GPL-2+
+
+Files: ./debian/*
+Copyright: 2010 Rémi Duraffort <ivoire at videolan.org>
+License: GPL-2+
+
+License: GPL-2+
+ This package 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 package 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+X-Comment: On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

-- 
multicat packaging