[DRE-maint] Ubuntu mongrel 1.1.5-2ubuntu1

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.7
Date: Tue, 14 Oct 2008 21:17:34 +1100
Source: mongrel
Binary: mongrel-doc mongrel
Architecture: source
Version: 1.1.5-2ubuntu1
Distribution: intrepid
Urgency: low
Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
Changed-By: Steve Kowalik <stevenk at ubuntu.com>
Description: 
 mongrel    - A small fast HTTP library and server for Ruby
 mongrel-doc - A small fast HTTP library and server for Ruby (documentation)
Changes: 
 mongrel (1.1.5-2ubuntu1) intrepid; urgency=low
 .
   * Fix up {Build-,}Depends as needed for libgems-ruby1.8 or rubygems ->
     rubygems1.8
   * Munge Maintainer field as per spec.
Files: 
 9934f61f4426e2bac849fae2c1430874 1162 web optional mongrel_1.1.5-2ubuntu1.dsc
 6f0e9017130e0f1c6d6e7dabe3ebb7aa 7716 web optional mongrel_1.1.5-2ubuntu1.diff.gz
Original-Maintainer: Filipe Lautert <filipe at icewall.org>
-------------- next part --------------
diff -pruN 1.1.5-2/debian/changelog 1.1.5-2ubuntu1/debian/changelog
--- 1.1.5-2/debian/changelog	2008-11-01 18:30:05.000000000 +0000
+++ 1.1.5-2ubuntu1/debian/changelog	2008-11-01 18:30:03.000000000 +0000
@@ -1,3 +1,11 @@
+mongrel (1.1.5-2ubuntu1) intrepid; urgency=low
+
+  * Fix up {Build-,}Depends as needed for libgems-ruby1.8 or rubygems ->
+    rubygems1.8
+  * Munge Maintainer field as per spec.
+
+ -- Steve Kowalik <stevenk at ubuntu.com>  Tue, 14 Oct 2008 21:17:34 +1100
+
 mongrel (1.1.5-2) unstable; urgency=low
 
   * Some corrections and additional information to manpage (closes: #474008).
diff -pruN 1.1.5-2/debian/control 1.1.5-2ubuntu1/debian/control
--- 1.1.5-2/debian/control	2008-11-01 18:30:05.000000000 +0000
+++ 1.1.5-2ubuntu1/debian/control	2008-11-01 18:30:03.000000000 +0000
@@ -1,7 +1,8 @@
 Source: mongrel
 Section: web
 Priority: optional
-Maintainer: Filipe Lautert <filipe at icewall.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
+XSBC-Original-Maintainer: Filipe Lautert <filipe at icewall.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Gunnar Wolf <gwolf at debian.org>, Paul van Tilburg <paulvt at debian.org>
 Build-Depends: debhelper (>= 5.0.0), ruby1.8 (>=1.8.4), ruby1.8-dev (>=1.8.4), rdoc1.8, cdbs, ruby-pkg-tools
 Build-Conflicts: gcc-3.3 (<< 1:3.3.2-0pre1)
@@ -26,7 +27,7 @@ Description: A small fast HTTP library a
 
 Package: mongrel
 Architecture: any
-Depends: ${shlibs:Depends}, ruby1.8 (>= 1.8.4), libgems-ruby1.8, libgemplugin-ruby (>= 0.2.2), libdaemons-ruby
+Depends: ${shlibs:Depends}, ruby1.8 (>= 1.8.4), rubygems1.8, libgemplugin-ruby (>= 0.2.2), libdaemons-ruby
 Suggests: rails, mongrel-doc
 Description: A small fast HTTP library and server for Ruby
  Mongrel is a fast HTTP library and server for Ruby that is intended