[DRE-commits] [SCM] ruby-hoe.git branch, master, updated. upstream/2.9.4-13-gaa0949e

[Clint Byrum]

The following commit has been merged in the master branch:
commit aa0949ec95bfc4b557b3d677471000410d30f305
Author: Clint Byrum <clint at ubuntu.com>
Date:   Tue Jun 7 15:48:41 2011 -0700

    - removing disable tests patch
    - fixing watch file to mangle version for dfsg

diff --git a/debian/README.source b/debian/README.source
index f270dc4..f9d20c8 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,8 +4,5 @@ with the Rubygems library.
 Normally template ends up in same dir as the script 'sow', but that
 violates FHS so sow has been patched to access template in /usr/share.
 
-Initial bootstrapping requires disabling of tests because running the
-tests depends on minitest which depends on hoe to build.
-
 Note that the upstream tarball has been repacked to remove Hoe.pdf
 which has no publicly available source or rebuild instructions.
diff --git a/debian/patches/disable-tests.patch b/debian/patches/disable-tests.patch
deleted file mode 100644
index 33765d9..0000000
--- a/debian/patches/disable-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Disable tests until minitest is available.
-
---- ruby-hoe-2.9.4.orig/test/test_hoe_test.rb
-+++ ruby-hoe-2.9.4/test/test_hoe_test.rb
-@@ -18,7 +18,7 @@ class TestHoeTest < MiniTest::Unit::Test
-     end
-   end
- 
--  def test_make_test_cmd_with_different_testlibs
-+  def est_make_test_cmd_with_different_testlibs
-     expected = ['-w -Ilib:bin:test:. -e \'require "rubygems"; %s',
-                 'require "test/test_hoe.rb"; ',
-                 'require "test/test_hoe_gemcutter.rb"; ',
diff --git a/debian/patches/series b/debian/patches/series
index 3d58fc4..ac69eeb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-disable-tests.patch
 fix-template-path.patch
diff --git a/debian/watch b/debian/watch
index 38fbf22..3a9ab94 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/hoe .*/hoe-(.*).tar.gz
+opts=dversionmangle=s/\.dfsg\.\d+$// http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/hoe .*/hoe-(.*).tar.gz

-- 
ruby-hoe.git