Bug#391791: diff for 1.2.6-1.1 NMU of mod-ruby

[Luk Claes]

Package: mod-ruby
Version: 1.2.6-1
Severity: normal
Tags: patch

Hi,

Attached is the diff for my mod-ruby 1.2.6-1.1 NMU.

-- 
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint:   D5AF 25FB 316B 53BB 08E7   F999 E544 DE07 9B7C 328D

diff -u mod-ruby-1.2.6/debian/changelog mod-ruby-1.2.6/debian/changelog
--- mod-ruby-1.2.6/debian/changelog
+++ mod-ruby-1.2.6/debian/changelog
@@ -1,3 +1,10 @@
+mod-ruby (1.2.6-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Update for apache 2.2 (Closes: #391791).
+
+ -- Luk Claes <[EMAIL PROTECTED]>  Tue, 17 Oct 2006 19:03:02 +0200
+
 mod-ruby (1.2.6-1) unstable; urgency=low
 
   * Upgraded to new upstream version.
diff -u mod-ruby-1.2.6/debian/control mod-ruby-1.2.6/debian/control
--- mod-ruby-1.2.6/debian/control
+++ mod-ruby-1.2.6/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Shugo Maeda <[EMAIL PROTECTED]>
 Uploaders: Shugo Maeda <[EMAIL PROTECTED]>, ARAKI Yasuhiro <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.1.16), apache-dev (>= 1.3.9), 
apache2-threaded-dev(>= 2.0.50-10) | apache2-prefork-dev (>= 2.0.50-10), 
ruby1.8, ruby1.8-dev
+Build-Depends: debhelper (>= 4.1.16), apache-dev (>= 1.3.9), 
apache2-threaded-dev (>= 2.2.3-1) | apache2-prefork-dev (>= 2.2.3-1), ruby1.8, 
ruby1.8-dev
 Standards-Version: 3.6.2
 
 Package: libapache-ruby1.8
@@ -21,7 +21,7 @@
  
 Package: libapache2-mod-ruby
 Architecture: any
-Depends: ${shlibs:Depends}, apache2-common, libapache-ruby1.8 (= 
${Source-Version})
+Depends: ${shlibs:Depends}, apache2.2-common, libapache-ruby1.8 (= 
${source:Version})
 Suggests: liberuby (>= 0.9.4)
 Description: Embedding Ruby in the Apache2 web server
  mod_ruby embeds the Ruby interpreter into the Apache2 web server,
@@ -30,7 +30,7 @@
 
 Package: libapache-mod-ruby
 Architecture: any
-Depends: ${shlibs:Depends}, apache-common, libapache-ruby1.8  (= 
${Source-Version})
+Depends: ${shlibs:Depends}, apache-common, libapache-ruby1.8  (= 
${source:Version})
 Suggests: liberuby (>= 0.9.4)
 Description: Embedding Ruby in the Apache web server
  mod_ruby embeds the Ruby interpreter into the Apache web server,
diff -u mod-ruby-1.2.6/debian/rules mod-ruby-1.2.6/debian/rules
--- mod-ruby-1.2.6/debian/rules
+++ mod-ruby-1.2.6/debian/rules
@@ -34,7 +34,7 @@
        rm -rf build-apache2
        mkdir build-apache2
        cd build-apache2; \
-               ruby1.8 ../configure.rb --with-apxs=/usr/bin/apxs2; \
+               ruby1.8 ../configure.rb 
--with-apr-includes=/usr/include/apr-1.0 --with-apxs=/usr/bin/apxs2; \
                $(MAKE)
 
 #      dh_testroot