[Pkg-cups-devel] r157 - cupsys/branches/cups-1.2/debian

[Martin Pitt]

Author: mpitt
Date: Wed Apr 12 15:20:11 2006
New Revision: 157

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/cupsys.postinst
Log:
remove /var/lib/cups/certs cruft from postinst, too

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Wed Apr 12 15:20:11 2006
@@ -76,10 +76,10 @@
   * Add debian/patches/13_default_log_warn.dpatch: Raise default log severity
     to 'warning' to not log gazillions of IPP requests by default. (other part
     of #280718)
-  * debian/rules: Remove obsolete /etc/cups/certs and /var/lib/cups/certs
-    (certificates are managed in /var/run/certs now).
+  * debian/rules, debian/cupsys.postinst: Remove obsolete /etc/cups/certs and
+    /var/lib/cups/certs (certificates are managed in /var/run/certs now).
 
- -- Martin Pitt <mpitt at debian.org>  Wed, 12 Apr 2006 17:12:24 +0200
+ -- Martin Pitt <mpitt at debian.org>  Wed, 12 Apr 2006 17:20:01 +0200
 
 cupsys (1.1.99.b1.r4885-1) experimental; urgency=low
 

Modified: cupsys/branches/cups-1.2/debian/cupsys.postinst
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.postinst	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.postinst	Wed Apr 12 15:20:11 2006
@@ -49,14 +49,9 @@
 	    rm -rf /etc/cups/certs
 	fi
 	if [ -d /var/spool/cups/certs ]; then
-	    mv /var/spool/cups/certs/* /var/lib/cups/certs || true
+	    mv /var/spool/cups/certs/* /var/run/cups/certs || true
 	    rm -rf /var/spool/cups/certs
 	fi
-	if [ ! -e /etc/cups/certs ]; then
-	    ln -sf /var/lib/cups/certs /etc/cups/certs || true
-	fi
-
-	chgrp lpadmin /var/lib/cups/certs
 
 	[ -f /etc/cups/ppds.dat ] && mv /etc/cups/ppds.dat /var/cache/cups/ppd