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

[Clint Byrum]

The following commit has been merged in the master branch:
commit 0e89dbc059083e07477a82010d7c1744ca57e41f
Merge: 6179a9771e729b9c28e8a6943835f387b511e221 f2ce19bb802ec088574833bbd4934a71790f0eb6
Author: Clint Byrum <clint at ubuntu.com>
Date:   Thu May 19 14:10:12 2011 -0700

    Imported Debian patch 2.9.4+dfsg1-1

diff --combined debian/changelog
index 0351e10,0000000..5bd07a8
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,0 +1,12 @@@
- ruby-hoe (2.9.4-1) unstable; urgency=low
++ruby-hoe (2.9.4+dfsg1-1) unstable; urgency=low
 +
 +  [ Lucas Nussbaum ]
 +  * Initial release.
 +
 +  [ Clint Byrum ]
 +  * Initial release (Closes: #627328)
 +  * Move template to /usr/share/ruby-hoe/template
++  * Repacking without Hoe.pdf to comply with archive restrictions
++    on documentation that cannot be rebuilt from sources.
 +
-  -- Clint Byrum <clint at ubuntu.com>  Thu, 19 May 2011 09:40:06 -0700
++ -- Clint Byrum <clint at ubuntu.com>  Thu, 19 May 2011 14:10:12 -0700
diff --combined debian/patches/debian-changes-2.9.4-1
index 77dac59,0000000..535c833
mode 100644,000000..100644
--- a/debian/patches/debian-changes-2.9.4-1
+++ b/debian/patches/debian-changes-2.9.4-1
@@@ -1,36 -1,0 +1,42 @@@
 +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: Lucas Nussbaum <lucas at lucas-nussbaum.net>
++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"; ',

-- 
ruby-hoe.git