[SCM] ffmpegthumbnailer/master: Update debian/copyright to machine readable.

mati75-guest at users.alioth.debian.org mati75-guest at users.alioth.debian.org
Wed Jul 26 07:05:04 UTC 2017


The following commit has been merged in the master branch:
commit 0bfc2ac37a58bdf91e53b47b67810ed2008696b6
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Wed Jul 26 09:04:21 2017 +0200

    Update debian/copyright to machine readable.

diff --git a/debian/changelog b/debian/changelog
index bb9cfb8..ddbc72a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ ffmpegthumbnailer (2.2.0-1) UNRELEASED; urgency=medium
   * Enable hardening.
   * Update debian/watch.
   * Fix manpages install.
+  * Update debian/copyright to machine readable.
 
  -- Mateusz Łukasik <mati75 at linuxmint.pl>  Thu, 19 Jan 2017 19:53:46 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 8cc4ae9..0d6f776 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,26 +1,63 @@
-This package downloaded from http://code.google.com/p/ffmpegthumbnailer/downloads/list
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ffmpegthumbnailer
+Upstream-Contact: Dirk Vanden Boer <dirk.vdb at gmail.com>
+Source: https://github.com/dirkvdb/ffmpegthumbnailer
+
+Files: *
+Copyright: 2010 - 2016, Dirk Vanden Boer <dirk.vdb at gmail.com>
+License: GPL-2+
 
 Files: debian/*
-Copyright: © 2008, 2009, 2010 Lionel Le Folgoc <mrpouit at gmail.com>
+Copyright: 2008 - 2010, Lionel Le Folgoc <mrpouit at gmail.com
+           2017, Mateusz Łukasik <mati75 at linuxmint.pl>
 License: GPL-2+
- The Debian packaging information is under the GPL, version 2 or later.
 
-Files: *
-Copyright: © 2007, 2008, 2009, 2010 Dirk Vanden Boer <dirk.vdb at gmail.com>
+Files: test/testframework/catch.hpp
+Copyright: 2012, Two Blue Cubes Ltd.
+License: BSL-1.0
+ Permission is hereby granted, free of charge, to any person or
+ organization obtaining a copy of the software and accompanying
+ documentation covered by this license (the "Software") to use,
+ reproduce, display, distribute, execute, and transmit the Software,
+ and to prepare derivative works of the Software, and to permit
+ third-parties to whom the Software is furnished to do so, all subject
+ to the following:
+ . 
+ The copyright notices in the Software and this entire statement,
+ including the above license grant, this restriction and the following
+ disclaimer, must be included in all copies of the Software, in whole
+ or in part, and all derivative works of the Software, unless such
+ copies or derivative works are solely in the form of
+ machine-executable object code generated by a source language
+ processor.
+ . 
+ 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, TITLE AND
+ NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE
+ DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER
+ LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
 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 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 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.
+ 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 complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
+ 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'.

-- 
ffmpegthumbnailer packaging



More information about the pkg-multimedia-commits mailing list