[SCM] x264/master: Update copyright years

[ricotz-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ea10256601a8c8b53f29ca0e42dc8ea37a0619c0
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Thu Jun 29 15:37:48 2017 +0200

    Update copyright years

diff --git a/debian/changelog b/debian/changelog
index b94308d..8813a93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x264 (2:0.148.2795+gitaaa9aa8-1) unstable; urgency=medium
   * Update to new stable upstream
   * New upstream version 0.148.2795+gitaaa9aa8
   * Regenerate manpage
+  * Update copyright years
 
  -- Rico Tzschichholz <ricotz at ubuntu.com>  Wed, 28 Jun 2017 08:31:44 +0200
 
diff --git a/debian/copyright b/debian/copyright
index b75fc31..827ddea 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,14 +4,14 @@ Upstream-Contact: x264-devel at videolan.org
 Source: http://www.videolan.org/developers/x264.html
 
 Files: *
-Copyright: 2003-2015 x264 project
+Copyright: 2003-2017 x264 project
 License: GPL-2+
 Comment:
  This program is also available under a commercial proprietary license.
  For more information, contact us at licensing at x264.com.
 
 Files: common/x86/x86inc.asm
-Copyright: 2005-2011 x264 project
+Copyright: 2005-2017 x264 project
 License: ISC
  Permission to use, copy, modify, and/or distribute this software for any
  purpose with or without fee is hereby granted, provided that the above

-- 
x264 packaging