diff -Nru compass-h5bp-plugin-1.0.0/debian/changelog compass-h5bp-plugin-1.0.0/debian/changelog --- compass-h5bp-plugin-1.0.0/debian/changelog 2015-05-16 02:28:54.000000000 +0000 +++ compass-h5bp-plugin-1.0.0/debian/changelog 2017-01-23 10:22:31.000000000 +0000 @@ -1,3 +1,33 @@ +compass-h5bp-plugin (1.0.0-3) unstable; urgency=medium + + * Tidy patch 2001 and fix require Sass (not Compass). + Unfuzz patch 2002. + * Bump debhelper compatibility level to 9. + * Update watch file: + + Bump to version 4. + + Add usage comment. + + Use github pattern from documentation. + * Update git-buildpage config: + + Avoid git- prefix. + + Filter any .git* file. + * Update copyright info: + + Use License-Grant and License-Reference fields. + Thanks to Ben Finney. + + Extend coverage of Debian packaging. + * Add lintian override regarding license in License-Reference field. + See bug#786450. + * Modernize Vcs-* fields: + + Use https protocol. + + Use git subdir (not cgit). + + Add .git suffix for Vcs-Git URL. + * Declare compliance with Debian Policy 3.9.8. + * Update package relations: + + Relax dependency on ruby-sass. + + Stop fallback-depend on ruby-compass. + + Build-depend on licensecheck (not devscripts). + + -- Jonas Smedegaard Mon, 23 Jan 2017 11:22:31 +0100 + compass-h5bp-plugin (1.0.0-2) unstable; urgency=medium * Update copyright info: Extend coverage for myself. diff -Nru compass-h5bp-plugin-1.0.0/debian/compat compass-h5bp-plugin-1.0.0/debian/compat --- compass-h5bp-plugin-1.0.0/debian/compat 2013-12-28 01:56:07.000000000 +0000 +++ compass-h5bp-plugin-1.0.0/debian/compat 2017-01-23 10:15:20.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru compass-h5bp-plugin-1.0.0/debian/control compass-h5bp-plugin-1.0.0/debian/control --- compass-h5bp-plugin-1.0.0/debian/control 2015-03-05 12:54:25.000000000 +0000 +++ compass-h5bp-plugin-1.0.0/debian/control 2017-01-23 10:21:29.000000000 +0000 @@ -4,16 +4,16 @@ Maintainer: Debian Sass team Uploaders: Jonas Smedegaard Build-Depends: cdbs, - devscripts, + licensecheck, debhelper, dh-buildinfo, gem2deb, ruby | ruby-interpreter, - ruby-sass (>= 3.4) | ruby-compass -Standards-Version: 3.9.6 + ruby-sass (>= 3.3) +Standards-Version: 3.9.8 Homepage: https://github.com/sporkd/compass-h5bp -Vcs-Git: git://anonscm.debian.org/pkg-sass/compass-h5bp-plugin -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-sass/compass-h5bp-plugin.git +Vcs-Git: https://anonscm.debian.org/git/pkg-sass/compass-h5bp-plugin.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-sass/compass-h5bp-plugin.git XS-Ruby-Versions: all Package: compass-h5bp-plugin diff -Nru compass-h5bp-plugin-1.0.0/debian/control.in compass-h5bp-plugin-1.0.0/debian/control.in --- compass-h5bp-plugin-1.0.0/debian/control.in 2015-03-05 12:23:20.000000000 +0000 +++ compass-h5bp-plugin-1.0.0/debian/control.in 2017-01-23 10:19:41.000000000 +0000 @@ -4,10 +4,10 @@ Maintainer: Debian Sass team Uploaders: Jonas Smedegaard Build-Depends: @cdbs@ -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: https://github.com/sporkd/compass-h5bp -Vcs-Git: git://anonscm.debian.org/pkg-sass/compass-h5bp-plugin -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-sass/compass-h5bp-plugin.git +Vcs-Git: https://anonscm.debian.org/git/pkg-sass/compass-h5bp-plugin.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-sass/compass-h5bp-plugin.git XS-Ruby-Versions: all Package: compass-h5bp-plugin diff -Nru compass-h5bp-plugin-1.0.0/debian/copyright compass-h5bp-plugin-1.0.0/debian/copyright --- compass-h5bp-plugin-1.0.0/debian/copyright 2015-05-16 02:28:02.000000000 +0000 +++ compass-h5bp-plugin-1.0.0/debian/copyright 2017-01-23 10:20:35.000000000 +0000 @@ -9,7 +9,12 @@ License: Expat Files: debian/* -Copyright: 2012-2015, Jonas Smedegaard +Copyright: 2012-2015,2017, Jonas Smedegaard +License-Grant: + 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 3, or (at your option) any + later version. License: GPL-3+ License: Expat @@ -33,20 +38,4 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. License: GPL-3+ - 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 3, 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. - . - Comment: - . - On Debian systems the 'GNU General Public License' version 3 is located - in '/usr/share/common-licenses/GPL-3'. - . - You should have received a copy of the 'GNU General Public License' - along with this program. If not, see . +License-Reference: /usr/share/common-licenses/GPL-3 diff -Nru compass-h5bp-plugin-1.0.0/debian/copyright_hints compass-h5bp-plugin-1.0.0/debian/copyright_hints --- compass-h5bp-plugin-1.0.0/debian/copyright_hints 2015-03-05 12:54:23.000000000 +0000 +++ compass-h5bp-plugin-1.0.0/debian/copyright_hints 2017-01-23 10:20:55.000000000 +0000 @@ -20,6 +20,7 @@ debian/patches/2002_avoid_git_in_gemspec.patch debian/patches/series debian/source/format + debian/source/lintian-overrides debian/watch lib/compass-h5bp.rb lib/compass/h5bp.rb @@ -36,7 +37,7 @@ test/project/sass/original_normalize.scss test/project/sass/test.scss test/project/sass/test_normalize.scss -Copyright: *No copyright* +Copyright: NONE License: UNKNOWN FIXME @@ -46,12 +47,12 @@ FIXME Files: debian/rules -Copyright: 2012-2014, Jonas Smedegaard +Copyright: 2012-2015, 2017, Jonas Smedegaard License: GPL-3+ FIXME Files: README.md -Copyright: 2012, Peter Gumeson +Copyright: 2012, Peter Gumeson. License: UNKNOWN FIXME diff -Nru compass-h5bp-plugin-1.0.0/debian/gbp.conf compass-h5bp-plugin-1.0.0/debian/gbp.conf --- compass-h5bp-plugin-1.0.0/debian/gbp.conf 2015-05-16 02:28:22.000000000 +0000 +++ compass-h5bp-plugin-1.0.0/debian/gbp.conf 2017-01-23 10:16:31.000000000 +0000 @@ -3,6 +3,4 @@ [DEFAULT] pristine-tar = True sign-tags = True - -[import-orig] -filter = .gitignore +filter = */.git* diff -Nru compass-h5bp-plugin-1.0.0/debian/patches/2001-frameworks-below-usr-share.patch compass-h5bp-plugin-1.0.0/debian/patches/2001-frameworks-below-usr-share.patch --- compass-h5bp-plugin-1.0.0/debian/patches/2001-frameworks-below-usr-share.patch 2015-03-05 12:48:15.000000000 +0000 +++ compass-h5bp-plugin-1.0.0/debian/patches/2001-frameworks-below-usr-share.patch 2017-01-23 10:13:26.000000000 +0000 @@ -1,12 +1,16 @@ Description: point to framework below /usr/share - Register system shared install location, and while at it also allow use - directly with recent sass. + Register system shared install location, and support direct Sass use. Author: Jonas Smedegaard -Last-Update: 2015-03-05 +Last-Update: 2017-01-23 --- a/lib/compass/h5bp.rb +++ b/lib/compass/h5bp.rb -@@ -3,9 +3,17 @@ +@@ -1,11 +1,18 @@ ++base_directory = File.expand_path('/usr/share/compass/frameworks/compass-h5bp') ++stylesheets_path = File.join(base_directory, 'stylesheets') ++ + require 'compass/h5bp/version' + module Compass # HTML5 Boilerplate v5 Compass Extension module Html5bp @@ -14,17 +18,22 @@ - 'compass-h5bp', - path: "#{File.dirname(__FILE__)}/../.." - ) -+ base_directory = File.expand_path('/usr/share/compass/frameworks/compass-h5bp') -+ stylesheets_path = File.join(base_directory, 'stylesheets') -+ + if (defined? Compass) + Compass::Frameworks.register( + 'compass-h5bp', + path: base_directory + ) + else -+ ENV["SASS_PATH"] = [ENV["SASS_PATH"], -+ stylesheets_path].compact.join(File::PATH_SEPARATOR) ++ ENV["SASS_PATH"] = [ENV["SASS_PATH"], stylesheets_path].compact.join(File::PATH_SEPARATOR) + end end end +--- a/compass-h5bp.gemspec ++++ b/compass-h5bp.gemspec +@@ -19,5 +19,5 @@ + s.executables = `git ls-files -- bin/*`.split('\n').map { |f| File.basename(f) } + s.require_paths = ['lib'] + +- s.add_runtime_dependency 'compass', '~> 1.0', '>= 1.0.3' ++ s.add_dependency('sass', ['~>3.3']) + end diff -Nru compass-h5bp-plugin-1.0.0/debian/patches/2002_avoid_git_in_gemspec.patch compass-h5bp-plugin-1.0.0/debian/patches/2002_avoid_git_in_gemspec.patch --- compass-h5bp-plugin-1.0.0/debian/patches/2002_avoid_git_in_gemspec.patch 2015-03-05 12:46:26.000000000 +0000 +++ compass-h5bp-plugin-1.0.0/debian/patches/2002_avoid_git_in_gemspec.patch 2017-01-23 10:13:30.000000000 +0000 @@ -16,4 +16,4 @@ + s.executables = `find * -path 'bin/*' -type f`.split('\n').map{ |f| File.basename(f) } s.require_paths = ['lib'] - s.add_runtime_dependency 'compass', '~> 1.0', '>= 1.0.3' + s.add_dependency('sass', ['~>3.3']) diff -Nru compass-h5bp-plugin-1.0.0/debian/rules compass-h5bp-plugin-1.0.0/debian/rules --- compass-h5bp-plugin-1.0.0/debian/rules 2015-05-16 02:28:08.000000000 +0000 +++ compass-h5bp-plugin-1.0.0/debian/rules 2017-01-23 10:21:13.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2012-2015 Jonas Smedegaard +# Copyright © 2012-2015, 2017 Jonas Smedegaard # Description: Main Debian packaging script for Compass H5bp # # This program is free software; you can redistribute it and/or modify @@ -31,7 +31,7 @@ # needed during build and at runtime deps = ruby | ruby-interpreter -deps +=, ruby-sass (>= 3.4) | ruby-compass +deps +=, ruby-sass (>= 3.3) DEB_DH_INSTALL_ARGS_$(pkg) = stylesheets \ usr/share/compass/frameworks/$(framework) diff -Nru compass-h5bp-plugin-1.0.0/debian/source/lintian-overrides compass-h5bp-plugin-1.0.0/debian/source/lintian-overrides --- compass-h5bp-plugin-1.0.0/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ compass-h5bp-plugin-1.0.0/debian/source/lintian-overrides 2017-01-23 10:18:49.000000000 +0000 @@ -0,0 +1,5 @@ +# License is in License-Reference field (see bug#786450) +missing-license-text-in-dep5-copyright + +# License is in License-Reference field (see bug#786450) +missing-license-paragraph-in-dep5-copyright diff -Nru compass-h5bp-plugin-1.0.0/debian/watch compass-h5bp-plugin-1.0.0/debian/watch --- compass-h5bp-plugin-1.0.0/debian/watch 2013-12-28 01:56:07.000000000 +0000 +++ compass-h5bp-plugin-1.0.0/debian/watch 2017-01-23 10:16:05.000000000 +0000 @@ -1,2 +1,5 @@ -version=3 -https://github.com/sporkd/compass-h5bp/tags .*/archive/v?(\d[\d\.]+).tar.gz +# run "uscan --report" to check or "gpb import-orig --uscan" to update +version=4 +opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%" \ + https://github.com/sporkd/compass-h5bp/tags \ + (?:.*?/)?v?(\d[\d.]*)@ARCHIVE_EXT@