[DRE-commits] r3981 - in trunk/libsinatra-ruby/debian: . patches

[Laurent VALLAR]

Author: val-guest
Date: 2009-08-25 07:58:41 +0000 (Tue, 25 Aug 2009)
New Revision: 3981

Added:
   trunk/libsinatra-ruby/debian/patches/01-base-image-path-fix.patch
Removed:
   trunk/libsinatra-ruby/debian/patches/01-main-run-fix.patch
   trunk/libsinatra-ruby/debian/patches/02-base-image-path-fix.patch
   trunk/libsinatra-ruby/debian/patches/03-base-in-file-template-fix.patch
Modified:
   trunk/libsinatra-ruby/debian/changelog
Log:
New upstream release, remove uneeded patches.

Modified: trunk/libsinatra-ruby/debian/changelog
===================================================================
--- trunk/libsinatra-ruby/debian/changelog	2009-08-25 00:20:28 UTC (rev 3980)
+++ trunk/libsinatra-ruby/debian/changelog	2009-08-25 07:58:41 UTC (rev 3981)
@@ -1,8 +1,10 @@
-libsinatra-ruby (0.9.3-2) UNRELEASED; urgency=low
+libsinatra-ruby (0.9.4-1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * New uptstream release.
+  * Remove patches associated to sinatra's lighthouseapp tickets #249 and
+    #254, bugs are now fixed upstream.
 
- -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Fri, 21 Aug 2009 21:07:33 +0200
+ -- Laurent Vallar <val at zbla.net>  Mon, 24 Aug 2009 16:46:00 +0200
 
 libsinatra-ruby (0.9.3-1) unstable; urgency=low
 

Copied: trunk/libsinatra-ruby/debian/patches/01-base-image-path-fix.patch (from rev 3980, trunk/libsinatra-ruby/debian/patches/02-base-image-path-fix.patch)
===================================================================
--- trunk/libsinatra-ruby/debian/patches/01-base-image-path-fix.patch	                        (rev 0)
+++ trunk/libsinatra-ruby/debian/patches/01-base-image-path-fix.patch	2009-08-25 07:58:41 UTC (rev 3981)
@@ -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


Property changes on: trunk/libsinatra-ruby/debian/patches/01-base-image-path-fix.patch
___________________________________________________________________
Added: svn:mergeinfo
   + 

Deleted: trunk/libsinatra-ruby/debian/patches/01-main-run-fix.patch
===================================================================
--- trunk/libsinatra-ruby/debian/patches/01-main-run-fix.patch	2009-08-25 00:20:28 UTC (rev 3980)
+++ trunk/libsinatra-ruby/debian/patches/01-main-run-fix.patch	2009-08-25 07:58:41 UTC (rev 3981)
@@ -1,21 +0,0 @@
-#! /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 }
- 

Deleted: trunk/libsinatra-ruby/debian/patches/02-base-image-path-fix.patch
===================================================================
--- trunk/libsinatra-ruby/debian/patches/02-base-image-path-fix.patch	2009-08-25 00:20:28 UTC (rev 3980)
+++ trunk/libsinatra-ruby/debian/patches/02-base-image-path-fix.patch	2009-08-25 07:58:41 UTC (rev 3981)
@@ -1,20 +0,0 @@
-#! /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

Deleted: trunk/libsinatra-ruby/debian/patches/03-base-in-file-template-fix.patch
===================================================================
--- trunk/libsinatra-ruby/debian/patches/03-base-in-file-template-fix.patch	2009-08-25 00:20:28 UTC (rev 3980)
+++ trunk/libsinatra-ruby/debian/patches/03-base-in-file-template-fix.patch	2009-08-25 07:58:41 UTC (rev 3981)
@@ -1,20 +0,0 @@
-#! /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
-