[DRE-commits] r3832 - packages-wip/passenger/trunk/debian

[Micah Anderson]

Author: micah
Date: 2009-07-25 16:05:52 +0000 (Sat, 25 Jul 2009)
New Revision: 3832

Modified:
   packages-wip/passenger/trunk/debian/changelog
   packages-wip/passenger/trunk/debian/libapache2-mod-passenger.install
   packages-wip/passenger/trunk/debian/rules
Log:
fix the debian package to reflect the new upstream binary names and locations, removed some outdated pieces

Modified: packages-wip/passenger/trunk/debian/changelog
===================================================================
--- packages-wip/passenger/trunk/debian/changelog	2009-07-25 15:58:55 UTC (rev 3831)
+++ packages-wip/passenger/trunk/debian/changelog	2009-07-25 16:05:52 UTC (rev 3832)
@@ -1,5 +1,9 @@
 passenger (2.2.4-1) unstable; urgency=low
 
+  * Make sure the modsavailabledir is properly created
+  * Fix the DEB_INSTALL_DOCS package name
+  * Update the passengermodule and admintools names for the new upstream
+  * Removed etc from libapache2-mod-passenger.install
   * Updated to new upstream version
   * Added librack-ruby Depends
   * Removed tests/support/valgrind.h, incompatable 4-clause BSD license

Modified: packages-wip/passenger/trunk/debian/libapache2-mod-passenger.install
===================================================================
--- packages-wip/passenger/trunk/debian/libapache2-mod-passenger.install	2009-07-25 15:58:55 UTC (rev 3831)
+++ packages-wip/passenger/trunk/debian/libapache2-mod-passenger.install	2009-07-25 16:05:52 UTC (rev 3832)
@@ -1,4 +1,3 @@
 usr/bin
 usr/lib
-etc
 ../passenger.{conf,load} etc/apache2/mods-available

Modified: packages-wip/passenger/trunk/debian/rules
===================================================================
--- packages-wip/passenger/trunk/debian/rules	2009-07-25 15:58:55 UTC (rev 3831)
+++ packages-wip/passenger/trunk/debian/rules	2009-07-25 16:05:52 UTC (rev 3832)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
  
 DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
-DEB_INSTALL_DOCS_passenger-doc += DEVELOPERS.TXT $(DEB_DESTDIR)/usr/share/doc/phusion_passenger/
+DEB_INSTALL_DOCS_phusion_passenger-doc += DEVELOPERS.TXT $(DEB_DESTDIR)/usr/share/doc/phusion_passenger/
 DEB_INSTALL_MANPAGES_libapache2-mod-passenger += man/*
  
 bindir = usr/bin
@@ -13,7 +13,7 @@
 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
+admintools = passenger-memory-stats passenger-make-enterprisey passenger-status passenger-config passenger-stress-test
  
 clean::
 	rake clean
@@ -24,6 +24,7 @@
 	mv $(builddir) $(DEB_DESTDIR)
  
 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)