On Mon, Apr 10, 2017 at 05:05:50PM +0300, Hleb Valoshka wrote: > Hi team, > > Could you advice how to make debdiff properly? > > When I do "debdiff berkshelf_4.3.5-1.dsc berkshelf_4.3.5-2.dsc" its > output contains diff for changelog and lintian-overrides but not for > patches/*. that should just work (and it does for me). I'm not sure what's broken on your side. Did you try from a fresh user account? $ debdiff berkshelf_4.3.5-1.dsc berkshelf_4.3.5-2.dsc diff -Nru berkshelf-4.3.5/debian/changelog berkshelf-4.3.5/debian/changelog --- berkshelf-4.3.5/debian/changelog 2016-09-27 12:06:25.000000000 -0300 +++ berkshelf-4.3.5/debian/changelog 2017-03-16 11:18:49.000000000 -0300 @@ -1,3 +1,10 @@ +berkshelf (4.3.5-2) unstable; urgency=medium + + * Add patch to ignore randomly failing under sbuild test (Closes: #850994) + * Add debian/lintian-overrides for false-positive extra-license-file + + -- Hleb Valoshka <375gnu@gmail.com> Thu, 16 Mar 2017 17:18:49 +0300 + berkshelf (4.3.5-1) unstable; urgency=medium * Initial release (Closes: #775475) diff -Nru berkshelf-4.3.5/debian/lintian-overrides berkshelf-4.3.5/debian/lintian-overrides --- berkshelf-4.3.5/debian/lintian-overrides 1969-12-31 21:00:00.000000000 -0300 +++ berkshelf-4.3.5/debian/lintian-overrides 2017-03-16 11:18:49.000000000 -0300 @@ -0,0 +1,3 @@ +# These files contain licenses for generated files. +berkshelf: extra-license-file usr/share/berkshelf/generator_files/licenses/gplv2.erb +berkshelf: extra-license-file usr/share/berkshelf/generator_files/licenses/gplv3.erb diff -Nru berkshelf-4.3.5/debian/patches/0010-Ignore-randomly-failing-under-sbuild-test.patch berkshelf-4.3.5/debian/patches/0010-Ignore-randomly-failing-under-sbuild-test.patch --- berkshelf-4.3.5/debian/patches/0010-Ignore-randomly-failing-under-sbuild-test.patch 1969-12-31 21:00:00.000000000 -0300 +++ berkshelf-4.3.5/debian/patches/0010-Ignore-randomly-failing-under-sbuild-test.patch 2017-03-16 11:18:49.000000000 -0300 @@ -0,0 +1,21 @@ +From: Hleb Valoshka <375gnu@gmail.com> +Date: Thu, 16 Mar 2017 17:12:10 +0300 +Subject: Ignore randomly failing under sbuild test + +TODO: a proper fix +--- + features/commands/vendor.feature | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/features/commands/vendor.feature b/features/commands/vendor.feature +index 5c593d2..9dd5c22 100644 +--- a/features/commands/vendor.feature ++++ b/features/commands/vendor.feature +@@ -21,6 +21,7 @@ Feature: Vendoring cookbooks to a directory + When I run `berks vendor cukebooks` + Then the exit status should be "BerksfileNotFound" + ++ @ignore + Scenario: vendoring a Berksfile with a metadata demand + Given a cookbook named "fake" + And I cd to "fake" diff -Nru berkshelf-4.3.5/debian/patches/series berkshelf-4.3.5/debian/patches/series --- berkshelf-4.3.5/debian/patches/series 2016-09-27 12:06:25.000000000 -0300 +++ berkshelf-4.3.5/debian/patches/series 2017-03-16 11:18:49.000000000 -0300 @@ -7,3 +7,4 @@ 0007-Loose-ruby-ridley-ruby-solve-version-in-gemfile.patch 0008-Ignore-test-failing-in-sbuild.patch 0009-Use-better-temporary-path-in-tests.patch +0010-Ignore-randomly-failing-under-sbuild-test.patch
Attachment:
signature.asc
Description: PGP signature