[DRE-commits] [yard] 06/13: Refresh/update patches

Antonio Terceiro terceiro at moszumanska.debian.org
Fri Jan 13 09:54:04 UTC 2017


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

terceiro pushed a commit to branch master
in repository yard.

commit b6bc877c7924e65e77e56e9b86c672d8f1d79934
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Jan 10 18:28:50 2017 -0200

    Refresh/update patches
---
 debian/changelog                                   |  5 ++-
 ...tamps-where-possible-for-reproducible-bu.patch} | 13 ++++++--
 ...sible-privacy-breach-with-distant-images.patch} | 12 +++++--
 ...writing-to-file-shipped-with-upstream-sou.patch | 21 ++++++++++++
 ...lobal-configuration-directory-to-tmp-duri.patch | 39 ++++++++++++++++++++++
 ...0005-spec-add-missing-require-spec_helper.patch | 20 +++++++++++
 debian/patches/series                              |  7 ++--
 debian/rules                                       |  1 +
 8 files changed, 109 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0de65e5..82718bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 yard (0.9.7-1) unstable; urgency=medium
 
+  * Team upload
+
   [ Lucas Nussbaum ]
   * Fix permissions of files in /usr/share/yard/templates. (Avoids lintian
     warnings)
@@ -9,7 +11,8 @@ yard (0.9.7-1) unstable; urgency=medium
     (Closes: #849972)
   * debian/rules, debian/ruby-tests.rake: refreshed with `dh-make-ruby -w`
   * debian/rules: install using the Rubygems layout. This makes most of the
-    patches we have been carrying here obsolete.
+    patches we have been carrying here obsolete. Remaining patches
+    refreshed/updated.
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 10 Jan 2017 17:47:20 -0200
 
diff --git a/debian/patches/no-timestamps.patch b/debian/patches/0001-remove-timestamps-where-possible-for-reproducible-bu.patch
similarity index 71%
rename from debian/patches/no-timestamps.patch
rename to debian/patches/0001-remove-timestamps-where-possible-for-reproducible-bu.patch
index b2b4bb0..a102651 100644
--- a/debian/patches/no-timestamps.patch
+++ b/debian/patches/0001-remove-timestamps-where-possible-for-reproducible-bu.patch
@@ -1,10 +1,17 @@
-Description: remove timestamps where possible, for reproducible builds
+From: Christian Hofstaedtler <zeha at debian.org>
+Date: Tue, 10 Jan 2017 18:06:18 -0200
+Subject: remove timestamps where possible, for reproducible builds
+
 Origin: vendor
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776648
-Last-Update: 2015-04-08
+Last-Update: 2017-01-10
+---
+ lib/yard/i18n/pot_generator.rb           | 2 +-
+ templates/default/layout/html/footer.erb | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/lib/yard/i18n/pot_generator.rb b/lib/yard/i18n/pot_generator.rb
-index df04614..c790ee0 100644
+index 627daf4..76f7f02 100644
 --- a/lib/yard/i18n/pot_generator.rb
 +++ b/lib/yard/i18n/pot_generator.rb
 @@ -158,7 +158,7 @@ EOH
diff --git a/debian/patches/privacy-breach.patch b/debian/patches/0002-Prevent-possible-privacy-breach-with-distant-images.patch
similarity index 78%
rename from debian/patches/privacy-breach.patch
rename to debian/patches/0002-Prevent-possible-privacy-breach-with-distant-images.patch
index 2936ef9..0939608 100644
--- a/debian/patches/privacy-breach.patch
+++ b/debian/patches/0002-Prevent-possible-privacy-breach-with-distant-images.patch
@@ -1,10 +1,16 @@
-Description: Prevent possible privacy breach with distant images
-Author: Cédric Boutillier <boutil at debian.org>
+From: =?utf-8?q?C=C3=A9dric_Boutillier?= <boutil at debian.org>
+Date: Tue, 10 Jan 2017 18:06:19 -0200
+Subject: Prevent possible privacy breach with distant images
+
 Origin: vendor
 Forwarded: not-needed
 Last-Update: 2016-07-09
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ README.md | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/README.md b/README.md
+index c95d9ad..e34f500 100644
 --- a/README.md
 +++ b/README.md
 @@ -1,15 +1,5 @@
diff --git a/debian/patches/0003-spec-avoid-writing-to-file-shipped-with-upstream-sou.patch b/debian/patches/0003-spec-avoid-writing-to-file-shipped-with-upstream-sou.patch
new file mode 100644
index 0000000..13e8e96
--- /dev/null
+++ b/debian/patches/0003-spec-avoid-writing-to-file-shipped-with-upstream-sou.patch
@@ -0,0 +1,21 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Tue, 10 Jan 2017 18:17:08 -0200
+Subject: spec: avoid writing to file shipped with upstream source
+
+---
+ spec/spec_helper.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index c59b2d9..61f1fc1 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -168,7 +168,7 @@ RSpec.configure do |config|
+   # Allows RSpec to persist some state between runs in order to support
+   # the `--only-failures` and `--next-failure` CLI options. We recommend
+   # you configure your source control system to ignore this file.
+-  config.example_status_persistence_file_path = "spec/examples.txt"
++  config.example_status_persistence_file_path = "debian/examples.txt"
+ 
+   # Limits the available syntax to the non-monkey patched syntax that is
+   # recommended. For more details, see:
diff --git a/debian/patches/0004-move-YARD-global-configuration-directory-to-tmp-duri.patch b/debian/patches/0004-move-YARD-global-configuration-directory-to-tmp-duri.patch
new file mode 100644
index 0000000..5dbc533
--- /dev/null
+++ b/debian/patches/0004-move-YARD-global-configuration-directory-to-tmp-duri.patch
@@ -0,0 +1,39 @@
+From: =?utf-8?q?C=C3=A9dric_Boutillier?= <boutil at debian.org>
+Date: Tue, 10 Jan 2017 18:18:21 -0200
+Subject: move YARD global configuration directory to tmp/ during specs
+
+The specs try to write in this directory. The default location is in $HOME
+which is undefined and causes build failures with sbuild.
+
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=738409
+Last-Update: 2017-01-10
+---
+ spec/config_spec.rb | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/spec/config_spec.rb b/spec/config_spec.rb
+index 2f4435f..3195863 100644
+--- a/spec/config_spec.rb
++++ b/spec/config_spec.rb
+@@ -1,7 +1,20 @@
+ # frozen_string_literal: true
+ require 'yaml'
++require 'tmpdir'
+ 
+ RSpec.describe YARD::Config do
++
++  before :all do
++    YARD::Config::CONFIG_DIR=Dir.mktmpdir
++    YARD::Config::CONFIG_FILE=File.join(CONFIG_DIR, 'config')
++  end
++
++  after :all do
++    Dir.rmdir(YARD::Config::CONFIG_DIR)
++    YARD::Config::CONFIG_DIR=File.expand_path('~/.yard')
++    YARD::Config::CONFIG_FILE=File.join(CONFIG_DIR, 'config')
++  end
++
+   describe ".load" do
+     before do
+       expect(File).to receive(:file?).twice.with(CLI::Yardoc::DEFAULT_YARDOPTS_FILE).and_return(false)
diff --git a/debian/patches/0005-spec-add-missing-require-spec_helper.patch b/debian/patches/0005-spec-add-missing-require-spec_helper.patch
new file mode 100644
index 0000000..f92fc3a
--- /dev/null
+++ b/debian/patches/0005-spec-add-missing-require-spec_helper.patch
@@ -0,0 +1,20 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Tue, 10 Jan 2017 18:19:09 -0200
+Subject: spec: add missing `require 'spec_helper'`
+
+---
+ spec/cli/command_parser_spec.rb | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/spec/cli/command_parser_spec.rb b/spec/cli/command_parser_spec.rb
+index c3ad54b..58c2b76 100644
+--- a/spec/cli/command_parser_spec.rb
++++ b/spec/cli/command_parser_spec.rb
+@@ -1,5 +1,7 @@
+ # frozen_string_literal: true
+ 
++require 'spec_helper'
++
+ RSpec.describe YARD::CLI::CommandParser do
+   describe "#run" do
+     before do
diff --git a/debian/patches/series b/debian/patches/series
index 3555624..e7b63da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,5 @@
-no-timestamps.patch
-privacy-breach.patch
+0001-remove-timestamps-where-possible-for-reproducible-bu.patch
+0002-Prevent-possible-privacy-breach-with-distant-images.patch
+0003-spec-avoid-writing-to-file-shipped-with-upstream-sou.patch
+0004-move-YARD-global-configuration-directory-to-tmp-duri.patch
+0005-spec-add-missing-require-spec_helper.patch
diff --git a/debian/rules b/debian/rules
index 608be29..3845622 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,3 +23,4 @@ override_dh_clean:
 	rm -rf .yardoc
 	rm -rf man/
 	rm -rf doc/
+	rm -rf debian/examples.txt

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



More information about the Pkg-ruby-extras-commits mailing list