[DRE-commits] [SCM] fast and very simple Ruby web server branch, master, updated. upstream/1.2.11-5-g7583522

[Laurent Arnoud]

The following commit has been merged in the master branch:
commit 758352210dcf96801758c86b7a934c11d196fb90
Author: Laurent Arnoud <laurent at spkdev.net>
Date:   Mon May 9 22:13:08 2011 +0200

    Fix init and manpage
    
    Signed-off-by: Laurent Arnoud <laurent at spkdev.net>

diff --git a/debian/gen_init.rb b/debian/gen_init.rb
index c75ae0f..82e8c3a 100644
--- a/debian/gen_init.rb
+++ b/debian/gen_init.rb
@@ -4,11 +4,11 @@ require 'erb'
 
 class Command
   def self.script
-    "/usr/bin/thin1.8"
+    "/usr/bin/thin"
   end
 end
-INITD_PATH="/etc/init.d/thin1.8"
-config_files_path="/etc/thin1.8"
-File.open(File.dirname(__FILE__) + '/thin1.8.init', 'w') do |f|
+INITD_PATH="/etc/init.d/ruby-thin"
+config_files_path="/etc/thin"
+File.open(File.dirname(__FILE__) + '/ruby-thin.init', 'w') do |f|
   f << ERB.new(File.read("lib/thin/controllers/service.sh.erb")).result(binding)
 end
diff --git a/debian/rules b/debian/rules
index ffd032b..400607a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,11 +11,16 @@
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec
 
-# TODO: fix init
-
 %:
 	dh $@ --buildsystem=ruby --with ruby
 
+override_dh_install:
+	dh_install
+	ruby ./debian/gen_init.rb
+	cp ./ext/thin_parser/thin_parser.so ./lib
+	RUBYLIB=./lib/ help2man -n "fast and very simple Ruby web server" ./bin/thin > debian/thin.manpage
+	rm -f ./lib/thin_parser.so
+
 override_dh_auto_clean:
 	dh_auto_clean
 	cd ext/thin_parser/ && rm -f mkmf.log parser.o thin_parser.so thin.o

-- 
fast and very simple Ruby web server