[DRE-commits] [jekyll] 07/12: Updete debian/changelog

[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 45712bf6154be75412fa2bc39a507f98f35f40b1
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Mon Dec 7 01:57:42 2015 +0900

    Updete debian/changelog
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/changelog       | 13 +++++++++++++
 debian/copyright       | 24 ++++++++++++------------
 debian/ruby-tests.rake |  2 +-
 debian/rules           | 31 -------------------------------
 4 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63f5cb2..71cd4f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+jekyll (3.0.1+dfsg-1) unstable; urgency=medium
+
+  [ Dominique Dumont ]
+  * control: removed dod from uploaders
+
+  [ Youhei SASAKI ]
+  * Update debian/watch: use Github as upstream
+  * Imported Upstream version 3.0.0
+  * Refresh patches
+  * Drop obsolete test-sources
+
+ -- Youhei SASAKI <uwabami at gfd-dennou.org>  Sun, 22 Nov 2015 15:31:07 +0900
+
 jekyll (2.2.0+dfsg-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/copyright b/debian/copyright
index f8800ac..1d3e615 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,12 +12,12 @@ Copyright: 2014 HouseTrip Ltd
 License: Expat
 Comment: Author is Julien Letessier, https://github.com/mezis/rebund
 
-Files: site/_sass/font-awesome.css
+Files: site/_sass/_font-awesome.css
 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.css
 Copyright: 2013, Coby Chapple
 License: Expat
 
@@ -25,28 +25,28 @@ Files: site/fonts/*
 Copyright: 2014, Dave Gandy
 License: OFL-1.1
 
-Files: site/_sass/normalize.scss
-Copyright: Nicholas Gallagher and Jonathan Neal
+Files: debian/*
+Copyright: 2012-2015 Youhei SASAKI <uwabami at gfd-dennou.org>
+           2014 Dominique Dumont <dod at debian.org>
 License: Expat
-Comment: License does not specify years.
- https://github.com/necolas/normalize.css/blob/master/LICENSE.md
- Replaced with unminified version during installation.
 
-Files: site/js/html5shiv.min.js
+Files: debian/missing-source/html5shiv.min.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: site/js/respond.min.js
+Files: debian/missing-source/respond.js
 Copyright: 2011, Scott Jehl, scottjehl.com
 License: Expat
 Comment: Replaced with unminified version during installation.
 
-Files: debian/*
-Copyright: 2012-2015 Youhei SASAKI <uwabami at gfd-dennou.org>
-           2014 Dominique Dumont <dod at debian.org>
+Files: debian/missing-source/normalize.css
+Copyright: Nicholas Gallagher and Jonathan Neal
 License: Expat
+Comment: License does not specify years.
+ https://github.com/necolas/normalize.css/blob/master/LICENSE.md
+ Replaced with unminified version during installation.
 
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 006a92b..08d001a 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -3,6 +3,6 @@ require 'rake/testtask'
 task :default => :test
 Rake::TestTask.new do |t|
   t.libs << 'lib' << 'test'
-  t.test_files = FileList['test/test_*.rb'].exclude(/.*filter.*|.*tag.*|.*convertible.*|.*generated.*/)
+  t.test_files = FileList['test/test_*.rb'].exclude(/.*tag.*|.*plugin.*/)
   t.verbose = true
 end
diff --git a/debian/rules b/debian/rules
index eda33ec..8c25b92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,34 +20,3 @@ override_dh_auto_clean:
 	rm -fr $(CURDIR)/test/dest
 	rm -fr $(CURDIR)/coverage
 	rm -fr $(CURDIR)/test/source/.jekyll-metadata
-
-# override_dh_auto_build: prepare_test
-# 	dh_auto_build
-# 	mkdir -p $(CURDIR)/site/js
-# 	cp debian/missing-sources/*.js $(CURDIR)/site/js
-# 	cp debian/missing-sources/normalize.css $(CURDIR)/site/_includes/css/
-
-# override_dh_installchangelogs:
-# 	dh_installchangelogs History.markdown
-
-# prepare_test:
-# 	( cd  $(CURDIR)/test/source/_methods && \
-# 	  rm -f um_hi.md && ln -s ./site/generate.md um_hi.md )
-# 	( cd  $(CURDIR)/test/source/_data && \
-# 	  rm -f products.yml && ln -s ../products.yml products.yml )
-# 	( cd $(CURDIR)/test/source/_includes && rm -f tmp && ln -s /tmp tmp )
-# 	( cd $(CURDIR)/test/source/symlink-test && \
-# 	  rm -f _data && ln -s ../_data . && \
-# 	  rm -f symlinked-dir && ln -s ../css symlinked-dir && \
-# 	  rm -f symlinked-file && ln -s ../index.html symlinked-file )
-
-# recover_original_test_sources:
-# 	( cd $(CURDIR)/test/source/_methods && \
-# 	  rm -f um_hi.md && cp $(CURDIR)/debian/test-sources/um_hi.md . )
-# 	( cd $(CURDIR)/test/source/_data && \
-# 	  rm -f products.yml && cp $(CURDIR)/debian/test-sources/products.yml . )
-# 	( cd $(CURDIR)/test/source/_includes && rm -f tmp )
-# 	( cd $(CURDIR)/test/source/symlink-test && \
-# 	  rm -fr _data  && \
-# 	  rm -fr symlinked-dir && \
-# 	  rm -fr symlinked-file && cp $(CURDIR)/debian/test-sources/symlinked-file . )

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