[DRE-commits] [SCM] ruby-thin.git branch, master, updated. upstream/1.2.11-31-g9a7644c

Tue Jan 10 09:42:19 UTC 2012

The following commit has been merged in the master branch:
commit d3933b5fdc09b6da805cece981d21c83fcd6679a
Author: Ryan Niebur <ryanryan52 at gmail.com>
Date:   Tue Jan 10 00:53:28 2012 -0800

    rename package back to thin

diff --git a/debian/changelog b/debian/changelog
index b3039e4..741c217 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-ruby-thin (1.3.1-1) UNRELEASED; urgency=low
+thin (1.3.1-1) UNRELEASED; urgency=low
 
   [ Laurent Arnoud ]
   * New upstream release
-  * Switch to gem2deb-based packaging. Source and binary package renamed to
-      ruby-thin. Transitional packages added. (Closes: #652090)
+  * Switch to gem2deb-based packaging. Binary package renamed to
+      thin. Transitional packagesadded. (Closes: #652090)
 
   [ Ryan Niebur ]
   * change Priority of transitional packages to extra
diff --git a/debian/control b/debian/control
index a319715..949031c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,21 @@
-Source: ruby-thin
+Source: thin
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Ryan Niebur <ryan at debian.org>, Laurent Arnoud <laurent at spkdev.net>
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.2), help2man, ruby-rack (>= 1.0.0), ruby-eventmachine (>= 0.12.10), ruby-daemons (>= 1.0.9)
 Standards-Version: 3.9.2
-Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-thin.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-thin.git;a=summary
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/thin.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/thin.git;a=summary
 Homepage: http://code.macournoyer.com/thin/
 XS-Ruby-Versions: all
 
-Package: ruby-thin
+Package: thin
 Architecture: any
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-rack (>= 1.0.0), ruby-eventmachine (>= 0.12.10), ruby-daemons (>= 1.0.9)
-Replaces: thin (<< 1.2.4), thin1.8 (<< 1.2.4)
-Breaks: thin (<< 1.2.4), thin1.8 (<< 1.2.4)
+Replaces: thin1.8 (<< 1.2.4)
+Breaks: thin1.8 (<< 1.2.4)
 Provides: thin, thin1.8
 Description: fast and very simple Ruby web server
  Thin is a Ruby web server that glues together 3 of the best Ruby
@@ -29,20 +29,11 @@ Description: fast and very simple Ruby web server
  extensible Ruby web server bundled in an easy to use package for your own
  pleasure.
 
-Package: thin
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends}, ruby-thin
-Description: Transitional package for ruby-thin
- This is a transitional package to ease upgrades to the ruby-thin
- package. It can safely be removed.
-
 Package: thin1.8
 Section: oldlibs
 Priority: extra
 Architecture: all
-Depends: ${misc:Depends}, ruby-thin
-Description: Transitional package for ruby-thin
- This is a transitional package to ease upgrades to the ruby-thin
+Depends: ${misc:Depends}, thin (>= 1.3.1-1)
+Description: Transitional package for thin
+ This is a transitional package to ease upgrades to the thin
  package. It can safely be removed.
diff --git a/debian/gen_init.rb b/debian/gen_init.rb
index c40b661..0fc8329 100644
--- a/debian/gen_init.rb
+++ b/debian/gen_init.rb
@@ -7,8 +7,8 @@ class Command
     "/usr/bin/thin"
   end
 end
-INITD_PATH="/etc/init.d/ruby-thin"
+INITD_PATH="/etc/init.d/thin"
 config_files_path="/etc/thin"
-File.open(File.dirname(__FILE__) + '/ruby-thin.init', 'w') do |f|
+File.open(File.dirname(__FILE__) + '/thin.init', 'w') do |f|
   f << ERB.new(File.read("lib/thin/controllers/service.sh.erb")).result(binding)
 end
diff --git a/debian/patches/fix_require_path_for_thin_parser.patch b/debian/patches/fix_require_path_for_thin_parser.patch
index a36f78f..592ffe0 100644
--- a/debian/patches/fix_require_path_for_thin_parser.patch
+++ b/debian/patches/fix_require_path_for_thin_parser.patch
@@ -4,10 +4,10 @@ Subject: Fix require path for thin_parser due to Debian installation path
 
 Author: Laurent Arnoud <laurent at spkdev.net>
 Forwarded: not-needed
-Index: ruby-thin/lib/thin.rb
+Index: thin/lib/thin.rb
 ===================================================================
---- ruby-thin.orig/lib/thin.rb	2012-01-08 02:44:52.000000000 -0800
-+++ ruby-thin/lib/thin.rb	2012-01-08 02:46:18.000000000 -0800
+--- thin.orig/lib/thin.rb	2012-01-08 02:44:52.000000000 -0800
++++ thin/lib/thin.rb	2012-01-08 02:46:18.000000000 -0800
 @@ -6,6 +6,7 @@
  require 'openssl'
  require 'eventmachine'
diff --git a/debian/ruby-thin.lintian-overrides b/debian/ruby-thin.lintian-overrides
deleted file mode 100644
index 1635ebd..0000000
--- a/debian/ruby-thin.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# remove this lintian overrides when it is released
-# see http://lists.debian.org/debian-lint-maint/2011/09/msg00299.html
-ruby-thin: script-not-executable usr/lib/ruby/vendor_ruby/thin/controllers/service.sh.erb
-ruby-thin: shell-script-fails-syntax-check usr/lib/ruby/vendor_ruby/thin/controllers/service.sh.erb
diff --git a/debian/rules b/debian/rules
index 159cb4f..8dbbd3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,5 +18,5 @@ RUBY_VERSIONS=$(shell ruby -r gem2deb/dh_ruby -e 'puts Gem2Deb::DhRuby::SUPPORTE
 
 override_dh_install:
 	ruby ./debian/gen_init.rb
-	for i in $(RUBY_VERSIONS); do cp debian/ruby-thin/usr/bin/thin debian/ruby-thin/usr/bin/thin$$i; sed -i "1 s/ruby/ruby$$i/g" debian/ruby-thin/usr/bin/thin$$i; done
+	for i in $(RUBY_VERSIONS); do cp debian/thin/usr/bin/thin debian/thin/usr/bin/thin$$i; sed -i "1 s/ruby/ruby$$i/g" debian/thin/usr/bin/thin$$i; done
 	dh_install
diff --git a/debian/ruby-thin.docs b/debian/thin.docs
similarity index 100%
rename from debian/ruby-thin.docs
rename to debian/thin.docs
diff --git a/debian/ruby-thin.examples b/debian/thin.examples
similarity index 100%
rename from debian/ruby-thin.examples
rename to debian/thin.examples
diff --git a/debian/ruby-thin.links b/debian/thin.links
similarity index 100%
rename from debian/ruby-thin.links
rename to debian/thin.links
diff --git a/debian/thin.lintian-overrides b/debian/thin.lintian-overrides
index d584773..752a69c 100644
--- a/debian/thin.lintian-overrides
+++ b/debian/thin.lintian-overrides
@@ -1 +1,5 @@
 thin: script-in-etc-init.d-not-registered-via-update-rc.d
+# remove this lintian overrides when it is released
+# see http://lists.debian.org/debian-lint-maint/2011/09/msg00299.html
+thin: script-not-executable usr/lib/ruby/vendor_ruby/thin/controllers/service.sh.erb
+thin: shell-script-fails-syntax-check usr/lib/ruby/vendor_ruby/thin/controllers/service.sh.erb
diff --git a/debian/ruby-thin.manpages b/debian/thin.manpages
similarity index 100%
rename from debian/ruby-thin.manpages
rename to debian/thin.manpages

-- 
ruby-thin.git

