Backport packaging of rubby-passenger from jessie to wheezy.

diff --git a/ruby-passenger/debian/changelog b/ruby-passenger/debian/changelog
index f0d91b5..f13c43b 100644 (file)
--- a/ruby-passenger/debian/changelog
+++ b/ruby-passenger/debian/changelog
@@ -1,3 +1,12 @@
+ruby-passenger (4.0.35-1+wheezy1) stable; urgency=low
+
+  * Backport to Debian 6:
+     - disable some documentation
+     - dh-apache removed
+     - ruby versions: disable 2.0, keep 1.9.1, enable 1.8
+
+ -- František Dvořák <valtri@civ.zcu.cz>  Wed, 5 Mar 2014 17:47:00 +0100
+
 ruby-passenger (4.0.35-1) unstable; urgency=low
 
   * Team upload

diff --git a/ruby-passenger/debian/control b/ruby-passenger/debian/control
index 327a342..152ad7f 100644 (file)
--- a/ruby-passenger/debian/control
+++ b/ruby-passenger/debian/control
@@ -4,9 +4,9 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
 Uploaders: Filipe Lautert <filipe@debian.org>, Micah Anderson <micah@debian.org>, David Moreno <damog@debian.org>,
  Felix Geyer <fgeyer@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.12~), apache2 (>= 2.4),
- apache2-dev (>= 2.4), libapr1-dev, doxygen, asciidoc (>= 8.2), graphviz, rake,
- source-highlight, libcurl4-openssl-dev, libev-dev, dh-autoreconf, ruby-mizuho
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.12~), apache2,
+ apache2-threaded-dev, libapr1-dev, doxygen, asciidoc (>= 8.2), graphviz, rake,
+ source-highlight, libcurl4-openssl-dev, libev-dev, dh-autoreconf
 Standards-Version: 3.9.5
 Homepage: http://www.modrails.com/
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-passenger.git

diff --git a/ruby-passenger/debian/libapache2-mod-passenger.apache2 b/ruby-passenger/debian/libapache2-mod-passenger.apache2
deleted file mode 100644 (file)
index 7165fc7..0000000
--- a/ruby-passenger/debian/libapache2-mod-passenger.apache2
+++ /dev/null
@@ -1,2 +0,0 @@
-mod debian/passenger.load
-mod debian/passenger.conf

diff --git a/ruby-passenger/debian/libapache2-mod-passenger.install b/ruby-passenger/debian/libapache2-mod-passenger.install
index 010fce2..772b93c 100644 (file)
--- a/ruby-passenger/debian/libapache2-mod-passenger.install
+++ b/ruby-passenger/debian/libapache2-mod-passenger.install
@@ -1 +1,3 @@
 usr/lib/apache2/modules/
+../passenger.conf etc/apache2/mods-available
+../passenger.load etc/apache2/mods-available

diff --git a/ruby-passenger/debian/libapache2-mod-passenger.postinst b/ruby-passenger/debian/libapache2-mod-passenger.postinst
new file mode 100644 (file)
index 0000000..7435ba2
--- /dev/null
+++ b/ruby-passenger/debian/libapache2-mod-passenger.postinst
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "configure" ]; then
+  exit 0
+fi
+
+reload_apache()
+{
+  if apache2ctl configtest 2>/dev/null; then
+    invoke-rc.d apache2 force-reload || true
+  else
+    echo "Your apache2 configuration is broken, so we're not restarting it for you."
+  fi
+}
+
+if [ -n "$2" ]; then
+# we're upgrading. test if we're enabled, and if so, restart to reload the module.
+  if [ -e /etc/apache2/mods-enabled/passenger.load ]; then
+    reload_apache
+  fi
+    exit 0
+fi
+
+if [ -e /etc/apache2/apache2.conf ]; then
+# Enable the module, but hide a2enmod's misleading message about apachectl
+# and force-reload the thing ourselves.
+        a2enmod passenger >/dev/null || true
+  reload_apache
+fi
+
+#DEBHELPER#
+
+exit 0
+

diff --git a/ruby-passenger/debian/libapache2-mod-passenger.prerm b/ruby-passenger/debian/libapache2-mod-passenger.prerm
new file mode 100644 (file)
index 0000000..187aad7
--- /dev/null
+++ b/ruby-passenger/debian/libapache2-mod-passenger.prerm
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "remove" -a "$1" != "purge" ]; then
+  exit 0
+fi;
+
+if [ -e /etc/apache2/apache2.conf ]; then
+  a2dismod passenger || true
+fi
+
+#DEBHELPER#
+
+exit 0
+

diff --git a/ruby-passenger/debian/patches/kill-docs.patch b/ruby-passenger/debian/patches/kill-docs.patch
new file mode 100644 (file)
index 0000000..edbad11
--- /dev/null
+++ b/ruby-passenger/debian/patches/kill-docs.patch
@@ -0,0 +1,31 @@
+Description: Disable documentation build
+ Disable docuemntation build as it requires mizune.
+ .
+ ruby-passenger (4.0.35-1+wheezy1) unstable; urgency=low
+ .
+   * Backport to Debian 6, disable documentation
+Author: František Dvořák <valtri@civ.zcu.cz>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- ruby-passenger-4.0.35.orig/Rakefile
++++ ruby-passenger-4.0.35/Rakefile
+@@ -28,7 +28,6 @@ else
+       require 'build/agents'
+       require 'build/apache2'
+       require 'build/nginx'
+-      require 'build/documentation'
+       require 'build/packaging'
+       require 'build/test_basics'
+       require 'build/oxt_tests'

diff --git a/ruby-passenger/debian/patches/series b/ruby-passenger/debian/patches/series
index d4cadda..5afffb9 100644 (file)
--- a/ruby-passenger/debian/patches/series
+++ b/ruby-passenger/debian/patches/series
@@ -1,3 +1,4 @@
 fix_install_path.patch
 no_jsoncpp.patch
 bin_load_path.patch
+kill-docs.patch

diff --git a/ruby-passenger/debian/ruby-passenger.install b/ruby-passenger/debian/ruby-passenger.install
index 22bc879..0c52b7d 100644 (file)
--- a/ruby-passenger/debian/ruby-passenger.install
+++ b/ruby-passenger/debian/ruby-passenger.install
@@ -4,5 +4,5 @@ usr/share/passenger/mime.types
 usr/share/passenger/helper-scripts/
 usr/share/passenger/templates/
 usr/lib/ruby/vendor_ruby/
-usr/lib/*/ruby/vendor_ruby/
+usr/lib/ruby/vendor_ruby/
 usr/sbin/

diff --git a/ruby-passenger/debian/rules b/ruby-passenger/debian/rules
index d827f82..1126b5e 100755 (executable)
--- a/ruby-passenger/debian/rules
+++ b/ruby-passenger/debian/rules
@@ -11,24 +11,24 @@ export USE_VENDORED_LIBEV=false
 export LC_ALL=C.UTF-8
 
 %:
-       dh $@ --buildsystem=ruby --with ruby,apache2,autoreconf
+       dh $@ --buildsystem=ruby --with ruby
 
 override_dh_auto_build:
+       /usr/bin/ruby1.8 /usr/bin/rake fakeroot
+       mv pkg/fakeroot pkg/fakeroot1.8
        /usr/bin/ruby1.9.1 /usr/bin/rake fakeroot
        mv pkg/fakeroot pkg/fakeroot1.9.1
-       /usr/bin/ruby2.0 /usr/bin/rake fakeroot
-       mv pkg/fakeroot pkg/fakeroot2.0
 
 override_dh_auto_install:
        mkdir debian/tmp/
+       cp -a pkg/fakeroot1.8/* debian/tmp/
        cp -a pkg/fakeroot1.9.1/* debian/tmp/
-       cp -a pkg/fakeroot2.0/* debian/tmp/
        rm -f debian/tmp/usr/share/doc/phusion-passenger/images/._phusion_banner.png
 
 override_dh_auto_clean:
        dh_auto_clean -O--buildsystem=ruby
+       rm -rf pkg/fakeroot1.8
        rm -rf pkg/fakeroot1.9.1
-       rm -rf pkg/fakeroot2.0
 
 override_dh_install:
        dh_install --list-missing -O--buildsystem=ruby