diff -u passenger-2.2.11debian/debian/control passenger-2.2.11debian/debian/control --- passenger-2.2.11debian/debian/control +++ passenger-2.2.11debian/debian/control @@ -3,17 +3,17 @@ Priority: optional Maintainer: Debian Ruby Extras Maintainers Uploaders: Filipe Lautert , Micah Anderson , David Moreno -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, +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 -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 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/ Package: libapache2-mod-passenger Architecture: any -Depends: ${shlibs:Depends}, apache2-mpm-worker (>= 2.2.9-9) | apache2-mpm-prefork (>= 2.2.9-9) | +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-prototype Suggests: python, rails, passenger-doc Description: Rails and Rack support for Apache2 diff -u passenger-2.2.11debian/debian/changelog passenger-2.2.11debian/debian/changelog --- passenger-2.2.11debian/debian/changelog +++ passenger-2.2.11debian/debian/changelog @@ -1,3 +1,14 @@ +passenger (2.2.11debian-2) unstable; urgency=low + + [Laurent Arnoud] + * Team upload. + * Bump Standards version to 3.9.1 (no changes). + + [Evgeni Golov] + * Correctly install docs in passenger-doc (Closes: #599024) + + -- Evgeni Golov Wed, 06 Oct 2010 11:49:07 +0200 + passenger (2.2.11debian-1) unstable; urgency=low [ Paul van Tilburg ] @@ -33,7 +44,7 @@ -- Micah Anderson Mon, 09 Nov 2009 12:07:15 -0500 passenger (2.2.5debian-5) unstable; urgency=low - + * Build-dep on apache2 to fix FTBS (Closes: #555155) -- Micah Anderson Sun, 08 Nov 2009 21:22:47 -0500 @@ -46,7 +57,7 @@ passenger (2.2.5debian-2) unstable; urgency=low - * Update control to allow for possible installation of + * Update control to allow for possible installation of apache2-mpm-prefork (Closes: #545872) -- Micah Anderson Wed, 23 Sep 2009 14:55:53 -0400 @@ -67,14 +78,14 @@ . test/stub/rails_apps/mycookbook/public/javascripts/dragdrop.js . test/stub/rails_apps/mycookbook/public/javascripts/controls.js . ext/nginx/StaticContentHandler.c - . ext/nginx/Configuration.[c,h], ContentHandler.[c,h], + . ext/nginx/Configuration.[c,h], ContentHandler.[c,h], . ext/nginx/ngx_http_passenger_module.[c,h] and StaticContentHandler.h . ext/apache2/Hooks.cpp . ext/common/Base65.[cpp,h] * Update Standards-Version to 3.8.2 (no changes) * Also remove passenger-install-nginx-module, same as the apache piece * Add myself and damog to Uploaders - * Set Maintainer field to Debian Ruby Extras Maintainers + * Set Maintainer field to Debian Ruby Extras Maintainers * Make sure the modsavailabledir is properly created * Fix the DEB_INSTALL_DOCS package name * Update the passengermodule and admintools names for the new upstream diff -u passenger-2.2.11debian/debian/rules passenger-2.2.11debian/debian/rules --- passenger-2.2.11debian/debian/rules +++ passenger-2.2.11debian/debian/rules @@ -1,11 +1,11 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk - + DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) -DEB_INSTALL_DOCS_phusion_passenger-doc += DEVELOPERS.TXT $(DEB_DESTDIR)/usr/share/doc/phusion_passenger/ +DEB_INSTALL_DOCS_passenger-doc += DEVELOPERS.TXT $(DEB_DESTDIR)/usr/share/doc/phusion_passenger/ DEB_INSTALL_MANPAGES_libapache2-mod-passenger += man/* - + bindir = usr/bin sbindir = usr/sbin builddir = pkg/fakeroot @@ -13,11 +13,11 @@ 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 - + clean:: rake clean rake clobber - + build/libapache2-mod-passenger build/passenger-doc:: rake fakeroot mv $(builddir) $(DEB_DESTDIR) @@ -33,5 +33,5 @@ mv $(CURDIR)/debian/$(cdbs_curpkg)/$(bindir)/$$admintool $(CURDIR)/debian/$(cdbs_curpkg)/$(sbindir); \ done; - + get-orig-source: uscan --verbose --force-download