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

[Clint Byrum]

The following commit has been merged in the master branch:
commit 18b5b3070aa02fe292ee34862dbcc92a066b5392
Author: Clint Byrum <clint at ubuntu.com>
Date:   Fri May 20 09:19:40 2011 -0700

    - renaming README.Source to README.source
    - Renaming debian-changes-2.9.4-1 to disable-tests.patch, trimming to just headers to indicate this is temporary
    - Mentioning repacking in README.source
    - reformatting description to match guidelines.

diff --git a/debian/README.Source b/debian/README.source
similarity index 73%
rename from debian/README.Source
rename to debian/README.source
index 0419e85..f270dc4 100644
--- a/debian/README.Source
+++ b/debian/README.source
@@ -6,3 +6,6 @@ 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/control b/debian/control
index 849c5ba..45442be 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ XS-Ruby-Versions: all
 Package: ruby-hoe
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter, rake (>= 0.8.7), rubygems
-Description: Hoe is a rake/rubygems helper for project Rakefiles
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, rake (>= 0.8.7), rubygems
+Description: rake/rubygems helper for project Rakefiles
  Hoe is a rake/rubygems helper for project Rakefiles. It helps you
  manage and maintain, and release your project and includes a dynamic
  plug-in system allowing for easy extensibility. Hoe ships with
diff --git a/debian/patches/debian-changes-2.9.4-1 b/debian/patches/debian-changes-2.9.4-1
deleted file mode 100644
index 535c833..0000000
--- a/debian/patches/debian-changes-2.9.4-1
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Upstream changes introduced in version 2.9.4-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- ruby-hoe (2.9.4-1) unstable; urgency=low
- .
-   [ Lucas Nussbaum ]
-   * Initial release.
- .
-   [ Clint Byrum ]
-   * Initial release (Closes: #627328)
-   * Move template to /usr/share/ruby-hoe/template
- .
- The person named in the Author field signed this changelog entry.
-Author: Clint Byrum <clint at ubuntu.com>
-Bug-Debian: http://bugs.debian.org/627328
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- 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/disable-tests.patch b/debian/patches/disable-tests.patch
new file mode 100644
index 0000000..33765d9
--- /dev/null
+++ b/debian/patches/disable-tests.patch
@@ -0,0 +1,13 @@
+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 18bd470..3d58fc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-debian-changes-2.9.4-1
+disable-tests.patch
 fix-template-path.patch

-- 
ruby-hoe.git