[DRE-commits] r3223 - packages-wip/thin/trunk/debian

ryan52-guest at alioth.debian.org ryan52-guest at alioth.debian.org
Sun Feb 22 09:59:18 UTC 2009 

Author: ryan52-guest
Date: 2009-02-22 09:59:18 +0000 (Sun, 22 Feb 2009)
New Revision: 3223

Added:
   packages-wip/thin/trunk/debian/thin.links
   packages-wip/thin/trunk/debian/thin.lintian-overrides
   packages-wip/thin/trunk/debian/thin1.8.dirs
   packages-wip/thin/trunk/debian/thin1.8.docs
   packages-wip/thin/trunk/debian/thin1.8.install
   packages-wip/thin/trunk/debian/thin1.8.manpages
Removed:
   packages-wip/thin/trunk/debian/dirs
   packages-wip/thin/trunk/debian/docs
   packages-wip/thin/trunk/debian/manpages
   packages-wip/thin/trunk/debian/thin.install
Modified:
   packages-wip/thin/trunk/debian/clean
   packages-wip/thin/trunk/debian/control
   packages-wip/thin/trunk/debian/gen_init.rb
   packages-wip/thin/trunk/debian/rules
Log:
move stuff to thin1.8 to allow for packaging with 1.9.1 in the future

Modified: packages-wip/thin/trunk/debian/clean
===================================================================
--- packages-wip/thin/trunk/debian/clean	2009-02-22 09:54:12 UTC (rev 3222)
+++ packages-wip/thin/trunk/debian/clean	2009-02-22 09:59:18 UTC (rev 3223)
@@ -1,2 +1,2 @@
-debian/thin.1
-debian/thin.init
+debian/thin1.8.1
+debian/thin1.8.init

Modified: packages-wip/thin/trunk/debian/control
===================================================================
--- packages-wip/thin/trunk/debian/control	2009-02-22 09:54:12 UTC (rev 3222)
+++ packages-wip/thin/trunk/debian/control	2009-02-22 09:59:18 UTC (rev 3223)
@@ -9,10 +9,10 @@
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/packages/thin/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/packages/thin/trunk/
 
-Package: thin
+Package: thin1.8
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, librack-ruby1.8, ruby1.8, libeventmachine-ruby1.8, libdaemons-ruby1.8
-Description: fast and very simple Ruby web server
+Description: fast and very simple Ruby web server (ruby 1.8 version)
  Thin is a Ruby web server that glues together 3 of the best Ruby
  libraries in web history:
    * the Mongrel parser, the root of Mongrel's speed and security
@@ -23,3 +23,21 @@
  Which makes it, with all humility, the most secure, stable, fast and
  extensible Ruby web server bundled in an easy to use package for your own
  pleasure.
+
+Package: thin
+Architecture: all
+Depends: ${misc:Depends}, thin1.8
+Description: fast and very simple Ruby web server (metapackage)
+ Thin is a Ruby web server that glues together 3 of the best Ruby
+ libraries in web history:
+   * the Mongrel parser, the root of Mongrel's speed and security
+   * Event Machine, a network I/O library with extremely high
+     scalability, performance and stability
+   * Rack, a minimal interface between webservers and Ruby frameworks
+ .
+ Which makes it, with all humility, the most secure, stable, fast and
+ extensible Ruby web server bundled in an easy to use package for your own
+ pleasure.
+ .
+ This is a metapackage which depends on the version of thin for the
+ current version of ruby. It also provides the /usr/bin/thin symlinks.

Deleted: packages-wip/thin/trunk/debian/dirs
===================================================================
--- packages-wip/thin/trunk/debian/dirs	2009-02-22 09:54:12 UTC (rev 3222)
+++ packages-wip/thin/trunk/debian/dirs	2009-02-22 09:59:18 UTC (rev 3223)
@@ -1 +0,0 @@
-etc/thin/

Deleted: packages-wip/thin/trunk/debian/docs
===================================================================
--- packages-wip/thin/trunk/debian/docs	2009-02-22 09:54:12 UTC (rev 3222)
+++ packages-wip/thin/trunk/debian/docs	2009-02-22 09:59:18 UTC (rev 3223)
@@ -1 +0,0 @@
-README

Modified: packages-wip/thin/trunk/debian/gen_init.rb
===================================================================
--- packages-wip/thin/trunk/debian/gen_init.rb	2009-02-22 09:54:12 UTC (rev 3222)
+++ packages-wip/thin/trunk/debian/gen_init.rb	2009-02-22 09:59:18 UTC (rev 3223)
@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
+#!/usr/bin/ruby
 
 require 'erb'
 
 class Command
   def self.script
-    "/usr/bin/thin"
+    "/usr/bin/thin1.8"
   end
 end
-INITD_PATH="/etc/init.d/thin"
+INITD_PATH="/etc/init.d/thin1.8"
 config_files_path="/etc/thin"
-File.open(File.dirname(__FILE__) + '/thin.init', 'w') do |f|
+File.open(File.dirname(__FILE__) + '/thin1.8.init', 'w') do |f|
   f << ERB.new(File.read("lib/thin/controllers/service.sh.erb")).result(binding)
 end

Deleted: packages-wip/thin/trunk/debian/manpages
===================================================================
--- packages-wip/thin/trunk/debian/manpages	2009-02-22 09:54:12 UTC (rev 3222)
+++ packages-wip/thin/trunk/debian/manpages	2009-02-22 09:59:18 UTC (rev 3223)
@@ -1 +0,0 @@
-debian/thin.1

Modified: packages-wip/thin/trunk/debian/rules
===================================================================
--- packages-wip/thin/trunk/debian/rules	2009-02-22 09:54:12 UTC (rev 3222)
+++ packages-wip/thin/trunk/debian/rules	2009-02-22 09:59:18 UTC (rev 3223)
@@ -6,15 +6,22 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_RUBY_SETUP_CMD=./ext/thin_parser/extconf.rb
+DEB_RUBY_REAL_LIB_PACKAGES=thin1.8
 
-build/thin::
+build/thin1.8::
 	ruby ./debian/gen_init.rb
-	help2man -n "fast and very simple Ruby web server" ./bin/thin >debian/thin.1
+	help2man -n "fast and very simple Ruby web server" ./bin/thin >debian/thin1.8.1
 
 # we don't want to install this file, but we do want to use it
 
-install/thin::
+install/thin1.8::
 	[ -f ./service.sh.erb ] || mv ./lib/thin/controllers/service.sh.erb ./service.sh.erb
+	mv bin/thin bin/thin1.8
 
-binary/thin::
+binary/thin1.8::
 	[ -f ./lib/thin/controllers/service.sh.erb ] || mv ./service.sh.erb ./lib/thin/controllers/service.sh.erb
+	mv bin/thin1.8 bin/thin
+
+# err, what?
+install/thin::
+	rm -fr debian/thin/usr/lib/

Deleted: packages-wip/thin/trunk/debian/thin.install
===================================================================
--- packages-wip/thin/trunk/debian/thin.install	2009-02-22 09:54:12 UTC (rev 3222)
+++ packages-wip/thin/trunk/debian/thin.install	2009-02-22 09:59:18 UTC (rev 3223)
@@ -1,2 +0,0 @@
-lib/* usr/lib/ruby/1.8/
-bin/* usr/bin/

Added: packages-wip/thin/trunk/debian/thin.links
===================================================================
--- packages-wip/thin/trunk/debian/thin.links	                        (rev 0)
+++ packages-wip/thin/trunk/debian/thin.links	2009-02-22 09:59:18 UTC (rev 3223)
@@ -0,0 +1,3 @@
+/usr/share/man/man1/thin1.8.1.gz /usr/share/man/man1/thin.1.gz
+/usr/bin/thin1.8 /usr/bin/thin
+/etc/init.d/thin1.8 /etc/init.d/thin


Property changes on: packages-wip/thin/trunk/debian/thin.links
___________________________________________________________________
Name: svn:mergeinfo
   + 

Added: packages-wip/thin/trunk/debian/thin.lintian-overrides
===================================================================
--- packages-wip/thin/trunk/debian/thin.lintian-overrides	                        (rev 0)
+++ packages-wip/thin/trunk/debian/thin.lintian-overrides	2009-02-22 09:59:18 UTC (rev 3223)
@@ -0,0 +1 @@
+thin: script-in-etc-init.d-not-registered-via-update-rc.d

Copied: packages-wip/thin/trunk/debian/thin1.8.dirs (from rev 3180, packages-wip/thin/trunk/debian/dirs)
===================================================================
--- packages-wip/thin/trunk/debian/thin1.8.dirs	                        (rev 0)
+++ packages-wip/thin/trunk/debian/thin1.8.dirs	2009-02-22 09:59:18 UTC (rev 3223)
@@ -0,0 +1 @@
+etc/thin/


Property changes on: packages-wip/thin/trunk/debian/thin1.8.dirs
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: packages-wip/thin/trunk/debian/thin1.8.docs (from rev 3180, packages-wip/thin/trunk/debian/docs)
===================================================================
--- packages-wip/thin/trunk/debian/thin1.8.docs	                        (rev 0)
+++ packages-wip/thin/trunk/debian/thin1.8.docs	2009-02-22 09:59:18 UTC (rev 3223)
@@ -0,0 +1 @@
+README


Property changes on: packages-wip/thin/trunk/debian/thin1.8.docs
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: packages-wip/thin/trunk/debian/thin1.8.install (from rev 3180, packages-wip/thin/trunk/debian/thin.install)
===================================================================
--- packages-wip/thin/trunk/debian/thin1.8.install	                        (rev 0)
+++ packages-wip/thin/trunk/debian/thin1.8.install	2009-02-22 09:59:18 UTC (rev 3223)
@@ -0,0 +1,2 @@
+lib/* usr/lib/ruby/1.8/
+bin/* usr/bin/


Property changes on: packages-wip/thin/trunk/debian/thin1.8.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: packages-wip/thin/trunk/debian/thin1.8.manpages (from rev 3180, packages-wip/thin/trunk/debian/manpages)
===================================================================
--- packages-wip/thin/trunk/debian/thin1.8.manpages	                        (rev 0)
+++ packages-wip/thin/trunk/debian/thin1.8.manpages	2009-02-22 09:59:18 UTC (rev 3223)
@@ -0,0 +1 @@
+debian/thin1.8.1


Property changes on: packages-wip/thin/trunk/debian/thin1.8.manpages
___________________________________________________________________
Name: svn:mergeinfo
   +

More information about the Pkg-ruby-extras-commits mailing list