[pkg-dspam-commits] r30 - trunk/debian

[Matthijs Mohlmann]

Author: active2-guest
Date: Sun Oct 30 18:25:27 2005
New Revision: 30

Removed:
   trunk/debian/dspam-webfrontend.examples
Modified:
   trunk/debian/dspam-webfrontend.install
   trunk/debian/dspam-webfrontend.postinst
   trunk/debian/dspam-webfrontend.postrm
   trunk/debian/rules
Log:
 * Moved dspam-apache{2}.conf to /etc and removed dh_installexamples from
   debian/rules.
 * Updated the postinst and postrm scripts for web-frontend a bit so it uses
   a2enmod.


Modified: trunk/debian/dspam-webfrontend.install
==============================================================================
--- trunk/debian/dspam-webfrontend.install	(original)
+++ trunk/debian/dspam-webfrontend.install	Sun Oct 30 18:25:27 2005
@@ -9,3 +9,5 @@
 webui/cgi-bin/rgb.txt    	 	etc/dspam/
 webui/cgi-bin/default.prefs		etc/dspam/
 build--tmp/webui/cgi-bin/configure.pl	etc/dspam/
+debian/dspam-apache.conf etc/dspam
+debian/dspam-apache2.conf etc/dspam

Modified: trunk/debian/dspam-webfrontend.postinst
==============================================================================
--- trunk/debian/dspam-webfrontend.postinst	(original)
+++ trunk/debian/dspam-webfrontend.postinst	Sun Oct 30 18:25:27 2005
@@ -20,17 +20,19 @@
         if [ -f /usr/sbin/apache2ctl ]; then
             if  [ ! -L /etc/apache2/mods-enabled/suexec.load ]; then
                 if  [ ! -L /etc/apache2/mods-enabled/auth_pam.load ]; then
-                    ln -sf /etc/apache2/mods-available/suexec.load /etc/apache2/mods-enabled/suexec.load
-                    ln -sf /etc/apache2/mods-available/auth_pam.load /etc/apache2/mods-enabled/auth_pam.load
-                    ln -sf /usr/share/doc/dspam-webfrontend/dspam-apache2.conf /etc/apache2/conf.d/
-                    invoke-rc.d apache2 reload
+                    a2enmod suexec
+                    a2enmod auth_pam
+                    ln -sf /etc/dspam/dspam-apache2.conf /etc/apache2/conf.d/
+# Should we really reload apache ?
+#invoke-rc.d apache2 reload
                 fi
             fi
         fi
 
         if [ -f /usr/sbin/apache ]; then
-            ln -sf /usr/share/doc/dspam-webfrontend/dspam-apache.conf /etc/apache/conf.d/
-            invoke-rc.d apache reload
+            ln -sf /etc/dspam/dspam-apache.conf /etc/apache/conf.d/
+# Should we really reload apache
+#invoke-rc.d apache reload
         fi
     ;;
 

Modified: trunk/debian/dspam-webfrontend.postrm
==============================================================================
--- trunk/debian/dspam-webfrontend.postrm	(original)
+++ trunk/debian/dspam-webfrontend.postrm	Sun Oct 30 18:25:27 2005
@@ -24,6 +24,7 @@
     	fi
         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
 	;;

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Sun Oct 30 18:25:27 2005
@@ -116,7 +116,6 @@
 	dh_testroot -i
 	dh_installchangelogs -i CHANGELOG
 	dh_installdocs -i
-	dh_installexamples -i
 	dh_compress -i
 	dh_link -i
 	dh_fixperms -i
@@ -135,7 +134,6 @@
 	dh_installcron -A
 	dh_installlogrotate -a
 	dh_installman -a
-	dh_installexamples -a
 	dh_makeshlibs -a -Nlibdspam7-drv-pgsql -Nlibdspam7-drv-mysql -Nlibdspam7-drv-db4 -Nlibdspam7-drv-sqlite3 -Nlibdspam7-drv-hash
 	dh_link -a
 	dh_strip -a