[DRE-commits] [jekyll] 10/12: Update d/copyright: bump year, follow upstream changes

[Youhei SASAKI]

This is an automated email from the git hooks/post-receive script.

uwabami-guest pushed a commit to branch master
in repository jekyll.

commit 15150b43b5d727f15c5a8e25791376c591201527
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Sun Dec 27 22:14:29 2015 +0900

    Update d/copyright: bump year, follow upstream changes
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/copyright                                            | 13 ++++++-------
 .../0008-Add-patch-Replace-git-execution-from-gemspec.patch |  4 +++-
 debian/patches/0009-Force-Encoding_external.patch           | 12 ++++++++++++
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 1d3e615..9f695a9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,12 +12,11 @@ Copyright: 2014 HouseTrip Ltd
 License: Expat
 Comment: Author is Julien Letessier, https://github.com/mezis/rebund
 
-Files: site/_sass/_font-awesome.css
-Copyright: 2014, Dave Gandy
+Files: site/_sass/_font-awesome.*
+Copyright: 2014 Dave Gandy
 License: Expat
-Comment: Applies from the comment header to the next comment block.
 
-Files: site/_sass/_gridism.css
+Files: site/_sass/_gridism.*
 Copyright: 2013, Coby Chapple
 License: Expat
 
@@ -30,18 +29,18 @@ Copyright: 2012-2015 Youhei SASAKI <uwabami at gfd-dennou.org>
            2014 Dominique Dumont <dod at debian.org>
 License: Expat
 
-Files: debian/missing-source/html5shiv.min.js
+Files: debian/missing-sources/html5shiv.js
 Copyright: Alexander Farkas, Jonathan Neal and Paul Irish, with many
  contributions from John-David Dalton.
 License: Expat or GPL-2
 Comment: Replaced with unminified version during installation.
 
-Files: debian/missing-source/respond.js
+Files: debian/missing-sources/respond.js
 Copyright: 2011, Scott Jehl, scottjehl.com
 License: Expat
 Comment: Replaced with unminified version during installation.
 
-Files: debian/missing-source/normalize.css
+Files: debian/missing-sources/normalize.css
 Copyright: Nicholas Gallagher and Jonathan Neal
 License: Expat
 Comment: License does not specify years.
diff --git a/debian/patches/0008-Add-patch-Replace-git-execution-from-gemspec.patch b/debian/patches/0008-Add-patch-Replace-git-execution-from-gemspec.patch
index 94cc006..4ee4729 100644
--- a/debian/patches/0008-Add-patch-Replace-git-execution-from-gemspec.patch
+++ b/debian/patches/0008-Add-patch-Replace-git-execution-from-gemspec.patch
@@ -7,9 +7,11 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  jekyll.gemspec | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/jekyll.gemspec b/jekyll.gemspec
+index 470781c..c4e0706 100644
 --- a/jekyll.gemspec
 +++ b/jekyll.gemspec
-@@ -20,7 +20,7 @@
+@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
    s.email         = 'tom at mojombo.com'
    s.homepage      = 'https://github.com/jekyll/jekyll'
  
diff --git a/debian/patches/0009-Force-Encoding_external.patch b/debian/patches/0009-Force-Encoding_external.patch
index 0d16d7e..b4006f5 100644
--- a/debian/patches/0009-Force-Encoding_external.patch
+++ b/debian/patches/0009-Force-Encoding_external.patch
@@ -1,3 +1,15 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Sun, 27 Dec 2015 22:14:32 +0900
+Subject: Force Encoding_external
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ test/test_convertible.rb | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/test_convertible.rb b/test/test_convertible.rb
+index 09c6973..783d05b 100644
 --- a/test/test_convertible.rb
 +++ b/test/test_convertible.rb
 @@ -1,3 +1,4 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/jekyll.git