[DRE-commits] [ruby-simplecov-html] 05/06: Update packaging with a new dh-make-ruby run

Antonio Terceiro terceiro at moszumanska.debian.org
Tue Sep 15 14:58:52 UTC 2015


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

terceiro pushed a commit to branch master
in repository ruby-simplecov-html.

commit 83a12a8466b782cde93b08e7eb849dd1eb3f0294
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Sep 15 11:43:22 2015 -0300

    Update packaging with a new dh-make-ruby run
---
 debian/changelog                             |  2 ++
 debian/compat                                |  2 +-
 debian/control                               | 20 ++++++++++++++------
 debian/patches/fix-paths.patch               | 26 --------------------------
 debian/patches/remove-rubygems-bundler.patch | 24 ------------------------
 debian/patches/series                        |  2 --
 debian/ruby-tests.rake                       |  9 ---------
 debian/rules                                 | 13 ++-----------
 8 files changed, 19 insertions(+), 79 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dbfcd67..d8618c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ruby-simplecov-html (0.10.0-1) UNRELEASED; urgency=medium
   * New upstream release (Closes: #709441)
     (previous version was never actually uploaded)
   * Refresh patches
+  * Update packaging with a new dh-make-ruby run
+    - ignoring test suite since it's not useful
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 15 Sep 2015 11:31:05 -0300
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 6ed0185..722a5b1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,21 +3,29 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Praveen Arimbrathodiyil <praveen at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.1~), rake, ruby-simplecov (>= 0.7.1),
- libjs-jquery, libjs-jquery-ui, libjs-jquery-fancybox
-Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 9~),
+               gem2deb,
+               libjs-jquery,
+               libjs-jquery-ui,
+               libjs-jquery-fancybox,
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-simplecov-html.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-simplecov-html.git;a=summary
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-simplecov-html.git
 Homepage: https://github.com/colszowka/simplecov-html
 XS-Ruby-Versions: all
 
 Package: ruby-simplecov-html
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
- libjs-jquery, libjs-jquery-ui, libjs-jquery-fancybox
+Depends: ruby | ruby-interpreter,
+         ${misc:Depends},
+         ${shlibs:Depends},
+         libjs-jquery,
+         libjs-jquery-ui,
+         libjs-jquery-fancybox,
 Description: default HTML formatter for SimpleCov code coverage tool
  Default HTML formatter for SimpleCov code coverage tool for ruby 1.9+
  .
  Generates a nice HTML report of your SimpleCov ruby code coverage results on
  Ruby 1.9 using client-side Javascript quite extensively.
+
diff --git a/debian/patches/fix-paths.patch b/debian/patches/fix-paths.patch
deleted file mode 100644
index b21302f..0000000
--- a/debian/patches/fix-paths.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix paths to public and views
- public and views are installed in /usr/share/
- and library should use those paths to access them
-Author: Praveen Arimbrathodiyil <praveen at debian.org>
-Last-update: 2013-05-28
-
---- a/lib/simplecov-html.rb
-+++ b/lib/simplecov-html.rb
-@@ -15,7 +15,7 @@ module SimpleCov
-   module Formatter
-     class HTMLFormatter
-       def format(result)
--        Dir[File.join(File.dirname(__FILE__), "../public/*")].each do |path|
-+        Dir[File.join(File.dirname(__FILE__), '../../../share/ruby-simplecov-html/public/*')].each do |path|
-           FileUtils.cp_r(path, asset_output_path)
-         end
- 
-@@ -33,7 +33,7 @@ module SimpleCov
- 
-       # Returns the an erb instance for the template of given name
-       def template(name)
--        ERB.new(File.read(File.join(File.dirname(__FILE__), "../views/", "#{name}.erb")))
-+        ERB.new(File.read(File.join(File.dirname(__FILE__), '../../../share/ruby-simplecov-html/views/', "#{name}.erb")))
-       end
- 
-       def output_path
diff --git a/debian/patches/remove-rubygems-bundler.patch b/debian/patches/remove-rubygems-bundler.patch
deleted file mode 100644
index ff89050..0000000
--- a/debian/patches/remove-rubygems-bundler.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Remove rubygems and bundler
- apt takes care of the required dependencies.
- we note down dependencies in debian/control.
-Author: Praveen Arimbrathodiyil <praveen at debian.org>
-Last-Updated: 2013-05-23
-
---- a/test/helper.rb
-+++ b/test/helper.rb
-@@ -1,4 +1,3 @@
--require "bundler/setup"
- require "simplecov"
- require "simplecov-html"
- require "test/unit"
---- a/lib/simplecov-html.rb
-+++ b/lib/simplecov-html.rb
-@@ -8,7 +8,7 @@ require "time"
- major, minor, patch =  SimpleCov::VERSION.scan(/\d+/).first(3).map(&:to_i)
- if major < 0 || minor < 9 || patch < 0
-   fail "The version of SimpleCov you are using is too old. "\
--  "Please update with `gem install simplecov` or `bundle update simplecov`"
-+  "Please update"
- end
- 
- module SimpleCov
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b7d630e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-remove-rubygems-bundler.patch
-fix-paths.patch
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
deleted file mode 100644
index 0c7131c..0000000
--- a/debian/ruby-tests.rake
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/**/test_*.rb']
-  t.verbose = true
-end
-
-task :default => [:test]
diff --git a/debian/rules b/debian/rules
index a5e7dc8..3454d59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,6 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
-#
-# Uncomment to ignore all test failures (but the tests will run anyway)
-#export DH_RUBY_IGNORE_TESTS=all
-#
-# Uncomment to ignore some test failures (but the tests will run anyway).
-# Valid values:
-#export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
-#
-# If you need to specify the .gemspec (eg there is more than one)
-#export DH_RUBY_GEMSPEC=gem.gemspec
+
+export GEM2DEB_TEST_RUNNER = --check-dependencies
 
 %:
 	dh $@ --buildsystem=ruby --with ruby

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



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