[DRE-commits] r3772 - in packages-wip/sinatra/trunk: . debian debian/patches
Laurent VALLAR
val-guest at alioth.debian.org
Tue Jul 7 08:50:27 UTC 2009
Author: val-guest
Date: 2009-07-07 08:50:26 +0000 (Tue, 07 Jul 2009)
New Revision: 3772
Added:
packages-wip/sinatra/trunk/debian/
packages-wip/sinatra/trunk/debian/changelog
packages-wip/sinatra/trunk/debian/compat
packages-wip/sinatra/trunk/debian/control
packages-wip/sinatra/trunk/debian/copyright
packages-wip/sinatra/trunk/debian/patches/
packages-wip/sinatra/trunk/debian/patches/01-main-run-fix.patch
packages-wip/sinatra/trunk/debian/patches/02-base-image-path-fix.patch
packages-wip/sinatra/trunk/debian/patches/03-base-in-file-template-fix.patch
packages-wip/sinatra/trunk/debian/rules
packages-wip/sinatra/trunk/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: packages-wip/sinatra/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: packages-wip/sinatra/trunk/debian/changelog
===================================================================
--- packages-wip/sinatra/trunk/debian/changelog (rev 0)
+++ packages-wip/sinatra/trunk/debian/changelog 2009-07-07 08:50:26 UTC (rev 3772)
@@ -0,0 +1,10 @@
+sinatra (0.9.3-1) unstable; urgency=low
+
+ * Initial release (Closes: #534557).
+ * Provide patch to fix :run default bad value on Sinatra applications,
+ see https://sinatra.lighthouseapp.com/projects/9779-sinatra/tickets/249.
+ * Provide patch to fix in file template support, see
+ https://sinatra.lighthouseapp.com/projects/9779-sinatra/tickets/254
+ * Move images from library path and provide patch to fix path in code.
+
+ -- Laurent Vallar <val at zbla.net> Wed, 24 Jun 2009 14:13:24 +0200
Added: packages-wip/sinatra/trunk/debian/compat
===================================================================
--- packages-wip/sinatra/trunk/debian/compat (rev 0)
+++ packages-wip/sinatra/trunk/debian/compat 2009-07-07 08:50:26 UTC (rev 3772)
@@ -0,0 +1 @@
+5
Added: packages-wip/sinatra/trunk/debian/control
===================================================================
--- packages-wip/sinatra/trunk/debian/control (rev 0)
+++ packages-wip/sinatra/trunk/debian/control 2009-07-07 08:50:26 UTC (rev 3772)
@@ -0,0 +1,53 @@
+Source: sinatra
+Section: libs
+Priority: extra
+Maintainer: Laurent Vallar <val at zbla.net>
+Standards-Version: 3.8.2
+Build-Depends: cdbs, debhelper (>= 5.0.37), ruby-pkg-tools, libsetup-ruby1.8
+Build-Depends-Indep: ruby1.8, rdoc
+Homepage: http://www.sinatrarb.com/
+
+Package: libsinatra-ruby1.8
+Architecture: all
+Depends: ${misc:Depends}, ruby1.8, librack-ruby1.8
+Suggests: mongrel, thin1.8
+Description: Ruby web-development dressed in a DSL
+ Sinatra is an open source web framework for Ruby programming language.
+ It provides simple Domain Specific Language (DSL) for defining RESTful
+ HTTP actions, and then defining how the application is going to respond
+ to them.
+ .
+ This framework is lighweight and uses Rack which is a web server
+ interface developed to run many Ruby frameworks using the same stack.
+
+Package: libsinatra-ruby
+Architecture: all
+Depends: ${misc:Depends}, libsinatra-ruby1.8
+Description: Ruby web-development dressed in a DSL
+ Sinatra is an open source web framework for Ruby programming language.
+ It provides simple Domain Specific Language (DSL) for defining RESTful
+ HTTP actions, and then defining how the application is going to respond
+ to them.
+ .
+ This framework is lighweight and uses Rack which is a web server
+ interface developed to run many Ruby frameworks using the same stack.
+ .
+ This is a dummy package depending on the library for the current default
+ version of Ruby.
+
+Package: libsinatra-ruby-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Ruby web-development dressed in a DSL
+ Sinatra is an open source web framework for Ruby programming language.
+ It provides simple Domain Specific Language (DSL) for defining RESTful
+ HTTP actions, and then defining how the application is going to respond
+ to them.
+ .
+ This framework is lighweight and uses Rack which is a web server
+ interface developed to run many Ruby frameworks using the same stack.
+ .
+ This is the documentation package, with upstream documentation, as well as
+ generated rdoc.
+
Added: packages-wip/sinatra/trunk/debian/copyright
===================================================================
--- packages-wip/sinatra/trunk/debian/copyright (rev 0)
+++ packages-wip/sinatra/trunk/debian/copyright 2009-07-07 08:50:26 UTC (rev 3772)
@@ -0,0 +1,37 @@
+This package was debianized by Laurent Vallar <val at zbla.net>
+on Wed, 24 Jun 2009 14:13:24 +0200
+
+The current Debian maintainer is Laurent Vallar <val at zbla.net>.
+
+It was downloaded from http://github.com/sinatra/sinatra/downloads.
+Upstream Authors: Blake Mizerany <blake.mizerany at gmail.com>,
+Adam Wiggins <adam at heroku.com>, Chris Wanstrath <chris at github.com>,
+PJ Hyett <pj at github.com> and many others (see AUTHORS file).
+
+Copyright 2007-2009 Blake Mizerany <blake.mizerany at gmail.com>
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+The Debian packaging is (C) 2009, Laurent Vallar <val at zbla.net> and
+is licensed under the GPL version 2.
+
+On Debian systems, the complete text of the GNU General Public
+License, version 2, can be found in /usr/share/common-licenses/GPL-2.
Added: packages-wip/sinatra/trunk/debian/patches/01-main-run-fix.patch
===================================================================
--- packages-wip/sinatra/trunk/debian/patches/01-main-run-fix.patch (rev 0)
+++ packages-wip/sinatra/trunk/debian/patches/01-main-run-fix.patch 2009-07-07 08:50:26 UTC (rev 3772)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## Description: fix :run not set properly in sinatra/main.rb
+## Origin: vendor
+## Bug: https://sinatra.lighthouseapp.com/projects/9779-sinatra/tickets/249
+## Author: Laurent Vallar <val at zbla.net>
+
+ at DPATCH@
+diff -NurpPd lib/sinatra/main.rb.orig lib/sinatra/main.rb
+--- lib/sinatra/main.rb.orig 2009-06-24 16:24:11.000000000 +0200
++++ lib/sinatra/main.rb 2009-06-08 09:24:13.000000000 +0200
+@@ -6,7 +6,7 @@ module Sinatra
+
+ # we assume that the first file that requires 'sinatra' is the
+ # app_file. all other path related options are calculated based
+ # on this path by default.
+- set :app_file, caller_files.first || $0
++ set :app_file, caller_files.last || $0
+
+ set :run, Proc.new { $0 == app_file }
+
Added: packages-wip/sinatra/trunk/debian/patches/02-base-image-path-fix.patch
===================================================================
--- packages-wip/sinatra/trunk/debian/patches/02-base-image-path-fix.patch (rev 0)
+++ packages-wip/sinatra/trunk/debian/patches/02-base-image-path-fix.patch 2009-07-07 08:50:26 UTC (rev 3772)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## Description: fix web framework images location string
+## Origin: vendor
+## Forwarded: not-needed
+## Author: Laurent Vallar <val at zbla.net>
+
+ at DPATCH@
+diff -NurpPd lib/sinatra/base.rb.orig lib/sinatra/base.rb
+--- lib/sinatra/base.rb.orig 2009-06-24 16:54:25.000000000 +0200
++++ lib/sinatra/base.rb 2009-06-25 00:52:19.058224473 +0200
+@@ -1013,7 +1013,7 @@ module Sinatra
+
+ configure :development do
+ get '/__sinatra__/:image.png' do
+- filename = File.dirname(__FILE__) + "/images/#{params[:image]}.png"
++ filename = "/usr/share/pixmaps/sinatra-error-#{params[:image]}.png"
+ content_type :png
+ send_file filename
+ end
Added: packages-wip/sinatra/trunk/debian/patches/03-base-in-file-template-fix.patch
===================================================================
--- packages-wip/sinatra/trunk/debian/patches/03-base-in-file-template-fix.patch (rev 0)
+++ packages-wip/sinatra/trunk/debian/patches/03-base-in-file-template-fix.patch 2009-07-07 08:50:26 UTC (rev 3772)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## Description: fix in file templates support
+## Origin: vendor
+## Forwarded: not-needed
+## Author: Laurent Vallar <val at zbla.net>
+
+ at DPATCH@
+diff -NurpPd lib/sinatra/base.rb.orig lib/sinatra/base.rb
+--- lib/sinatra/base.rb.orig 2009-06-08 09:24:13.000000000 +0200
++++ lib/sinatra/base.rb 2009-06-30 13:14:24.000000000 +0200
+@@ -674,7 +674,7 @@ module Sinatra
+ # Load embeded templates from the file; uses the caller's __FILE__
+ # when no file is specified.
+ def use_in_file_templates!(file=nil)
+- file ||= caller_files.first
++ file ||= caller_files.last
+ app, data =
+ ::IO.read(file).split(/^__END__$/, 2) rescue nil
+
Added: packages-wip/sinatra/trunk/debian/rules
===================================================================
--- packages-wip/sinatra/trunk/debian/rules (rev 0)
+++ packages-wip/sinatra/trunk/debian/rules 2009-07-07 08:50:26 UTC (rev 3772)
@@ -0,0 +1,33 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
+
+build/libsinatra-ruby-doc::
+ rdoc \
+ --fmt html \
+ --charset utf8 \
+ --line-numbers \
+ --inline-source \
+ --title 'Sinatra API Documentation' \
+ --main README.rdoc \
+ --op html \
+ README.rdoc LICENSE AUTHORS CHANGES lib
+
+install/libsinatra-ruby-doc::
+ mkdir -p debian/libsinatra-ruby-doc/usr/share/doc/sinatra
+ cp -r html debian/libsinatra-ruby-doc/usr/share/doc/sinatra
+
+install/libsinatra-ruby1.8::
+ # remove images from ruby library path
+ rm -r debian/libsinatra-ruby1.8/usr/lib/ruby/1.8/sinatra/images
+ # images install (see debian patch 02-base-image-path-fix.patch)
+ mkdir -p debian/libsinatra-ruby1.8/usr/share/pixmaps
+ cp lib/sinatra/images/404.png \
+ debian/libsinatra-ruby1.8/usr/share/pixmaps/sinatra-error-404.png
+ cp lib/sinatra/images/500.png \
+ debian/libsinatra-ruby1.8/usr/share/pixmaps/sinatra-error-500.png
+
+clean::
+ if [ -d html ]; then rm -r html; fi
Property changes on: packages-wip/sinatra/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: packages-wip/sinatra/trunk/debian/watch
===================================================================
--- packages-wip/sinatra/trunk/debian/watch (rev 0)
+++ packages-wip/sinatra/trunk/debian/watch 2009-07-07 08:50:26 UTC (rev 3772)
@@ -0,0 +1,2 @@
+version=3
+http://github.com/sinatra/sinatra/tarball/(.*)
More information about the Pkg-ruby-extras-commits
mailing list