[Pkg-dspam-commits] [pkg-dspam-commits] r162 - trunk/debian

[Kurt B. Kaiser]

Author: kbk-guest
Date: Thu Jul 17 06:03:39 2008
New Revision: 162

Log:
Remove the old apache.conf, now obsolete in sid and lenny.  But leave
the ability to remove it if found in etch during an upgrade.


Removed:
   trunk/debian/dspam-apache.conf
Modified:
   trunk/debian/changelog
   trunk/debian/dspam-webfrontend.install
   trunk/debian/dspam-webfrontend.postrm

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Thu Jul 17 06:03:39 2008
@@ -9,12 +9,13 @@
   * Use dh_lintian to install the webfrontend conffile override.
   * Revise build to not use build--tmp subdir: it's easier to clean the tree
     if the Makefiles are created.
-  * Move linking in config.guess and config.sub to configure target
+  * Move linking in config.guess and config.sub to configure target.
   * Use maintainer-clean in clean target and remove any Makefile.in left over.
-  * Add apache2-suexec as webfrontend dependency (Closes: #488924)
-  * Enable the suexec module during webfrontend postinstall (Ref #366478)
+  * Add apache2-suexec as webfrontend dependency (Closes: #488924).
+  * Enable the suexec module during webfrontend postinstall (Ref #366478).
+  * Remove the old apache.conf, but leave its removal in webfrontend postrm.
 
- -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Thu, 17 Jul 2008 01:46:32 -0400
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Thu, 17 Jul 2008 02:01:29 -0400
 
 dspam (3.6.8-8) unstable; urgency=high
 

Modified: trunk/debian/dspam-webfrontend.install
==============================================================================
--- trunk/debian/dspam-webfrontend.install	(original)
+++ trunk/debian/dspam-webfrontend.install	Thu Jul 17 06:03:39 2008
@@ -7,5 +7,4 @@
 webui/htdocs/dspam-logo-small.gif 	var/www/dspam/
 webui/cgi-bin/admins    	       	etc/dspam/
 webui/cgi-bin/rgb.txt    	 	etc/dspam/
-debian/dspam-apache.conf etc/dspam
-debian/dspam-apache2.conf etc/dspam
+debian/dspam-apache2.conf 		etc/dspam/

Modified: trunk/debian/dspam-webfrontend.postrm
==============================================================================
--- trunk/debian/dspam-webfrontend.postrm	(original)
+++ trunk/debian/dspam-webfrontend.postrm	Thu Jul 17 06:03:39 2008
@@ -30,10 +30,9 @@
 		rm -f /etc/apache2/conf.d/dspam-apache2.conf
         	invoke-rc.d apache2 reload
     	fi
+	# clean up Etch->Lenny upgrades if necessary:
         if [ -f /usr/sbin/apache ]; then
 		rm -f /etc/apache/conf.d/dspam-apache.conf
-# Should we really reload apache ?
-		invoke-rc.d apache reload
 	fi
 	;;