--- merb-1.0.12+dfsg.orig/debian/README.Debian
+++ merb-1.0.12+dfsg/debian/README.Debian
@@ -0,0 +1,18 @@
+merb for Debian
+---------------
+
+The Merb packages provide just enough of Merb to run an existing application
+but not the components required to generate a new application for development.
+
+This package patches merb-core to allow load_dependency to 'require' other 
+libraries, rather than trying to load them with Gem. This resolves ticket
+# 1281, on the Merb ticket system.
+
+  https://merb.lighthouseapp.com/projects/7433-merb/tickets/1281
+
+For more information about the libraries provided, see the RDoc documentation
+in libmerb-ruby-doc. For more information about Merb, visit its homepage at:
+
+  http://www.merbivore.com/
+
+ -- Joshua Timberman <joshua@opscode.com>  Mon, 27 Jul 2009 23:38:37 -0600
--- merb-1.0.12+dfsg.orig/debian/merb.1
+++ merb-1.0.12+dfsg/debian/merb.1
@@ -0,0 +1,108 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man.
+.TH MERB "1" "July 2009" "merb 1.0.12" "User Commands"
+.SH NAME
+merb \- Start a merb application.
+.SH SYNOPSIS
+.B merb
+[\fIuGdcIpPhmailLerkKX\fR] [\fIargument\fR]
+.SH DESCRIPTION
+If no flags are given, Merb starts in the foreground on port 4000.
+.TP
+\fB\-u\fR, \fB\-\-user\fR USER
+This flag is for having merb run as a user other than the one currently logged in. Note: if you set this you must also provide a \fB\-\-group\fR option for it to take effect.
+.TP
+\fB\-G\fR, \fB\-\-group\fR GROUP
+This flag is for having merb run as a group other than the one currently logged in. Note: if you set this you must also provide a \fB\-\-user\fR option for it to take effect.
+.TP
+\fB\-d\fR, \fB\-\-daemonize\fR
+This will run a single merb in the background.
+.TP
+\fB\-N\fR, \fB\-\-no\-daemonize\fR
+This will allow you to run a cluster in console mode
+.TP
+\fB\-c\fR, \fB\-\-cluster\-nodes\fR NUM_MERBS
+Number of merb daemons to run.
+.TP
+\fB\-I\fR, \fB\-\-init\-file\fR FILE
+File to use for initialization on load, defaults to config/init.rb
+.TP
+\fB\-p\fR, \fB\-\-port\fR PORTNUM
+Port to run merb on, defaults to 4000.
+.TP
+\fB\-o\fR, \fB\-\-socket\-file\fR FILE
+Socket file to run merb on, defaults to [Merb.root]/log/merb.sock. This is for web servers, like thin, that use sockets.Specify this *only* if you *must*.
+.TP
+\fB\-s\fR, \fB\-\-socket\fR SOCKNUM
+Socket number to run merb on, defaults to 0.
+.TP
+\fB\-n\fR, \fB\-\-name\fR NAME
+Set the name of the application. This is used in the process title and log file names.
+.TP
+\fB\-P\fR, \fB\-\-pid\fR PIDFILE
+PID file, defaults to [Merb.root]/log/merb.main.pid for the master process and[Merb.root]/log/merb.[port number].pid for worker processes. For clusters, use %s to specify where in the file merb should place the port number. For instance: \fB\-P\fR myapp.%s.pid
+.TP
+\fB\-h\fR, \fB\-\-host\fR HOSTNAME
+Host to bind to (default is 0.0.0.0).
+.HP
+\fB\-m\fR, \fB\-\-merb\-root\fR /path/to/approot The path to the Merb.root for the app you want to run (default is current working directory).
+.TP
+\fB\-a\fR, \fB\-\-adapter\fR ADAPTER
+The rack adapter to use to run merb (default is mongrel)[mongrel, emongrel, thin, ebb, fastcgi, webrick]
+.TP
+\fB\-R\fR, \fB\-\-rackup\fR FILE
+Load an alternate Rack config file (default is config/rack.rb)
+.TP
+\fB\-i\fR, \fB\-\-irb\-console\fR
+This flag will start merb in irb console mode. All your models and other classes will be available for you in an irb session.
+.TP
+\fB\-S\fR, \fB\-\-sandbox\fR
+This flag will enable a sandboxed irb console. If your ORM supports transactions, all edits will be rolled back on exit.
+.TP
+\fB\-l\fR, \fB\-\-log\-level\fR LEVEL
+Log levels can be set to any of these options: debug < info < warn < error < fatal (default is info)
+.TP
+\fB\-L\fR, \fB\-\-log\fR LOGFILE
+A string representing the logfile to use. Defaults to [Merb.root]/log/merb.[main].log for the master process and [Merb.root]/log/merb[port number].logfor worker processes
+.TP
+\fB\-e\fR, \fB\-\-environment\fR STRING
+Environment to run Merb under [development, production, testing] (default is development)
+.HP
+\fB\-r\fR ['RUBY CODE'| FULL_SCRIPT_PATH]
+.TP
+\fB\-\-script\-runner\fR
+Command\-line option to run scripts and/or code in the merb app.
+.TP
+\fB\-K\fR, \fB\-\-graceful\fR PORT or all
+Gracefully kill one merb proceses by port number.  Use merb \fB\-K\fR all to gracefully kill all merbs.
+.TP
+\fB\-k\fR, \fB\-\-kill\fR PORT
+Force kill one merb worker by port number. This will cause the worker tobe respawned.
+.TP
+\fB\-\-fast\-deploy\fR
+Reload the code, but not yourinit.rb or gems
+.TP
+\fB\-X\fR, \fB\-\-mutex\fR on/off
+This flag is for turning the mutex lock on and off.
+.TP
+\fB\-D\fR, \fB\-\-debugger\fR
+Run merb using rDebug.
+.TP
+\fB\-V\fR, \fB\-\-verbose\fR
+Print extra information
+.TP
+\fB\-C\fR, \fB\-\-console\-trap\fR
+Enter an irb console on ^C
+.TP
+\-?, \fB\-H\fR, \fB\-\-help\fR
+Show this help message
+.SH "SEE ALSO"
+Documentation for Merb is maintained in RDoc via the package libmerb-ruby-doc, or available on the Merb web site, http://www.merbivore.com/
+.PP
+For getting started instructions, see /usr/share/doc/merb-core/README.Debian.
+.SH AUTHOR
+The upstream author of Merb is Yehuda Katz <ykatz@engineyard.com>. 
+This manual page was written by Joshua Timberman <joshua@opscode.com> with help2man
+for the Debian and Ubuntu projects (but may be used by others). Permission is granted
+to copy, modify, merge, publish, and distribute this document under the terms of the
+MIT license.
+
--- merb-1.0.12+dfsg.orig/debian/compat
+++ merb-1.0.12+dfsg/debian/compat
@@ -0,0 +1 @@
+7
--- merb-1.0.12+dfsg.orig/debian/merb-slice.1
+++ merb-1.0.12+dfsg/debian/merb-slice.1
@@ -0,0 +1,16 @@
+.TH MERB-SLICE "1" "July 2009"
+.SH NAME
+merb-slice \- Start a Merb slice.
+.SH SYNOPSIS
+.B merb-slice
+.SH DESCRIPTION
+The merb-slice command starts a Merb application as a slice.
+.SH SEE ALSO
+.br
+Documentation for Merb is maintained in RDoc via the package libmerb-ruby-doc, or available on the Merb web site, http://www.merbivore.com/
+.SH AUTHOR
+The upstream author of Merb is Yehuda Katz <ykatz@engineyard.com>. 
+This manual page was written by Joshua Timberman <joshua@opscode.com> with help2man
+for the Debian and Ubuntu projects (but may be used by others). Permission is granted
+to copy, modify, merge, publish, and distribute this document under the terms of the
+MIT license.
--- merb-1.0.12+dfsg.orig/debian/docs
+++ merb-1.0.12+dfsg/debian/docs
@@ -0,0 +1,2 @@
+README
+TODO
--- merb-1.0.12+dfsg.orig/debian/merb-core.manpages
+++ merb-1.0.12+dfsg/debian/merb-core.manpages
@@ -0,0 +1 @@
+debian/merb.1
--- merb-1.0.12+dfsg.orig/debian/changelog
+++ merb-1.0.12+dfsg/debian/changelog
@@ -0,0 +1,33 @@
+merb (1.0.12+dfsg-4) unstable; urgency=low
+
+  * Add merb-param-protection package.
+  * Merb depends on RubyGems to enable library dependency plugin mechanism.
+
+ -- Joshua Timberman <joshua@opscode.com>  Wed, 17 Mar 2010 19:38:55 -0600
+
+merb (1.0.12+dfsg-3) unstable; urgency=low
+
+  [ Paul van Tilburg ]
+  * debian/watch: changed the regexp so that it makes PET happy too.
+
+  [ Mike Castleman ]
+  * debian/copyright: clarify that we don't ship the allison library
+    (closes: #574142)
+
+ -- Mike Castleman <m@mlcastle.net>  Wed, 17 Mar 2010 03:07:17 -0400
+
+merb (1.0.12+dfsg-2) unstable; urgency=low
+
+   * Packaging approved for Ubuntu, updating for Debian.
+   * Rename merb-slices binary from slice to merb-slice.
+   * Repack upstream tarball, should not affect Debian packaging but noted:
+     + Replaced upstream empty LICENSE file with MIT license
+     + Removed object files which are part of the webrat spec testing.
+
+ -- Joshua Timberman <joshua@opscode.com>  Thu, 27 Aug 2009 08:56:09 -0600
+
+merb (1.0.12+dfsg-1) unstable; urgency=low
+
+   * Initial release (Closes: #538928)
+
+ -- Joshua Timberman <joshua@opscode.com>  Mon, 27 Jul 2009 23:38:37 -0600
--- merb-1.0.12+dfsg.orig/debian/merb-slices.manpages
+++ merb-1.0.12+dfsg/debian/merb-slices.manpages
@@ -0,0 +1 @@
+debian/merb-slice.1
--- merb-1.0.12+dfsg.orig/debian/repack.sh
+++ merb-1.0.12+dfsg/debian/repack.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+# Repackage upstream source to exclude non-distributable files
+# should be called as "repack.sh --upstream-source <ver> <downloaded file>
+# (for example, via uscan)
+
+set -e
+set -u
+
+VER="$2+dfsg"
+FILE="$3"
+PKG=`dpkg-parsechangelog|grep ^Source:|sed 's/^Source: //'`
+
+REPACK_DIR="$PKG-$VER.orig" # DevRef § 6.7.8.2
+
+echo -e "\nRepackaging $FILE\n"
+
+DIR=`mktemp -d ./tmpRepackXXXXXX`
+trap "rm -rf \"$DIR\"" QUIT INT EXIT
+
+# Create an extra directory to cope with rootless tarballs
+UP_BASE="$DIR/unpack"
+mkdir "$UP_BASE"
+tar xzf "$FILE" -C "$UP_BASE"
+
+if [ `ls -1 "$UP_BASE" | wc -l` -eq 1 ]; then
+        # Tarball does contain a root directory
+        UP_BASE="$UP_BASE/`ls -1 "$UP_BASE"`"
+fi
+
+## Remove undistributable files from source.
+rm -vfr $UP_BASE/merb-core/docs/merb-core-call-stack-diagram.pdf
+rm -vfr $UP_BASE/merb-core/spec/
+rm -vfr $UP_BASE/merb-core/spec10/
+rm -vfr $UP_BASE/merb-core/tools/allison-2.0.2/
+## End
+
+mv "$UP_BASE" "$DIR/$REPACK_DIR"
+
+# Using a pipe hides tar errors!
+tar cfC "$DIR/repacked.tar" "$DIR" "$REPACK_DIR"
+gzip -9 < "$DIR/repacked.tar" > "$DIR/repacked.tar.gz"
+FILE="../${PKG}_${VER}.orig.tar.gz"
+mv "$DIR/repacked.tar.gz" "$FILE"
+
+echo "*** $FILE repackaged"
--- merb-1.0.12+dfsg.orig/debian/dirs
+++ merb-1.0.12+dfsg/debian/dirs
@@ -0,0 +1 @@
+usr/bin
--- merb-1.0.12+dfsg.orig/debian/control
+++ merb-1.0.12+dfsg/debian/control
@@ -0,0 +1,220 @@
+Source: merb
+Section: ruby
+Priority: extra
+Maintainer: Joshua Timberman <joshua@opscode.com>
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>, Joshua Timberman <joshua@opscode.com>
+Build-Depends: cdbs, debhelper (>= 7), ruby-pkg-tools (>= 0.14), quilt
+Build-Depends-Indep: ruby1.8, rake
+Standards-Version: 3.8.2
+Homepage: http://merbivore.com
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/merb/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/merb/
+
+Package: merb-core
+Architecture: all
+Depends: ${misc:Depends}, ${shlibs:Depends}, ruby1.8, libmerb-core-ruby1.8, rubygems1.8
+Suggests: libmerb-ruby-doc
+Description: Lightweight Ruby-based MVC framework for web development
+ Ruby-based MVC framework that is agnostic to ORM, JavaScript library,
+ and template languages. Merb is plugin-based, so the core is small and
+ well organized.
+ .
+ The Merb packages provide just enough to run a basic Merb application.
+ .
+ This package contains the merb binary and associated files.
+
+Package: merb-slices
+Architecture: all
+Depends: ${misc:Depends}, ruby1.8, libmerb-slices-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Merb plugin to modularize an application by creating 'slices'
+ Usually these slices are reusable extractions from the main application.
+ A module is set up to serve as a namespace for controller, models, helpers,
+ etc.
+ .
+ Installing this package will provide the capability to run a Merb application
+ slice.
+ .
+ This package contains the merb-slice binary and associated files.
+
+Package: libmerb-core-ruby
+Architecture: all
+Depends: ${misc:Depends}, libmerb-core-ruby1.8, rubygems
+Suggests: libmerb-ruby-doc
+Description: Core libraries for the Merb MVC framework
+ Ruby-based MVC framework that is agnostic to ORM, JavaScript library,
+ and template languages. Merb is plugin-based, so the core is small and
+ well organized.
+ .
+ This package is a dependency package, which depends on the package
+ containing actual Ruby merb-core libraries for the default Ruby version
+ (currently 1.8).
+
+Package: libmerb-core-ruby1.8
+Architecture: all
+Depends: ${misc:Depends}, ruby1.8, libextlib-ruby (>=0.9.8), liberubis-ruby (>=2.6.2), rake, libjson-ruby, librack-ruby, libmime-types-ruby, rubygems1.8
+Suggests: libmerb-ruby-doc
+Description: Core Ruby 1.8 libraries for the Merb MVC framework
+ Ruby-based MVC framework that is agnostic to ORM, JavaScript library,
+ and template languages. Merb is plugin-based, so the core is small and
+ well organized.
+ .
+ This package provides the core libraries that provide enough of Merb 
+ to run an application.
+ .
+ This package contains merb-core libraries for Ruby 1.8.
+
+Package: libmerb-assets-ruby
+Architecture: all
+Depends: ${misc:Depends}, libmerb-assets-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Plugin library for Merb that provides helpers for assets
+ Provides extra functionality related to assets:
+  * Assets bundling.
+  * Assets hosts.
+  * Helpers to add asset links to views.
+  * Deployment-time assets processing (for instance, with YUI Compressor).
+ .
+ This package is a dependency package, which depends on the package
+ containing actual Ruby merb-assets libraries for the default Ruby version
+ (currently 1.8).
+
+Package: libmerb-assets-ruby1.8
+Architecture: all
+Depends: ${misc:Depends}, libmerb-core-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Ruby 1.8 plugin library for Merb that provides helpers for assets
+ Provides extra functionality related to assets:
+  * Assets bundling.
+  * Assets hosts.
+  * Helpers to add asset links to views.
+  * Deployment-time assets processing (for instance, with YUI Compressor).
+ .
+ This package contains the merb-assets libraries for Ruby 1.8.
+
+Package: libmerb-haml-ruby
+Architecture: all
+Depends: ${misc:Depends}, libmerb-haml-ruby1.8
+Suggests: libmerb-ruby-doc, libhaml-ruby-doc
+Description: Plugin library for Merb that provides access to libhaml-ruby
+ Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or 
+ XML that's designed to express the structure of XHTML or XML documents 
+ in a non-repetitive, elegant, easy way, using indentation rather than
+ closing tags and allowing Ruby to be embedded with ease. It was originally
+ envisioned as a plugin for Ruby on Rails, but it can function as a 
+ stand-alone templating engine. 
+ .
+ This package is a dependency package, which depends on the package
+ containing actual Ruby merb-haml libraries for the default Ruby version
+ (currently 1.8).
+
+Package: libmerb-haml-ruby1.8
+Architecture: all
+Depends: ${misc:Depends}, libmerb-core-ruby1.8, libhaml-ruby1.8
+Suggests: libmerb-ruby-doc, libhaml-ruby-doc
+Description: Ruby 1.8 library for Merb that provides access to libhaml-ruby
+ Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or 
+ XML that's designed to express the structure of XHTML or XML documents 
+ in a non-repetitive, elegant, easy way, using indentation rather than
+ closing tags and allowing Ruby to be embedded with ease. It was originally
+ envisioned as a plugin for Ruby on Rails, but it can function as a 
+ stand-alone templating engine. 
+ .
+ This package contains the merb-haml libraries for Ruby 1.8.
+
+Package: libmerb-helpers-ruby
+Architecture: all
+Depends: ${misc:Depends}, libmerb-helpers-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Plugin library for Merb that provides view helpers
+ This plugin provides the following helpers for your views:
+  * form_helpers
+  * date_time_helpers
+  * tag_helpers
+  * text_helpers
+ See the RDOC documentation and the package README for more information.
+ .
+ This package is a dependency package, which depends on the package
+ containing actual Ruby merb-helpers libraries for the default Ruby version
+ (currently 1.8).
+
+Package: libmerb-helpers-ruby1.8
+Architecture: all
+Depends: ${misc:Depends}, libmerb-core-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Ruby 1.8 library for Merb that provides view helpers
+ This plugin provides the following helpers for your views:
+  * form_helpers
+  * date_time_helpers
+  * tag_helpers
+  * text_helpers
+ See the RDOC documentation and the package README for more information.
+ .
+ This package contains the merb-helpers libraries for Ruby 1.8.
+
+Package: libmerb-slices-ruby
+Architecture: all
+Depends: ${misc:Depends}, libmerb-slices-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Library to support merb-slices application modularization
+ Usually these slices are reusable extractions from the main application.
+ A module is set up to serve as a namespace for controller, models, helpers,
+ etc.
+ .
+ This package is a dependency package, which depends on the package
+ containing actual Ruby merb-slices libraries for the default Ruby version
+ (currently 1.8).
+
+Package: libmerb-slices-ruby1.8
+Architecture: all
+Depends: ${misc:Depends}, libmerb-core-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Ruby 1.8 library to support merb-slices application modularization
+ Usually these slices are reusable extractions from the main application.
+ A module is set up to serve as a namespace for controller, models, helpers,
+ etc.
+ .
+ Installing this package will provide the capability to run a Merb application
+ slice.
+ .
+ This package contains the merb-slices libraries for Ruby 1.8.
+
+Package: libmerb-param-protection-ruby
+Architecture: all
+Depends: ${misc:Depends}, libmerb-param-protection-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Merb plugin with controller methods to filter parameters
+ Controller methods provided by this package:
+  * params_protected - removes ONLY those parameters explicitly specified.
+  * params_accessible - removes everything except what is explictly specified.
+  * log_params_filtered - scrubbed at log time.
+ See the RDOC documentation and the package README for more information.
+ .
+ This package is a dependency package, which depends on the package
+ containing actual Ruby merb-param-protection libraries for the default 
+ Ruby version (currently 1.8).
+
+Package: libmerb-param-protection-ruby1.8
+Architecture: all
+Depends: ${misc:Depends}, libmerb-core-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Merb plugin with controller methods to filter parameters
+ Controller methods provided by this package:
+  * params_protected - removes ONLY those parameters explicitly specified.
+  * params_accessible - removes everything except what is explictly specified.
+  * log_params_filtered - scrubbed at log time.
+ See the RDOC documentation and the package README for more information.
+ .
+ This package contains the merb-param-protection libraries for Ruby 1.8.
+
+Package: libmerb-ruby-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: ruby1.8
+Description: Documentation for Merb
+ Ruby-based MVC framework that is agnostic to ORM, JavaScript library,
+ and template languages. Merb is plugin-based, so the core is small and
+ well organized.
+ .
+ This package provides generated HTML documentation (rdoc) for Merb.
--- merb-1.0.12+dfsg.orig/debian/copyright
+++ merb-1.0.12+dfsg/debian/copyright
@@ -0,0 +1,195 @@
+This package was debianized by Joshua Timberman <joshua@opscode.com> on
+Mon, 27 Jul 2009 23:38:37 -0600.
+
+It was downloaded from <http://github.com/wycats/merb>
+
+Upstream Authors: Yehuda Katz <ykatz@engineyard.com>
+
+Copyright (c) 2008 Engine Yard Inc.
+
+    Merb is released under the MIT License.
+
+    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 Copyright (c) 2009 Opscode, Inc. and is licensed
+under the MIT License as above.
+
+./merb-core/tools/allison-2.0.2:
+    These files are not redistributable, as they are published under
+    the Academic Free License, which is apparently not DFSG-free (see:
+    http://lists.debian.org/debian-legal/2004/10/msg00237.html ). They
+    have been removed by the repack script and will not be in the
+    resulting package.
+
+./merb-core/spec/public/webrat/test_app/public/javascripts/jquery.js
+    Merb incorporates code modified from JQuery (http://jquery.com/) and is Copyright (c) John Resig.
+
+    JQuery is dual licensed under the MIT and GPL v2 licenses.
+    http://docs.jquery.com/License
+    Full text of the GPL is available in /usr/share/common-licenses/GPL-2
+    See above for the MIT license, as it is also used by Merb.
+
+./merb-cache/lib/merb-cache/stores/strategy/gzip_store.rb
+    Copyright (c) 2008 Tobias Lütke
+    Licnsed under MIT License
+
+./merb-cache/*
+    Copyright (c) 2008 Ben Burkert
+    Licnsed under MIT License
+
+./merb-param-protection/*
+    Copyright (c) 2008 Lance Carlson
+    Licensed under MIT License
+
+./merb-mailer/*
+    Copyright (c) 2008 Yehuda Katz
+    Licensed under MIT License
+
+./merb-action-args/*
+    Copyright (c) 2008 Yehuda Katz
+    Licensed under MIT License
+
+./merb-assets/*
+    Copyright (c) 2008 Ezra Zygmuntowicz
+    Licensed under MIT License
+
+./merb-gen/lib/generators/templates/application/merb_core/doc/rdoc/generators/template/merb/prototype.js
+    Copyright (c) 2005-2007 Sam Stephenson
+    Licensed under MIT License
+
+./merb-gen/lib/generators/templates/application/common/jquery.js
+    Copyright (c) 2009 John Resig
+    Dual licensed under the MIT and GPL licenses.
+
+./merb-gen/*
+    Copyright (c) 2008 Jonas Nicklas, Ezra Zygmuntowicz, the merb dev team
+    Licensed under MIT License
+
+./merb-haml/*
+    Copyright (c) 2008 Yehuda Katz
+    Licensed under MIT License
+
+./merb_datamapper/*
+    Copyright (c) 2007 Jason Toy
+    Licensed under MIT License
+
+./merb-exceptions/*
+    Copyright (c) 2008 New Bamboo
+    Licensed under MIT License
+
+./merb-auth/*
+    Copyright (c) 2008 Adam French, Daniel Neighman
+    Licensed under MIT License
+
+./merb-auth/merb-auth-core/lib/merb-auth-core/errors.rb
+    Copyright (c) 2007 Guy van den Berg
+    Copyright (c) 2008, 2009 DataMapper development team
+    This file comes from dm-validations plugin, from the DataMapper project.
+
+./merb-auth/merb-auth-core/*
+    Copyright (c) 2008 Adam French, Daniel Neighman
+    Licensed under MIT License
+
+./merb-auth/merb-auth-more/*
+    Copyright (c) 2008 Daniel Neighman
+
+    Some of the code in this plugin is based on Restful Merb::Authentication by Rick Olsen.
+    Copyright (c) 2005 Rick Olson
+    Licensed under MIT License
+
+./merb-core/tools/annotation_extract.rb
+./merb-core/tools/code_statistics.rb
+    Copyright (c) 2004-2008 David Heinemeier Hansson
+    Licensed under MIT License
+
+./merb-core/experimentation/simple_benches/hash_assoc.rb
+    Copyright (c) 2005 Jan Molic, Thomas Sawyer
+    Originally ported from OrderHash 2.0, Copyright (c) 2005 jan molic
+
+    Licensed under Ruby License, full text: http://www.ruby-lang.org/en/LICENSE.txt
+    Copying terms under the GPL: http://www.ruby-lang.org/en/COPYING.txt
+
+    Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
+    You can redistribute it and/or modify it under either the terms of the GPL
+    (see COPYING.txt file), or the conditions below:
+
+      1. You may make and give away verbatim copies of the source form of the
+         software without restriction, provided that you duplicate all of the
+         original copyright notices and associated disclaimers.
+
+      2. You may modify your copy of the software in any way, provided that
+         you do at least ONE of the following:
+
+           a) place your modifications in the Public Domain or otherwise
+              make them Freely Available, such as by posting said
+    	  modifications to Usenet or an equivalent medium, or by allowing
+    	  the author to include your modifications in the software.
+
+           b) use the modified software only within your corporation or
+              organization.
+
+           c) rename any non-standard executables so the names do not conflict
+    	  with standard executables, which must also be provided.
+
+           d) make other distribution arrangements with the author.
+
+      3. You may distribute the software in object code or executable
+         form, provided that you do at least ONE of the following:
+
+           a) distribute the executables and library files of the software,
+    	  together with instructions (in the manual page or equivalent)
+    	  on where to get the original distribution.
+
+           b) accompany the distribution with the machine-readable source of
+    	  the software.
+
+           c) give non-standard executables non-standard names, with
+              instructions on where to get the original software distribution.
+
+           d) make other distribution arrangements with the author.
+
+      4. You may modify and include the part of the software into any other
+         software (possibly commercial).  But some files in the distribution
+         are not written by the author, so that they are not under this terms.
+
+         They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+         files under the ./missing directory.  See each file for the copying
+         condition.
+
+      5. The scripts and library files supplied as input to or produced as
+         output from the software do not automatically fall under the
+         copyright of the software, but belong to whomever generated them,
+         and may be sold commercially, and may be aggregated with this
+         software.
+
+      6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+         IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+         WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+         PURPOSE.
+
+./merb-core/spec/public/webrat/test_app/doc/rdoc/generators/template/merb/prototype.js
+    Copyright (c) 2005-2007 Sam Stephenson
+    Licensed under MIT License
+
+./merb-core/spec/public/core_ext/fixtures/gems/gems
+./merb-core/spec10/public/core_ext/fixtures/gems/gems
+./merb-core/spec10/public/webrat/test_app/gems/gems
+    Files in these directories were removed as the distributability is not
+    confirmed for these gems. See README.source.
--- merb-1.0.12+dfsg.orig/debian/watch
+++ merb-1.0.12+dfsg/debian/watch
@@ -0,0 +1,3 @@
+version=3
+options="dversionmangle=s/\+dfsg//" \
+http://githubredir.debian.net/github/merb/merb .*/(\d+\.\d+\.\d+(\.\d+){0,1}).tar.gz debian debian/repack.sh
--- merb-1.0.12+dfsg.orig/debian/rules
+++ merb-1.0.12+dfsg/debian/rules
@@ -0,0 +1,197 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+CDBS_NO_DOC_SYMLINKING = ""
+
+PACKAGED_RUBY_SETUP_CMD = /usr/lib/ruby/1.8/setup.rb
+DEB_RUBY_SETUP_CMD = debian-setup.rb
+DEB_RUBY_CONFIG_ARGS = --installdirs=std
+
+# command to install symlink to packaged setup.rb: used in both build and clean
+# targets
+DEB_RUBY_INSTALL_SETUP_CMD = \
+  if [ ! -L $(DEB_RUBY_SETUP_CMD) ] ; then \
+    if [ -f $(DEB_RUBY_SETUP_CMD) ] ; then \
+      mv $(DEB_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+    fi ; \
+    ln -s $(PACKAGED_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+DEB_RUBY_REMOVE_SETUP_CMD = \
+  if [ -L $(DEB_RUBY_SETUP_CMD) ] ; then \
+    rm $(DEB_RUBY_SETUP_CMD) ; \
+  fi ; \
+  if [ -f $(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+    mv $(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build $(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_CORE_INSTALL_SETUP_CMD = \
+  if [ ! -L merb-core/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    if [ -f merb-core/$(DEB_RUBY_SETUP_CMD) ] ; then \
+      mv merb-core/$(DEB_RUBY_SETUP_CMD) merb-core/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+    fi ; \
+    ln -s $(PACKAGED_RUBY_SETUP_CMD) merb-core/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_CORE_REMOVE_SETUP_CMD = \
+  if [ -L merb-core/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    rm merb-core/$(DEB_RUBY_SETUP_CMD) ; \
+  fi ; \
+  if [ -f merb-core/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+    mv merb-core/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build merb-core/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_HAML_INSTALL_SETUP_CMD = \
+  if [ ! -L merb-haml/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    if [ -f merb-haml/$(DEB_RUBY_SETUP_CMD) ] ; then \
+      mv merb-haml/$(DEB_RUBY_SETUP_CMD) merb-haml/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+    fi ; \
+    ln -s $(PACKAGED_RUBY_SETUP_CMD) merb-haml/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_HAML_REMOVE_SETUP_CMD = \
+  if [ -L merb-haml/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    rm merb-haml/$(DEB_RUBY_SETUP_CMD) ; \
+  fi ; \
+  if [ -f merb-haml/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+    mv merb-haml/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build merb-haml/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_SLICES_INSTALL_SETUP_CMD = \
+  if [ ! -L merb-slices/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    if [ -f merb-slices/$(DEB_RUBY_SETUP_CMD) ] ; then \
+      mv merb-slices/$(DEB_RUBY_SETUP_CMD) merb-slices/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+    fi ; \
+    ln -s $(PACKAGED_RUBY_SETUP_CMD) merb-slices/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_SLICES_REMOVE_SETUP_CMD = \
+  if [ -L merb-slices/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    rm merb-slices/$(DEB_RUBY_SETUP_CMD) ; \
+  fi ; \
+  if [ -f merb-slices/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+    mv merb-slices/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build merb-slices/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_ASSETS_INSTALL_SETUP_CMD = \
+  if [ ! -L merb-assets/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    if [ -f merb-assets/$(DEB_RUBY_SETUP_CMD) ] ; then \
+      mv merb-assets/$(DEB_RUBY_SETUP_CMD) merb-assets/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+    fi ; \
+    ln -s $(PACKAGED_RUBY_SETUP_CMD) merb-assets/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_ASSETS_REMOVE_SETUP_CMD = \
+  if [ -L merb-assets/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    rm merb-assets/$(DEB_RUBY_SETUP_CMD) ; \
+  fi ; \
+  if [ -f merb-assets/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+    mv merb-assets/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build merb-assets/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_HELPERS_INSTALL_SETUP_CMD = \
+  if [ ! -L merb-helpers/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    if [ -f merb-helpers/$(DEB_RUBY_SETUP_CMD) ] ; then \
+      mv merb-helpers/$(DEB_RUBY_SETUP_CMD) merb-helpers/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+    fi ; \
+    ln -s $(PACKAGED_RUBY_SETUP_CMD) merb-helpers/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_HELPERS_REMOVE_SETUP_CMD = \
+  if [ -L merb-helpers/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    rm merb-helpers/$(DEB_RUBY_SETUP_CMD) ; \
+  fi ; \
+  if [ -f merb-helpers/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+    mv merb-helpers/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build merb-helpers/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_PARAM_PROTECTION_INSTALL_SETUP_CMD = \
+  if [ ! -L merb-param-protection/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    if [ -f merb-param-protection/$(DEB_RUBY_SETUP_CMD) ] ; then \
+      mv merb-param-protection/$(DEB_RUBY_SETUP_CMD) merb-param-protection/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+    fi ; \
+    ln -s $(PACKAGED_RUBY_SETUP_CMD) merb-param-protection/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_PARAM_PROTECTION_REMOVE_SETUP_CMD = \
+  if [ -L merb-param-protection/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    rm merb-param-protection/$(DEB_RUBY_SETUP_CMD) ; \
+  fi ; \
+  if [ -f merb-param-protection/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+    mv merb-param-protection/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build merb-param-protection/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+install/merb-core::
+	dh_installchangelogs
+	dh_installdirs
+
+install/merb-slices::
+	dh_installchangelogs
+	dh_installdirs
+
+install/libmerb-core-ruby1.8::
+	$(MERB_CORE_INSTALL_SETUP_CMD)
+	(cd merb-core && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS))
+	(cd merb-core && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup)
+	(cd merb-core && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=../debian/libmerb-core-ruby1.8)
+	mv $(CURDIR)/debian/libmerb-core-ruby1.8/usr/bin/merb $(CURDIR)/debian/merb-core/usr/bin/
+	rm $(CURDIR)/debian/libmerb-core-ruby1.8/usr/bin/merb-specs
+	rmdir $(CURDIR)/debian/libmerb-core-ruby1.8/usr/bin/
+
+install/libmerb-haml-ruby1.8::
+	$(MERB_HAML_INSTALL_SETUP_CMD)
+	(cd merb-haml && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS))
+	(cd merb-haml && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup)
+	(cd merb-haml && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=../debian/libmerb-haml-ruby1.8)
+
+install/libmerb-slices-ruby1.8::
+	$(MERB_SLICES_INSTALL_SETUP_CMD)
+	(cd merb-slices && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS))
+	(cd merb-slices && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup)
+	(cd merb-slices && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=../debian/libmerb-slices-ruby1.8)
+	rm $(CURDIR)/debian/libmerb-slices-ruby1.8/usr/lib/ruby/1.8/generators/templates/common/LICENSE
+	mv $(CURDIR)/debian/libmerb-slices-ruby1.8/usr/bin/slice $(CURDIR)/debian/merb-slices/usr/bin/merb-slice
+	rmdir $(CURDIR)/debian/libmerb-slices-ruby1.8/usr/bin/
+
+install/libmerb-assets-ruby1.8::
+	$(MERB_ASSETS_INSTALL_SETUP_CMD)
+	(cd merb-assets && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS))
+	(cd merb-assets && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup)
+	(cd merb-assets && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=../debian/libmerb-assets-ruby1.8)
+
+install/libmerb-helpers-ruby1.8::
+	$(MERB_HELPERS_INSTALL_SETUP_CMD)
+	(cd merb-helpers && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS))
+	(cd merb-helpers && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup)
+	(cd merb-helpers && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=../debian/libmerb-helpers-ruby1.8)
+
+install/libmerb-param-protection-ruby1.8::
+	$(MERB_PARAM_PROTECTION_INSTALL_SETUP_CMD)
+	(cd merb-param-protection && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS))
+	(cd merb-param-protection && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup)
+	(cd merb-param-protection && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=../debian/libmerb-param-protection-ruby1.8)
+
+install/libmerb-ruby-doc::
+	rdoc --all --inline-source --fileboxes --line-numbers --fmt=html -o debian/$(cdbs_curpkg)/usr/share/doc/libmerb-ruby-doc/rdoc merb-core/lib merb-haml/lib merb-helpers/lib merb-assets/lib merb-slices/lib merb-param-protection/lib
+
+clean::
+	$(DEB_RUBY_INSTALL_SETUP_CMD)
+	$(MERB_CORE_INSTALL_SETUP_CMD)
+	$(MERB_HAML_INSTALL_SETUP_CMD)
+	$(MERB_SLICES_INSTALL_SETUP_CMD)
+	$(MERB_ASSETS_INSTALL_SETUP_CMD)
+	$(MERB_HELPERS_INSTALL_SETUP_CMD)
+	$(MERB_PARAM_PROTECTION_INSTALL_SETUP_CMD)
+	/usr/bin/ruby $(DEB_RUBY_SETUP_CMD) distclean
+	$(DEB_RUBY_REMOVE_SETUP_CMD)
+	$(MERB_CORE_REMOVE_SETUP_CMD)
+	$(MERB_HAML_REMOVE_SETUP_CMD)
+	$(MERB_SLICES_REMOVE_SETUP_CMD)
+	$(MERB_ASSETS_REMOVE_SETUP_CMD)
+	$(MERB_HELPERS_REMOVE_SETUP_CMD)
+	$(MERB_PARAM_PROTECTION_REMOVE_SETUP_CMD)
+	rm -f $(DEB_SRCDIR)/.config
+	rm -f $(DEB_SRCDIR)/InstalledFiles
--- merb-1.0.12+dfsg.orig/debian/slice.1
+++ merb-1.0.12+dfsg/debian/slice.1
@@ -0,0 +1,16 @@
+.TH SLICE "1" "July 2009"
+.SH NAME
+slice \- Start a Merb slice.
+.SH SYNOPSIS
+.B slice
+.SH DESCRIPTION
+The slice command starts a Merb application as a slice.
+.SH SEE ALSO
+.br
+Full documentation of merb is available after the Merb packages are installed.
+.SH AUTHOR
+Merb was written by Yehuda Katz <ykatz@engineyard.com>.
+.PP
+This manual page was written by Joshua Timberman <joshua@opscode.com>,
+for the Debian project (and may be used by others).
+
--- merb-1.0.12+dfsg.orig/debian/README.source
+++ merb-1.0.12+dfsg/debian/README.source
@@ -0,0 +1,62 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
+The upstream source has been modified to remove a generated PDF file
+with no distinguishable source: 
+
+./merb-core/docs/merb-core-call-stack-diagram.pdf
+
+The upstream source has also been modified to remove gems from the 
+specs, as the distributability is not confirmed for the gems. As
+a result, the spec tests for Merb will not work straight from the source
+tarball. These gems do not affect the outcome of the built package. 
+The entire spec and spec10 directories are removed due to the amount of 
+vendored gems.
+
+The following were removed:
+
+./merb-core/spec/public/core_ext/fixtures/gems/gems
+  bad_require_gem-0.0.1/
+  json_pure-1.1.3/
+  simple_gem-0.0.1/
+  simple_gem-0.0.2/
+./merb-core/spec10/public/core_ext/fixtures/gems/gems
+  bad_require_gem-0.0.1/
+  json_pure-1.1.3/
+  simple_gem-0.0.1/
+  simple_gem-0.0.2/
+./merb-core/spec10/public/webrat/test_app/gems/gems
+  abstract-1.0.0/
+  cgi_multipart_eof_fix-2.5.0/
+  daemons-1.0.10/
+  erubis-2.6.2/
+  extlib-0.9.8/
+  fastthread-1.0.1/
+  gem_plugin-0.2.3/
+  json_pure-1.1.3/
+  merb-core-0.9.14/
+  merb-helpers-0.9.14/
+  mime-types-1.15/
+  mongrel-1.1.5/
+  rack-0.4.0/
+  rake-0.8.3/
+  rspec-1.1.11/
+  thor-0.9.8/
+
+These gems would need to be manually retrieved and installed to the
+merb-core directories in order to run the spec tests.
+
+The following directory is removed by the repack script. The allison library
+is licensed under the Academic Free License, but is not free software per the
+Debian Free Software Guidelines:
+
+./merb-core/tools/allison-2.0.2
+
+The following files are blatantly not redistributable and are removed by the
+repack script along with the allison-2.0.2 directory:
+
+./merb-core/tools/allison-2.0.2/lib/allison.css
+./merb-core/tools/allison-2.0.2/lib/allison.js
--- merb-1.0.12+dfsg.orig/debian/merb-slices.dirs
+++ merb-1.0.12+dfsg/debian/merb-slices.dirs
@@ -0,0 +1 @@
+usr/bin
--- merb-1.0.12+dfsg.orig/debian/patches/load_dependencies_uses_require
+++ merb-1.0.12+dfsg/debian/patches/load_dependencies_uses_require
@@ -0,0 +1,28 @@
+# Description: Merb's dependency method, which calls load_dependency needs to have
+# a fallback to simply use require if a gem is not found.
+# Patch: http://github.com/jtimberman/merb/commit/3633e6dfbc8f263667bd4af45f4beec2090c0e28
+# Upstream: https://merb.lighthouseapp.com/projects/7433-merb/tickets/1281
+Index: merb-1.0.12/merb-core/lib/merb-core/core_ext/kernel.rb
+===================================================================
+--- merb-1.0.12.orig/merb-core/lib/merb-core/core_ext/kernel.rb	2009-07-29 16:20:14.000000000 -0600
++++ merb-1.0.12/merb-core/lib/merb-core/core_ext/kernel.rb	2009-07-29 16:20:51.000000000 -0600
+@@ -141,8 +141,17 @@
+       return unless dep.require_as
+       Gem.activate(dep)
+     rescue Gem::LoadError => e
+-      e.set_backtrace dep.original_caller
+-      Merb.fatal! "The gem #{name}, #{ver.inspect} was not found", e
++      begin
++        Merb.logger.debug "Falling back to a regular require"
++        if name.kind_of?(Gem::Dependency)
++          require name.name
++        else
++          require name
++        end 
++      rescue LoadError => le
++        e.set_backtrace dep.original_caller
++        Merb.fatal! "The gem #{name}, #{ver.inspect} was not found and we could not require it"
++      end 
+     end
+   
+     begin
--- merb-1.0.12+dfsg.orig/debian/patches/series
+++ merb-1.0.12+dfsg/debian/patches/series
@@ -0,0 +1 @@
+load_dependencies_uses_require
