Bug#409335: [Pkg-cups-devel] Bug#409335: cupsys: packages must not ship directories under /usr/local

[Kenshi Muto]

At Fri, 02 Feb 2007 18:57:08 +0900,
Kenshi Muto wrote:
> I'm considering whether it is ok or not from policy view to
> provide symlink against /usr/local/share/ppd and /opt/ppd.
> It will become a missing link if user hasn't these two directories.

Here is a proposal patch.

Index: cupsys.postinst
===================================================================
--- cupsys.postinst	(revision 418)
+++ cupsys.postinst	(working copy)
@@ -206,6 +206,14 @@
 	if [ -f /etc/cups/printers.conf ]; then
 	  chown root:lp /etc/cups/printers.conf ; chmod 600 /etc/cups/printers.conf
 	fi
+	# Add symlink to local files required by LSB
+	if [ ! -e /usr/share/ppd/1-local-admin ]; then
+	  ln -s /usr/local/share/ppd /usr/share/ppd/1-local-admin
+	fi
+	if [ ! -e /usr/share/ppd/2-third-party ]; then
+	  ln -s /opt/share/ppd /usr/share/ppd/2-third-party
+	fi
+
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
Index: cupsys.dirs
===================================================================
--- cupsys.dirs	(revision 425)
+++ cupsys.dirs	(working copy)
@@ -7,5 +7,3 @@
 var/cache/cups/ppd
 usr/share/ppd/cups-included
 usr/lib/cups/driver
-usr/local/share/ppd
-opt/share/ppd
Index: changelog
===================================================================
--- changelog	(revision 427)
+++ changelog	(working copy)
@@ -1,6 +1,16 @@
-cupsys (1.2.7-3) UNRELEASED; urgency=high
+cupsys (1.2.7-4) unstable; urgency=high
 
   [ Kenshi Muto ]
+  * Stopped providing /usr/local/share/ppd and /opt/share/ppd.
+    This was policy violation (closes: #409335)
+    Instead of it, cupsys just make the symlinks on /usr/share/ppd
+    against these directories.
+
+ -- Kenshi Muto <kmuto at debian.org>  Fri,  2 Feb 2007 18:16:24 +0900
+
+cupsys (1.2.7-3) unstable; urgency=high
+
+  [ Kenshi Muto ]
   * removed STR2137 patch. This patch corruted some
     Postscript files. (closes: #403703) This was a release 
     critical bug.
Index: rules
===================================================================
--- rules	(revision 425)
+++ rules	(working copy)
@@ -71,10 +71,6 @@
 	  mv $$i "$(DEB_DESTDIR)/../cupsys/usr/share/ppd/cups-included/$$m/"; \
 	done
 
-	# Add symlink to local files required by LSB
-	ln -s /usr/local/share/ppd $(DEB_DESTDIR)/../cupsys/usr/share/ppd/1-local-admin
-	ln -s /opt/share/ppd $(DEB_DESTDIR)/../cupsys/usr/share/ppd/2-third-party
-
 	# Compatibility for programs which still look in the old location
 	#ln -s ../../ppd/cups-included $(DEB_DESTDIR)/../cupsys/usr/share/cups/model/cups-included
 	#ln -s ../cups/model $(DEB_DESTDIR)/../cupsys/usr/share/ppd/cups-transitional-dir
Index: cupsys.prerm
===================================================================
--- cupsys.prerm	(revision 383)
+++ cupsys.prerm	(working copy)
@@ -23,6 +23,12 @@
         if [ -L /usr/lib/cups/backend/smb ]; then
             rm -f /usr/lib/cups/backend/smb 2>/dev/null || true
         fi
+	if [ -L /usr/share/ppd/1-local-admin ]; then
+	  rm -f /usr/share/ppd/1-local-admin
+	fi
+	if [ -L /usr/share/ppd/2-third-party ]; then
+	  rm -f /usr/share/ppd/2-third-party
+	fi
         ;;
     upgrade|deconfigure)
         ;;

Thanks,
-- 
Kenshi Muto
kmuto at debian.org