[Pkg-cups-devel] r415 - in cupsys/branches/cups-1.2/debian: . patches

[Kenshi Muto]

Author: kmuto
Date: Sat Dec  9 15:47:08 2006
New Revision: 415

Added:
   cupsys/branches/cups-1.2/debian/patches/67_printcap.dpatch   (contents, props changed)
Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/00list
Log:
add printcap section into cupsd.conf file (67_printcap). Although Web interface can reset configuration, the content is hardcoded into each templates. It's too hard to modify them...

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Sat Dec  9 15:47:08 2006
@@ -6,6 +6,10 @@
   * Trying to revert seteuid way of upstream. (disabled 06_disable
    _backend_setuid patch to let backend works as upstream imagined)
     Put 66_setegid.dpatch to set GID.
+  * Add Printcap/PrintcapFormat/PrintcapGUI variables to cupsd.conf
+    file. (closes: #401981)
+    (It's a known problem that when you reset configuration file
+    from Web interface, configuration won't back to 100% original.)
 
  -- Kenshi Muto <kmuto at debian.org>  Wed,  6 Dec 2006 22:42:34 +0000
 

Modified: cupsys/branches/cups-1.2/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2/debian/patches/00list	Sat Dec  9 15:47:08 2006
@@ -29,3 +29,4 @@
 #64_driverfolder.dpatch
 65_detect_http_shutdown.dpatch
 66_setegid.dpatch
+67_printcap.dpatch

Added: cupsys/branches/cups-1.2/debian/patches/67_printcap.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/67_printcap.dpatch	Sat Dec  9 15:47:08 2006
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 67_printcap.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.7~/conf/cupsd.conf.in cupsys-1.2.7/conf/cupsd.conf.in
+--- cupsys-1.2.7~/conf/cupsd.conf.in	2006-12-09 14:31:45.000000000 +0000
++++ cupsys-1.2.7/conf/cupsd.conf.in	2006-12-09 14:33:59.000000000 +0000
+@@ -75,3 +75,30 @@
+ #
+ # End of "$Id: cupsd.conf.in 5454 2006-04-23 21:46:38Z mike $".
+ #
++
++#
++# Printcap: the name of the printcap file.  Default is /etc/printcap.
++# Leave blank to disable printcap file generation.
++#
++
++Printcap /var/run/cups/printcap
++
++#
++# PrintcapFormat: the format of the printcap file, currently either
++# BSD or Solaris.  The default is "BSD".
++#
++
++#PrintcapFormat BSD
++#PrintcapFormat Solaris
++
++#
++# PrintcapGUI: the name of the GUI options panel program to associate
++# with print queues under IRIX.  The default is "/usr/bin/glpoptions"
++# from ESP Print Pro.
++#
++# This option is only used under IRIX; the options panel program
++# must accept the "-d printer" and "-o options" options and write
++# the selected printer options back to stdout on completion.
++#
++
++#PrintcapGUI /usr/bin/glpoptions