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

[Kenshi Muto]

Author: kmuto
Date: Fri Feb  2 14:32:35 2007
New Revision: 428

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/cupsys.dirs
   cupsys/branches/cups-1.2/debian/cupsys.postinst
   cupsys/branches/cups-1.2/debian/cupsys.prerm
   cupsys/branches/cups-1.2/debian/rules
Log:
/usr/local will be handled by dh_usrlocal. and stopped creating opt directory. (#409335)

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Fri Feb  2 14:32:35 2007
@@ -1,4 +1,13 @@
-cupsys (1.2.7-3) UNRELEASED; urgency=high
+cupsys (1.2.7-4) unstable; urgency=high
+
+  [ Kenshi Muto ]
+  * Use dh_usrlocal to install files in /usr/local in the
+    maintainer scripts, instead of shipping them in the deb.
+    This was policy violation (closes: #409335)
+
+ -- 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

Modified: cupsys/branches/cups-1.2/debian/cupsys.dirs
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.dirs	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.dirs	Fri Feb  2 14:32:35 2007
@@ -8,4 +8,3 @@
 usr/share/ppd/cups-included
 usr/lib/cups/driver
 usr/local/share/ppd
-opt/share/ppd

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	Fri Feb  2 14:32:35 2007
@@ -116,6 +116,7 @@
             ln /usr/lib/cups/backend/ipp /usr/lib/cups/backend/http
 	  fi
 	done
+	IFS=$save_IFS
 
 	# Create password file for Digest authentication
         # (removed: Debian CUPS uses PAM and basic authentication)
@@ -206,6 +207,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 -a ! -L /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 -a ! -L /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)

Modified: cupsys/branches/cups-1.2/debian/cupsys.prerm
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.prerm	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.prerm	Fri Feb  2 14:32:35 2007
@@ -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)
         ;;

Modified: cupsys/branches/cups-1.2/debian/rules
==============================================================================
--- cupsys/branches/cups-1.2/debian/rules	(original)
+++ cupsys/branches/cups-1.2/debian/rules	Fri Feb  2 14:32:35 2007
@@ -71,13 +71,10 @@
 	  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
+	dh_usrlocal
 
 binary-post-install/libcupsimage2-dev::
 	rm -r debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev