[Pkg-cups-devel] r181 - cupsys/branches/cups-1.2-ubuntu/debian

[Martin Pitt]

Author: mpitt
Date: Thu Apr 13 09:29:48 2006
New Revision: 181

Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d
   cupsys/branches/cups-1.2-ubuntu/debian/rules
Log:
* Support custom PPD installation by lpadmin members (through e. g.
  gnome-cups-manager):
  - debian/cupsys.dirs: Create /usr/share/ppd/custom/.
  - debian/cupsys.init.d: Fix permissions of that dir to root:lpadmin 3775.
  - debian/rules: Install compatibility symlink
    /usr/share/cups/model/custom.



Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog	Thu Apr 13 09:29:48 2006
@@ -34,8 +34,14 @@
       the old /usr/share/cups/model directory for backwards compatibility.
   * debian/libcupsys2.shlibs: Remove Debian revision to allow -0ubuntuN
     number.
+  * Support custom PPD installation by lpadmin members (through e. g.
+    gnome-cups-manager):
+    - debian/cupsys.dirs: Create /usr/share/ppd/custom/.
+    - debian/cupsys.init.d: Fix permissions of that dir to root:lpadmin 3775.
+    - debian/rules: Install compatibility symlink 
+      /usr/share/cups/model/custom.
 
- -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 13 Apr 2006 11:20:48 +0200
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 13 Apr 2006 11:26:41 +0200
 
 cupsys (1.1.99.rc2-1) UNRELEASED-experimental; urgency=low
 

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs	Thu Apr 13 09:29:48 2006
@@ -5,3 +5,4 @@
 usr/lib/cups/backend-available
 var/cache/cups/ppd
 usr/share/ppd/cups-included
+usr/share/ppd/custom

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d	Thu Apr 13 09:29:48 2006
@@ -23,8 +23,8 @@
 case "$1" in
   start)
 	log_begin_msg "Starting $DESC: $NAME"
-	chown root:lpadmin /usr/share/cups/model 2>/dev/null || true
-	chmod 3775 /usr/share/cups/model 2>/dev/null || true
+	chown root:lpadmin /usr/share/ppd/custom 2>/dev/null || true
+	chmod 3775 /usr/share/ppd/custom 2>/dev/null || true
 	mkdir -p `dirname "$PIDFILE"`
 
 	# create the logs file since cupsd can't

Modified: cupsys/branches/cups-1.2-ubuntu/debian/rules
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/rules	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/rules	Thu Apr 13 09:29:48 2006
@@ -68,6 +68,7 @@
 
 	# 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 ../../ppd/custom $(DEB_DESTDIR)/../cupsys/usr/share/cups/model/custom
 
 binary-post-install/libcupsimage2-dev::
 	rm -r debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev