I have just done an NMU of mod-ruby to fix long standing bugs. Please
find the diff of the NMU attached.
--
.''`. Aurelien Jarno | GPG: 1024D/F1BCDB73
: :' : Debian developer | Electrical Engineer
`. `' [EMAIL PROTECTED] | [EMAIL PROTECTED]
`- people.debian.org/~aurel32 | www.aurel32.net
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,14 +3,14 @@
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.2.3-1) | apache2-prefork-dev (>= 2.2.3-1), ruby1.8, ruby1.8-dev
+Build-Depends: debhelper (>= 4.1.16), 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
Architecture: all
Depends: libruby1.8
-Recommends: libapache2-mod-ruby | libapache-mod-ruby
-Suggests: libapache2-mod-ruby, libapache-mod-ruby
+Recommends: libapache2-mod-ruby
+Suggests: libapache2-mod-ruby
Conflicts: libapache-mod-ruby (<< 1.2.0)
Description: Ruby libraries for mod_ruby
mod_ruby embeds the Ruby interpreter into the Apache2 web server,
@@ -31,8 +30,0 @@
-Package: libapache-mod-ruby
-Architecture: any
-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,
- allowing Ruby CGI scripts to be executed natively. These scripts will
- start up much faster than without mod_ruby.
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
@@ -12,21 +12,15 @@
# (From the egcs packaging)
NEXTVERNO2 := $(shell echo $(DEV_VERSION2) | awk -F. '{OFS="."; $$NF = $$NF + 1; print}')
-DEV_DPKG_VERSION1 := $(shell dpkg -s apache-dev | awk '/Version:/ {print $2}')
-DEV_VERSION1 := $(shell echo $(DEV_DPKG_VERSION1) | sed "s/^Version: \(.*\)-.*$$/\1/")
-# (From the egcs packaging)
-NEXTVERNO1 := $(shell echo $(DEV_VERSION1) | awk -F. '{OFS="."; $$NF = $$NF + 1; print}')
-
pwd := $(shell pwd)
DEB_DESTDIR_LIBAPACHE_RUBY = $(pwd)/debian/libapache-ruby1.8
DEB_DESTDIR_APACHE2 = $(pwd)/debian/libapache2-mod-ruby
-DEB_DESTDIR_APACHE1 = $(pwd)/debian/libapache-mod-ruby
# This is the debhelper compatability version to use.
export DH_COMPAT=4
build: build-stamp
-build-stamp: build-stamp-apache1 build-stamp-apache2
+build-stamp: build-stamp-apache2
build-stamp-apache2:
dh_testdir
@@ -44,29 +38,11 @@
touch build-stamp-apache2
-build-stamp-apache1:
- dh_testdir
-
- # Add here commands to compile the package.
- rm -rf build-apache1
- mkdir build-apache1
- cd build-apache1; \
- ruby1.8 ../configure.rb --with-apxs=/usr/bin/apxs; \
- $(MAKE)
-
-# dh_testroot
-# dh_clean -k -plibapache-mod-ruby
-# dh_installdirs -plibapache-mod-ruby
-# $(MAKE) install DESTDIR=$(DEB_DESTDIR_APACHE1)
-
- touch build-stamp-apache1
-
clean:
dh_testdir
dh_testroot
- rm -f build-stamp-apache2 build-stamp-apache1 build-stamp
+ rm -f build-stamp-apache2 build-stamp
# Add here commands to clean up after the build process.
- rm -rf build-apache1
rm -rf build-apache2
#-$(MAKE) distclean
@@ -94,9 +70,6 @@
# dh_clean -k -plibapache-mod-ruby
# dh_installdirs -plibapache-mod-ruby
- cd build-apache1; \
- $(MAKE) install-shared DESTDIR=$(DEB_DESTDIR_APACHE1)
- install -m644 $(CURDIR)/debian/700mod_ruby.info $(DEB_DESTDIR_APACHE1)/usr/lib/apache/1.3
dh_installdocs
dh_installexamples
@@ -112,8 +85,6 @@
dh_gencontrol -plibapache-ruby1.8
dh_gencontrol -plibapache2-mod-ruby -- -VTHISDEV="$(DEV_VERSION2)" \
-VNEXTDEV="$(NEXTVERNO2)"
- dh_gencontrol -plibapache-mod-ruby -- -VTHISDEV="$(DEV_VERSION1)" \
- -VNEXTDEV="$(NEXTVERNO1)"
# dh_makeshlibs
dh_md5sums
dh_builddeb
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,11 @@
+mod-ruby (1.2.6-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Drop support for apache 1.x (Closes: #429134).
+ * Build against latest apache2 package (Closes: #384883).
+
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Tue, 15 Jan 2008 11:57:01 +0100
+
mod-ruby (1.2.6-1.1) unstable; urgency=medium
* Non-maintainer upload.
