[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

ruby-passenger (4.0.10-1) for wheezy-backports available

Hi all,
(please Cc: me in replies as I am not (yet) subscribed to the debian-ruby ML)
I have backported ruby-passenger 4.0.10-1 for Debian wheezy. The debdiff (4.0.10-1 in unstable vs. 4.0.10-1 wheezy-backports candidate) is attached.
A very similar package (only difference: the version number) is available for test-installing here: 
http://www-ps.informatik.uni-kiel.de/debian/pool/main/r/ruby-passenger/
Please give feedback on the backported package and let me know (now or later) if uploading the package to wheezy-backports is an option. 

light+love
Mike


--

mike gabriel aka sunweaver (Debian Developer)
fon: +49 (1520) 1976 148

GnuPG Fingerprint: 9BFB AEE8 6C0A A5FF BF22  0782 9AF4 6B30 2577 1B31
mail: sunweaver@debian.org, http://sunweavers.net



diff -Nru ruby-passenger-4.0.10/debian/changelog ruby-passenger-4.0.10/debian/changelog
--- ruby-passenger-4.0.10/debian/changelog	2013-08-06 23:08:38.000000000 +0200
+++ ruby-passenger-4.0.10/debian/changelog	2013-09-12 11:43:16.000000000 +0200
@@ -1,3 +1,12 @@
+ruby-passenger (4.0.10-1~bpo7+1) wheezy-backports; urgency=low
+
+  * Upload to wheezy-backports.
+    - Add /debian/locations.ini file that provides relative installation
+      paths at package build time.
+    - Revert packaging to apache2.2 packaging style.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Fri, 30 Aug 2013 14:01:29 +0200
+
 ruby-passenger (4.0.10-1) unstable; urgency=low
 
   * New upstream release. (Closes: #711906)
diff -Nru ruby-passenger-4.0.10/debian/control ruby-passenger-4.0.10/debian/control
--- ruby-passenger-4.0.10/debian/control	2013-08-06 23:08:38.000000000 +0200
+++ ruby-passenger-4.0.10/debian/control	2013-09-11 16:35:03.000000000 +0200
@@ -3,9 +3,10 @@
 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,
+ Felix Geyer <fgeyer@debian.org>,
+ Mike Gabriel <sunweaver@debian.org>,
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.12~), apache2-mpm-worker | apache2-mpm, apache2-threaded-dev,
+ libapr1-dev, doxygen, asciidoc (>= 8.2), graphviz, rake,
  source-highlight, libcurl4-openssl-dev, libev-dev, dh-autoreconf
 Standards-Version: 3.9.4
 Homepage: http://www.modrails.com/
@@ -28,7 +29,8 @@
 Package: libapache2-mod-passenger
 Architecture: any
 Section: httpd
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-passenger (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-passenger (= ${binary:Version}),
+ apache2-mpm-worker (>= 2.2.9-9) | apache2-mpm-prefork (>= 2.2.9-9) | apache2-mpm-itk (>= 2.2.9-9) | apache2-mpm-event (>= 2.2.9-9),
 Description: Rails and Rack support for Apache2
  Phusion Passenger — a.k.a. mod_rails or mod_rack — makes
  deployment of Ruby web applications, such as those built on the
diff -Nru ruby-passenger-4.0.10/debian/libapache2-mod-passenger.install ruby-passenger-4.0.10/debian/libapache2-mod-passenger.install
--- ruby-passenger-4.0.10/debian/libapache2-mod-passenger.install	2013-08-06 23:08:38.000000000 +0200
+++ ruby-passenger-4.0.10/debian/libapache2-mod-passenger.install	2013-09-12 09:25:57.000000000 +0200
@@ -1 +1,3 @@
 usr/lib/apache2/modules/
+debian/passenger.conf etc/apache2/mods-available/
+debian/passenger.load etc/apache2/mods-available/
diff -Nru ruby-passenger-4.0.10/debian/libapache2-mod-passenger.postinst ruby-passenger-4.0.10/debian/libapache2-mod-passenger.postinst
--- ruby-passenger-4.0.10/debian/libapache2-mod-passenger.postinst	1970-01-01 01:00:00.000000000 +0100
+++ ruby-passenger-4.0.10/debian/libapache2-mod-passenger.postinst	2012-06-28 17:00:51.000000000 +0200
@@ -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 -Nru ruby-passenger-4.0.10/debian/libapache2-mod-passenger.prerm ruby-passenger-4.0.10/debian/libapache2-mod-passenger.prerm
--- ruby-passenger-4.0.10/debian/libapache2-mod-passenger.prerm	1970-01-01 01:00:00.000000000 +0100
+++ ruby-passenger-4.0.10/debian/libapache2-mod-passenger.prerm	2012-06-28 17:00:51.000000000 +0200
@@ -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 -Nru ruby-passenger-4.0.10/debian/locations.ini ruby-passenger-4.0.10/debian/locations.ini
--- ruby-passenger-4.0.10/debian/locations.ini	1970-01-01 01:00:00.000000000 +0100
+++ ruby-passenger-4.0.10/debian/locations.ini	2013-09-12 09:18:42.000000000 +0200
@@ -0,0 +1,11 @@
+[locations]
+natively_packaged=true
+bin=./bin
+agents=./buildout/agents
+libdir=./buildout
+helper_scripts=./helper-scripts
+resources=./resources
+includedir=./ext
+doc=./doc
+apache2_module=./buildout/apache2/mod_passenger.so
+ruby_extension_source=./ext/ruby
\ Kein Zeilenumbruch am Dateiende.
diff -Nru ruby-passenger-4.0.10/debian/rules ruby-passenger-4.0.10/debian/rules
--- ruby-passenger-4.0.10/debian/rules	2013-08-06 23:08:38.000000000 +0200
+++ ruby-passenger-4.0.10/debian/rules	2013-09-12 09:16:07.000000000 +0200
@@ -1,14 +1,10 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
-include /usr/share/dpkg/buildflags.mk
-export EXTRA_CXXFLAGS=$(CXXFLAGS) $(CPPFLAGS)
-export EXTRA_LDFLAGS=$(LDFLAGS)
-
 export USE_VENDORED_LIBEV=false
-
+export PASSENGER_LOCATION_CONFIGURATION_FILE=debian/locations.ini
 %:
-	dh $@ --buildsystem=ruby --with ruby,apache2,autoreconf
+	dh $@ --buildsystem=ruby --with ruby
 
 override_dh_auto_build:
 	/usr/bin/ruby1.8 /usr/bin/rake fakeroot

Attachment: pgp1xLUdHdMF6.pgp
Description: Digitale PGP-Unterschrift

Reply to: