[DRE-commits] [SCM] ruby-hoe.git branch, master, updated. debian/2.9.4-1-1-g6179a97

Thu May 19 18:06:18 UTC 2011

The following commit has been merged in the master branch:
commit 6179a9771e729b9c28e8a6943835f387b511e221
Author: Clint Byrum <clint at ubuntu.com>
Date:   Thu May 19 09:47:33 2011 -0700

    Initial release (Closes: #627328)
    
    * Initial release (Closes: #627328)
    * Move template to /usr/share/ruby-hoe/template

diff --git a/debian/README.Source b/debian/README.Source
new file mode 100644
index 0000000..0419e85
--- /dev/null
+++ b/debian/README.Source
@@ -0,0 +1,8 @@
+Package contains overrides for rubygems because it directly interfaces
+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.
diff --git a/debian/changelog b/debian/changelog
index 39d2ee8..0351e10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 ruby-hoe (2.9.4-1) unstable; urgency=low
 
+  [ Lucas Nussbaum ]
   * Initial release.
 
- -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Wed, 27 Apr 2011 21:21:24 +0200
+  [ Clint Byrum ]
+  * Initial release (Closes: #627328)
+  * Move template to /usr/share/ruby-hoe/template
+
+ -- Clint Byrum <clint at ubuntu.com>  Thu, 19 May 2011 09:40:06 -0700
diff --git a/debian/control b/debian/control
index 141132d..849c5ba 100644
--- a/debian/control
+++ b/debian/control
@@ -2,22 +2,28 @@ Source: ruby-hoe
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>
+Uploaders: Clint Byrum <clint at ubuntu.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.2), rake
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.2)
+# minitest (>= 2.0.2, development)
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-hoe.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-hoe.git;a=summary
-Homepage: http://seattlerb.rubyforge.org/hoe/
+Homepage: http://rubyforge.org/projects/seattlerb/
 XS-Ruby-Versions: all
 
 Package: ruby-hoe
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter, rake
-Description: Rake/Rubygems helper for project Rakefiles
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter, rake (>= 0.8.7), rubygems
+Description: Hoe is a 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
  plug-ins for all your usual project tasks including rdoc generation,
  testing, packaging, and deployment.
+ .
+ See class rdoc for help. Hint: `ri Hoe` or any of the plugins listed
+ below.
+ .
+ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf
diff --git a/debian/copyright b/debian/copyright
index 1261536..4a7bcaf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,4 +26,5 @@ License: MIT
 
 Files: debian/*
 Copyright: Copyright 2011 Lucas Nussbaum <lucas at lucas-nussbaum.net>
+           Copyright 2011 Canonical Ltd.
 License: MIT
diff --git a/debian/patches/fix-template-path.patch b/debian/patches/fix-template-path.patch
new file mode 100644
index 0000000..bc605cc
--- /dev/null
+++ b/debian/patches/fix-template-path.patch
@@ -0,0 +1,16 @@
+Author: Clint Byrum <clint at ubuntu.com>
+Subject: Move template directory to /usr/share per FHS/Debian Policy
+
+Index: ruby-hoe-2.9.4/bin/sow
+===================================================================
+--- ruby-hoe-2.9.4.orig/bin/sow	2011-05-19 07:21:25.460364740 -0700
++++ ruby-hoe-2.9.4/bin/sow	2011-05-19 07:25:28.756015391 -0700
+@@ -52,7 +52,7 @@
+ # variables for erb:
+ template_dir  = File.expand_path("~/.hoe_template")
+ template_path = File.join template_dir, option[:style]
+-source_path   = File.join(File.dirname(File.dirname(__FILE__)), "template")
++source_path   = File.join(File.dirname(File.dirname(__FILE__)), "share","ruby-hoe","template")
+ default_dir   = File.join template_dir, "default"
+ 
+ if File.directory? template_dir and not File.directory? default_dir then
diff --git a/debian/patches/series b/debian/patches/series
index 71a6fe6..18bd470 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian-changes-2.9.4-1
+fix-template-path.patch
diff --git a/debian/require-rubygems.overrides b/debian/require-rubygems.overrides
index c773750..6b2c33f 100644
--- a/debian/require-rubygems.overrides
+++ b/debian/require-rubygems.overrides
@@ -1,3 +1,3 @@
 debian/ruby-hoe/usr/lib/ruby/vendor_ruby/hoe.rb
-debian/ruby-hoe/usr/lib/ruby/vendor_ruby/hoe/package.rb
 debian/ruby-hoe/usr/lib/ruby/vendor_ruby/hoe/deps.rb
+debian/ruby-hoe/usr/lib/ruby/vendor_ruby/hoe/package.rb
diff --git a/debian/ruby-hoe.install b/debian/ruby-hoe.install
new file mode 100644
index 0000000..7c9859e
--- /dev/null
+++ b/debian/ruby-hoe.install
@@ -0,0 +1 @@
+template/ /usr/share/ruby-hoe
diff --git a/debian/rules b/debian/rules
index a5e7dc8..24112ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,8 @@
 #
 # 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
+export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1
+
 #
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec

-- 
ruby-hoe.git

