[SCM] vdpau-video/master: Convert to CF-1.0

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a97cf3f7ebc8905c67947bdf0dfbb4c197f1f5e8
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri May 9 17:07:28 2014 +0200

    Convert to CF-1.0

diff --git a/debian/copyright b/debian/copyright
index 3c13293..1b29127 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,51 @@
-License:
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: vdpau-driver
+Source: http://cgit.freedesktop.org/vaapi/vdpau-driver/
 
-    Copyright (C) 2009 Splitted-Desktop Systems
+Files: *
+Copyright: 2009-2011 Splitted-Desktop Systems
+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.
+Files: src/put_bits.h
+Copyright: 2004 Michael Niedermayer <michaelni at gmx.at>
+License: LGPL-2.1+
+ This library 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; either version 2.1 of the License, or (at your option) any
+ later version.
+ .
+ This library 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 Lesser General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this package; if not, write to the Free Software Foundation, Inc., 51 Franklin
+ St, Fifth Floor, Boston, MA  02110-1301 USA.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public License
+ version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
 
-    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.
+Files: debian/*
+Copyright:
+ 2010-2012 Andres Mejia <amejia at debian.org>
+ 2014 Sebastian Ramacher <sramacher at debian.org>
+License: GPL-2+
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+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.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this package; if not, write to the Free Software Foundation, Inc., 51 Franklin
+ St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public License version 2
+ can be found in the file `/usr/share/common-licenses/GPL-2'.
 
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License is in `/usr/share/common-licenses/GPL'.

-- 
vdpau-video packaging