[DRE-commits] [ruby-pathname2] 01/01: Patch from vorlon at debian.org to fix tests

Sat Oct 14 17:05:16 UTC 2017

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

misterc-guest pushed a commit to tag debian/1.8.0-2
in repository ruby-pathname2.

commit 9d316c4749f8189eb932d100eb99d99fa1bb4c11
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Sat Oct 14 09:53:38 2017 -0700

    Patch from  vorlon at debian.org to fix tests
---
 debian/changelog                 |  7 +++++++
 debian/control                   |  3 +--
 debian/patches/gemspec-dep.patch | 17 +++++++++++++++++
 debian/patches/series            |  1 +
 debian/pathname2.gemspec         | 38 --------------------------------------
 debian/rules                     |  2 +-
 debian/watch                     |  2 +-
 7 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b8fa40..da94a8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-pathname2 (1.8.0-2) unstable; urgency=low
+
+  * Add patch from vorlon at debian.org to fix tests. (Closes: #871718)
+  * Increment standards version. No changes needed.
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Sat, 14 Oct 2017 10:02:32 -0700
+
 ruby-pathname2 (1.8.0-1) unstable; urgency=medium
 
   *  new upstream release
diff --git a/debian/control b/debian/control
index d0593d4..d6a8be5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Priority: optional
 Build-Depends: debhelper (>= 9),
                gem2deb,
                ruby-facade
-Standards-Version: 3.9.8
+Standards-Version: 4.1.1
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-pathname2.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-pathname2.git
 Homepage: https://github.com/djberg96/pathname2
@@ -18,7 +18,6 @@ Architecture: all
 Depends: ruby | ruby-interpreter,
          ruby-facade,
          ${misc:Depends},
-         ${shlibs:Depends}
 Description: alternate implementation of the Pathname class
  pathname2 is a library that provides an implementation of the Pathname
  class different from the one that ships as part of the Ruby standard
diff --git a/debian/patches/gemspec-dep.patch b/debian/patches/gemspec-dep.patch
new file mode 100644
index 0000000..3b25b6b
--- /dev/null
+++ b/debian/patches/gemspec-dep.patch
@@ -0,0 +1,17 @@
+Description: Fix missing dependency on rake
+ This was previously fixed in debian/pathname2.gemspec, but that didn't allow
+ gem2deb-test-runner to properly detect this in the source.  Patch the
+ upstream spec instead of creating duplicate files in the test tree, as this
+ should go upstream anyway.
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+Bug-Debian: https://bugs.debian.org/871718
+Last-Update: 2017-08-10
+
+--- ruby-pathname2-1.8.0.orig/pathname2.gemspec
++++ ruby-pathname2-1.8.0/pathname2.gemspec
+@@ -1,4 +1,5 @@
+ require 'rubygems'
++require 'rake'
+ 
+ Gem::Specification.new do |spec|
+   spec.name        = 'pathname2'
diff --git a/debian/patches/series b/debian/patches/series
index fcc9258..162cb70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 #fix-test
+gemspec-dep.patch
diff --git a/debian/pathname2.gemspec b/debian/pathname2.gemspec
deleted file mode 100644
index eec5bce..0000000
--- a/debian/pathname2.gemspec
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-Gem::Specification.new do |spec|
-  spec.name        = 'pathname2'
-  spec.version     = '1.8.0'
-  spec.author      = 'Daniel J. Berger'
-  spec.license     = 'Apache 2.0'
-  spec.email       = 'djberg96 at gmail.com'
-  spec.homepage    = 'https://github.com/djberg96/pathname2'
-  spec.summary     = 'An alternate implementation of the Pathname class'
-  spec.files       = Dir['**/*'].reject{ |f| f.include?('git') }
-  spec.cert_chain  = ['certs/djberg96_pub.pem']
-
-  spec.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
-
-  spec.add_dependency('facade')
-  spec.add_development_dependency('test-unit')
-  spec.add_development_dependency('rake')
-
-  if File::ALT_SEPARATOR
-    spec.add_dependency('ffi')
-    spec.test_files = FileList['test/windows/*.rb', 'test/test_version.rb']
-    spec.platform = Gem::Platform.new(['universal', 'mingw32'])
-  else
-    spec.test_files = FileList['test/test_pathname.rb', 'test/test_version.rb']
-  end
-
-  spec.description = <<-EOF
-    The pathname2 library provides an implementation of the Pathname
-    class different from the one that ships as part of the Ruby standard
-    library. It is a subclass of String, though several methods have been
-    overridden to better fit a path context. In addition, it supports file
-    URL's as paths, provides additional methods for Windows paths, and
-    handles UNC paths on Windows properly. See the README file for more
-    details.
-  EOF
-end
diff --git a/debian/rules b/debian/rules
index fe932fd..acfc5fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@
 #export DH_RUBY_IGNORE_TESTS=ruby2.1 ruby2.2
 #
 # If you need to specify the .gemspec (eg there is more than one)
-export DH_RUBY_GEMSPEC=debian/pathname2.gemspec
+#export DH_RUBY_GEMSPEC=gem.gemspec
 #
 # Uncomment to check dependencies during build:
 # export GEM2DEB_TEST_RUNNER = --check-dependencies
diff --git a/debian/watch b/debian/watch
index daf4c9d..1e96c4d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/pathname2 .*/pathname2-(.*).tar.gz
+https://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/pathname2 .*/pathname2-(.*).tar.gz

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

