tag 664152 + patch
thanks
Hi,
Please find a patch attached.
Some remarks:
- I'm still wondering if we shouldn't create a -src package that could
be used by nginx to enabled passenger support, I've made a patch for
nginx that is embedding the code of passenger, that was the easiest,
but not the cleanest. I've dropped the passenger-config executable
since it doesn't really make sense and should be install in this
hypothetical -src package.
- The standalone passenger support requires an extra gems
(daemon_controller). That gem seems at first sight easy to
package (no dependencies). But I've the feeling that it will not be
easy to make it works, /bin/passenger is trying to compile nginx
(!) the 1st time it's started. So for now I've dropped that
executable.
- I've renamed the passenger-doc package to ruby-passenger-doc, not
sure if it worth it and/or if this would require a transitional
package.
I've tested the package by running a redmine instance and it seems to
work properly.
If somebody want to review this and upload, it would be great.
Cheers
Laurent Bigonville
diff --git a/debian/changelog b/debian/changelog
index d26c58a..35579d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
-passenger (3.0.11debian-1) unstable; urgency=low
+ruby-passenger (3.0.11debian-1) UNRELEASED; urgency=low
+ [ Dmitry Borodaenko ]
* New upstream release (Closes: #588256)
- -- Dmitry Borodaenko <[email protected]> Tue, 27 Dec 2011 14:50:24 +0300
+ [ Laurent Bigonville ]
+ * Rename packages to follow new ruby policy
+ * Split all ruby files into the ruby-passenger package (Closes: #664152)
+ * debian/control: Fix typo, the right package is www-browser (Closes:
+ #628479)
+ * Also build for ruby 1.9.1 (LP: #695159)
+
+ -- Laurent Bigonville <[email protected]> Tue, 20 Mar 2012 12:26:56 +0100
passenger (2.2.11debian-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 877b3f8..206cd90 100644
--- a/debian/control
+++ b/debian/control
@@ -1,32 +1,45 @@
-Source: passenger
-Section: web
+Source: ruby-passenger
+Section: ruby
Priority: optional
Maintainer: Debian Ruby Extras Maintainers <[email protected]>
Uploaders: Filipe Lautert <[email protected]>, Micah Anderson <[email protected]>, David Moreno <[email protected]>
-Build-Depends: debhelper (>= 7), apache2-mpm-worker | apache2-mpm, apache2-threaded-dev, libapr1-dev,
- rubygems (>= 1.2), debhelper (>= 5.0.44), ruby-dev, doxygen, asciidoc (>= 8.2), graphviz, rake,
- cdbs, source-highlight, libjs-scriptaculous, libcurl4-gnutls-dev
-Standards-Version: 3.9.1
+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, libjs-scriptaculous, libcurl4-gnutls-dev, libev-dev
+Standards-Version: 3.9.3
Homepage: http://www.modrails.com/
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/passenger/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/passenger/
+Vcs-Git: git://anonscm.debian.org/git/pkg-ruby-extras/ruby-passenger.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-passenger.git;a=summary
+XS-Ruby-Versions: all
+
+Package: ruby-passenger
+Architecture: any
+XB-Ruby-Versions: ${ruby:Versions}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, rubygems (>= 1.2), ruby-rack
+Suggests: python, rails, ruby-passenger-doc
+Description: Rails and Rack support for Apache2 and Nginx
+ Phusion Passenger â a.k.a. mod_rails or mod_rack â makes
+ deployment of Ruby web applications, such as those built on the
+ revolutionary Ruby on Rails web framework, a breeze.
Package: libapache2-mod-passenger
Architecture: any
-Depends: ${shlibs:Depends}, apache2-mpm-worker (>= 2.2.9-9) | apache2-mpm-prefork (>= 2.2.9-9) |
- apache2-mpm-itk (>= 2.2.9-9), ruby, rubygems (>= 1.2), ${misc:Depends}, librack-ruby, libjs-scriptaculous
-Suggests: python, rails, passenger-doc
+Section: web
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-mpm-worker (>= 2.2.9-9) |
+ apache2-mpm-prefork (>= 2.2.9-9) | apache2-mpm-itk (>= 2.2.9-9), ruby-passenger (= ${binary:Version})
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
revolutionary Ruby on Rails web framework, a breeze.
+ .
+ This package contains the Apache 2 module required by Phusion Passenger.
-Package: passenger-doc
+Package: ruby-passenger-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Suggests: www-browse
-Description: Rails and Rac support for Apache2 - Documentation
+Suggests: www-browser
+Description: Rails and Rack support for Apache2 - Documentation
Phusion Passenger â a.k.a. mod_rails or mod_rack â makes
deployment of Ruby web applications, such as those built on the
revolutionary Ruby on Rails web framework, a breeze.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 871a471..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/apache2/mods-available
-usr/lib/apache2/modules
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 33d9ebd..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,3 +0,0 @@
-DEVELOPERS.TXT
-README
-debian/README.Debian
diff --git a/debian/libapache2-mod-passenger.install b/debian/libapache2-mod-passenger.install
index 88e1587..772b93c 100644
--- a/debian/libapache2-mod-passenger.install
+++ b/debian/libapache2-mod-passenger.install
@@ -1,3 +1,3 @@
-usr/bin
-usr/lib
-../passenger.{conf,load} etc/apache2/mods-available
+usr/lib/apache2/modules/
+../passenger.conf etc/apache2/mods-available
+../passenger.load etc/apache2/mods-available
diff --git a/debian/ruby-passenger-doc.docs b/debian/ruby-passenger-doc.docs
new file mode 100644
index 0000000..3539431
--- /dev/null
+++ b/debian/ruby-passenger-doc.docs
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/phusion-passenger/
diff --git a/debian/ruby-passenger.docs b/debian/ruby-passenger.docs
new file mode 100644
index 0000000..33d9ebd
--- /dev/null
+++ b/debian/ruby-passenger.docs
@@ -0,0 +1,3 @@
+DEVELOPERS.TXT
+README
+debian/README.Debian
diff --git a/debian/ruby-passenger.install b/debian/ruby-passenger.install
new file mode 100644
index 0000000..4642596
--- /dev/null
+++ b/debian/ruby-passenger.install
@@ -0,0 +1,6 @@
+usr/lib/phusion-passenger/
+usr/share/phusion-passenger/union_station_gateway.crt
+usr/share/phusion-passenger/mime.types
+usr/share/phusion-passenger/helper-scripts/
+usr/lib/ruby/* usr/lib/ruby/vendor_ruby/
+usr/sbin/
diff --git a/debian/ruby-passenger.manpages b/debian/ruby-passenger.manpages
new file mode 100644
index 0000000..33ab47f
--- /dev/null
+++ b/debian/ruby-passenger.manpages
@@ -0,0 +1,3 @@
+man/passenger-make-enterprisey.8
+man/passenger-memory-stats.8
+man/passenger-status.8
diff --git a/debian/rules b/debian/rules
index b108bc7..c0f6408 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,37 +1,26 @@
#!/usr/bin/make -f
+#export DH_VERBOSE=1
-include /usr/share/cdbs/1/rules/debhelper.mk
+export USE_VENDORED_LIBEV=false
-DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
-DEB_INSTALL_DOCS_passenger-doc += DEVELOPERS.TXT $(DEB_DESTDIR)/usr/share/doc/phusion_passenger/
-DEB_INSTALL_MANPAGES_libapache2-mod-passenger += man/*
+%:
+ dh $@ --buildsystem=ruby --with ruby
-bindir = usr/bin
-sbindir = usr/sbin
-builddir = pkg/fakeroot
-moddir = usr/lib/apache2/modules
-modsavailabledir = etc/apache2/mods-available
-passengermodule = usr/lib/phusion_passenger/mod_passenger.so
-admintools = passenger-memory-stats passenger-make-enterprisey passenger-status passenger-config passenger-stress-test
+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
-clean::
- rake clean
- rake clobber
+override_dh_auto_install:
+ mkdir debian/tmp/
+ cp -a pkg/fakeroot1.8/* debian/tmp/
+ cp -a pkg/fakeroot1.9.1/* debian/tmp/
-build/libapache2-mod-passenger build/passenger-doc::
- rake fakeroot
- mv $(builddir) $(DEB_DESTDIR)
+override_dh_auto_clean:
+ dh_auto_clean -O--buildsystem=ruby
+ rm -rf pkg/fakeroot1.8
+ rm -rf pkg/fakeroot1.9.1
-binary-install/libapache2-mod-passenger::
- mkdir -p $(CURDIR)/debian/$(cdbs_curpkg)/$(modsavailabledir)
- mkdir -p $(CURDIR)/debian/$(cdbs_curpkg)/$(moddir)
- mkdir -p $(CURDIR)/debian/$(cdbs_curpkg)/$(sbindir)
- mv $(CURDIR)/debian/$(cdbs_curpkg)/$(passengermodule) $(CURDIR)/debian/$(cdbs_curpkg)/$(moddir)
- rm $(CURDIR)/debian/$(cdbs_curpkg)/$(bindir)/passenger-install-apache2-module
- rm $(CURDIR)/debian/$(cdbs_curpkg)/$(bindir)/passenger-install-nginx-module
- for admintool in $(admintools); do \
- mv $(CURDIR)/debian/$(cdbs_curpkg)/$(bindir)/$$admintool $(CURDIR)/debian/$(cdbs_curpkg)/$(sbindir); \
- done;
-
-get-orig-source:
- uscan --verbose --force-download
+override_dh_install:
+ dh_install --list-missing -O--buildsystem=ruby
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
_______________________________________________
Pkg-ruby-extras-maintainers mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ruby-extras-maintainers
