[DRE-commits] r5894 - trunk/passenger/debian

[Laurent Arnoud]

Author: spk-guest
Date: 2010-10-06 21:28:32 +0000 (Wed, 06 Oct 2010)
New Revision: 5894

Modified:
   trunk/passenger/debian/changelog
   trunk/passenger/debian/rules
Log:
Apply patch from "Evgeni Golov <evgeni at debian.org>" for #599024 bug.

Signed-off-by: Laurent Arnoud <laurent at spkdev.net>

Modified: trunk/passenger/debian/changelog
===================================================================
--- trunk/passenger/debian/changelog	2010-10-04 22:17:16 UTC (rev 5893)
+++ trunk/passenger/debian/changelog	2010-10-06 21:28:32 UTC (rev 5894)
@@ -1,9 +1,9 @@
-passenger (2.2.11debian-1.1) UNRELEASED; urgency=low
+passenger (2.2.11debian-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
-  * NOT RELEASED YET
+  * Correctly install docs in passenger-doc (Closes: #599024)
 
- -- micah <micah at algae.riseup.net>  Wed, 17 Mar 2010 00:38:18 -0400
+ -- Evgeni Golov <evgeni at debian.org>  Wed, 06 Oct 2010 11:49:07 +0200
 
 passenger (2.2.11debian-1) unstable; urgency=low
 
@@ -40,7 +40,7 @@
  -- Micah Anderson <micah at debian.org>  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 <micah at debian.org>  Sun, 08 Nov 2009 21:22:47 -0500
@@ -53,7 +53,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 <micah at debian.org>  Wed, 23 Sep 2009 14:55:53 -0400
@@ -74,14 +74,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

Modified: trunk/passenger/debian/rules
===================================================================
--- trunk/passenger/debian/rules	2010-10-04 22:17:16 UTC (rev 5893)
+++ trunk/passenger/debian/rules	2010-10-06 21:28:32 UTC (rev 5894)
@@ -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)
@@ -32,6 +32,6 @@
 	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