[Pkg-cups-devel] r420 - in cupsys/branches/cups-1.2/debian: .
patches
Kenshi Muto
kmuto at alioth.debian.org
Thu Dec 28 15:03:53 UTC 2006
Author: kmuto
Date: Thu Dec 28 16:03:53 2006
New Revision: 420
Added:
cupsys/branches/cups-1.2/debian/patches/68_edit-config.dpatch (contents, props changed)
Modified:
cupsys/branches/cups-1.2/debian/changelog
cupsys/branches/cups-1.2/debian/patches/00list
Log:
68_edit-config: provides initial same conf file when user resets a configuration
Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog (original)
+++ cupsys/branches/cups-1.2/debian/changelog Thu Dec 28 16:03:53 2006
@@ -22,6 +22,8 @@
cupsd.conf file. (closes: #401981)
* cupsys makes /var/run/cups/certs. Although CUPS daemon can make
it automatically, the daemon logs an warning.
+ * 68_edit-config: Provide same cupsd.conf as initial package
+ installation.
-- 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 Thu Dec 28 16:03:53 2006
@@ -38,3 +38,4 @@
65_detect_http_shutdown.dpatch
#66_setegid.dpatch
67_printcap.dpatch
+68_edit-config.dpatch
Added: cupsys/branches/cups-1.2/debian/patches/68_edit-config.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/68_edit-config.dpatch Thu Dec 28 16:03:53 2006
@@ -0,0 +1,431 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 68_edit-config.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~/templates/de/edit-config.tmpl.in cupsys-1.2.7/templates/de/edit-config.tmpl.in
+--- cupsys-1.2.7~/templates/de/edit-config.tmpl.in 2006-07-18 13:45:56.000000000 +0000
++++ cupsys-1.2.7/templates/de/edit-config.tmpl.in 2006-12-28 14:33:14.000000000 +0000
+@@ -4,7 +4,7 @@
+ document.cups.CUPSDCONF.value =
+ "# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
+ "# troubleshooting...\\n" +
+-"LogLevel info\\n" +
++"LogLevel warning\\n" +
+ "\\n" +
+ "\\n" +
+ "# Administrator user group...\\n" +
+@@ -12,7 +12,7 @@
+ "\\n" +
+ "\\n" +
+ "# Only listen for connections from the local machine.\\n" +
+-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
++"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+ "@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+ "\\n" +
+ "\\n" +
+@@ -70,7 +70,30 @@
+ " <Limit All>\\n" +
+ " Order deny,allow\\n" +
+ " </Limit>\\n" +
+-"</Policy>\\n";
++"</Policy>\\n" +
++"\\n" +
++"#\\n" +
++"# Printcap: the name of the printcap file. Default is /etc/printcap.\\n" +
++"# Leave blank to disable printcap file generation.\\n" +
++"#\\n" +
++"\\n" +
++"Printcap /var/run/cups/printcap\\n" +
++"\\n" +
++"#\\n" +
++"#PrintcapFormat BSD\\n" +
++"#PrintcapFormat Solaris\\n" +
++"\\n" +
++"#\\n" +
++"# PrintcapGUI: the name of the GUI options panel program to associate\\n" +
++"# with print queues under IRIX. The default is \\"/usr/bin/glpoptions\\"\\n" +
++"# from ESP Print Pro.\\n" +
++"#\\n" +
++"# This option is only used under IRIX; the options panel program\\n" +
++"# must accept the \\"-d printer\\" and \\"-o options\\" options and write\\n" +
++"# the selected printer options back to stdout on completion.\\n" +
++"#\\n" +
++"\\n" +
++"#PrintcapGUI /usr/bin/glpoptions\\n";
+ }
+ </SCRIPT>
+
+diff -urNad cupsys-1.2.7~/templates/edit-config.tmpl.in cupsys-1.2.7/templates/edit-config.tmpl.in
+--- cupsys-1.2.7~/templates/edit-config.tmpl.in 2006-04-30 15:29:40.000000000 +0000
++++ cupsys-1.2.7/templates/edit-config.tmpl.in 2006-12-28 14:32:32.000000000 +0000
+@@ -4,7 +4,7 @@
+ document.cups.CUPSDCONF.value =
+ "# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
+ "# troubleshooting...\\n" +
+-"LogLevel info\\n" +
++"LogLevel warning\\n" +
+ "\\n" +
+ "\\n" +
+ "# Administrator user group...\\n" +
+@@ -12,7 +12,7 @@
+ "\\n" +
+ "\\n" +
+ "# Only listen for connections from the local machine.\\n" +
+-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
++"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+ "@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+ "\\n" +
+ "\\n" +
+@@ -70,7 +70,30 @@
+ " <Limit All>\\n" +
+ " Order deny,allow\\n" +
+ " </Limit>\\n" +
+-"</Policy>\\n";
++"</Policy>\\n" +
++"\\n" +
++"#\\n" +
++"# Printcap: the name of the printcap file. Default is /etc/printcap.\\n" +
++"# Leave blank to disable printcap file generation.\\n" +
++"#\\n" +
++"\\n" +
++"Printcap /var/run/cups/printcap\\n" +
++"\\n" +
++"#\\n" +
++"#PrintcapFormat BSD\\n" +
++"#PrintcapFormat Solaris\\n" +
++"\\n" +
++"#\\n" +
++"# PrintcapGUI: the name of the GUI options panel program to associate\\n" +
++"# with print queues under IRIX. The default is \\"/usr/bin/glpoptions\\"\\n" +
++"# from ESP Print Pro.\\n" +
++"#\\n" +
++"# This option is only used under IRIX; the options panel program\\n" +
++"# must accept the \\"-d printer\\" and \\"-o options\\" options and write\\n" +
++"# the selected printer options back to stdout on completion.\\n" +
++"#\\n" +
++"\\n" +
++"#PrintcapGUI /usr/bin/glpoptions\\n";
+ }
+ </SCRIPT>
+
+diff -urNad cupsys-1.2.7~/templates/es/edit-config.tmpl.in cupsys-1.2.7/templates/es/edit-config.tmpl.in
+--- cupsys-1.2.7~/templates/es/edit-config.tmpl.in 2006-04-30 15:29:40.000000000 +0000
++++ cupsys-1.2.7/templates/es/edit-config.tmpl.in 2006-12-28 14:33:18.000000000 +0000
+@@ -4,7 +4,7 @@
+ document.cups.CUPSDCONF.value =
+ "# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
+ "# troubleshooting...\\n" +
+-"LogLevel info\\n" +
++"LogLevel warning\\n" +
+ "\\n" +
+ "\\n" +
+ "# Administrator user group...\\n" +
+@@ -12,7 +12,7 @@
+ "\\n" +
+ "\\n" +
+ "# Only listen for connections from the local machine.\\n" +
+-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
++"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+ "@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+ "\\n" +
+ "\\n" +
+@@ -70,7 +70,30 @@
+ " <Limit All>\\n" +
+ " Order deny,allow\\n" +
+ " </Limit>\\n" +
+-"</Policy>\\n";
++"</Policy>\\n" +
++"\\n" +
++"#\\n" +
++"# Printcap: the name of the printcap file. Default is /etc/printcap.\\n" +
++"# Leave blank to disable printcap file generation.\\n" +
++"#\\n" +
++"\\n" +
++"Printcap /var/run/cups/printcap\\n" +
++"\\n" +
++"#\\n" +
++"#PrintcapFormat BSD\\n" +
++"#PrintcapFormat Solaris\\n" +
++"\\n" +
++"#\\n" +
++"# PrintcapGUI: the name of the GUI options panel program to associate\\n" +
++"# with print queues under IRIX. The default is \\"/usr/bin/glpoptions\\"\\n" +
++"# from ESP Print Pro.\\n" +
++"#\\n" +
++"# This option is only used under IRIX; the options panel program\\n" +
++"# must accept the \\"-d printer\\" and \\"-o options\\" options and write\\n" +
++"# the selected printer options back to stdout on completion.\\n" +
++"#\\n" +
++"\\n" +
++"#PrintcapGUI /usr/bin/glpoptions\\n";
+ }
+ </SCRIPT>
+
+diff -urNad cupsys-1.2.7~/templates/et/edit-config.tmpl.in cupsys-1.2.7/templates/et/edit-config.tmpl.in
+--- cupsys-1.2.7~/templates/et/edit-config.tmpl.in 2006-10-02 16:26:04.000000000 +0000
++++ cupsys-1.2.7/templates/et/edit-config.tmpl.in 2006-12-28 14:33:22.000000000 +0000
+@@ -4,7 +4,7 @@
+ document.cups.CUPSDCONF.value =
+ "# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
+ "# troubleshooting...\\n" +
+-"LogLevel info\\n" +
++"LogLevel warning\\n" +
+ "\\n" +
+ "\\n" +
+ "# Administrator user group...\\n" +
+@@ -12,7 +12,7 @@
+ "\\n" +
+ "\\n" +
+ "# Only listen for connections from the local machine.\\n" +
+-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
++"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+ "@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+ "\\n" +
+ "\\n" +
+@@ -70,7 +70,30 @@
+ " <Limit All>\\n" +
+ " Order deny,allow\\n" +
+ " </Limit>\\n" +
+-"</Policy>\\n";
++"</Policy>\\n" +
++"\\n" +
++"#\\n" +
++"# Printcap: the name of the printcap file. Default is /etc/printcap.\\n" +
++"# Leave blank to disable printcap file generation.\\n" +
++"#\\n" +
++"\\n" +
++"Printcap /var/run/cups/printcap\\n" +
++"\\n" +
++"#\\n" +
++"#PrintcapFormat BSD\\n" +
++"#PrintcapFormat Solaris\\n" +
++"\\n" +
++"#\\n" +
++"# PrintcapGUI: the name of the GUI options panel program to associate\\n" +
++"# with print queues under IRIX. The default is \\"/usr/bin/glpoptions\\"\\n" +
++"# from ESP Print Pro.\\n" +
++"#\\n" +
++"# This option is only used under IRIX; the options panel program\\n" +
++"# must accept the \\"-d printer\\" and \\"-o options\\" options and write\\n" +
++"# the selected printer options back to stdout on completion.\\n" +
++"#\\n" +
++"\\n" +
++"#PrintcapGUI /usr/bin/glpoptions\\n";
+ }
+ </SCRIPT>
+
+diff -urNad cupsys-1.2.7~/templates/it/edit-config.tmpl.in cupsys-1.2.7/templates/it/edit-config.tmpl.in
+--- cupsys-1.2.7~/templates/it/edit-config.tmpl.in 2006-11-16 13:34:44.000000000 +0000
++++ cupsys-1.2.7/templates/it/edit-config.tmpl.in 2006-12-28 14:33:25.000000000 +0000
+@@ -4,7 +4,7 @@
+ document.cups.CUPSDCONF.value =
+ "# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
+ "# troubleshooting...\\n" +
+-"LogLevel info\\n" +
++"LogLevel warning\\n" +
+ "\\n" +
+ "\\n" +
+ "# Administrator user group...\\n" +
+@@ -12,7 +12,7 @@
+ "\\n" +
+ "\\n" +
+ "# Only listen for connections from the local machine.\\n" +
+-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
++"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+ "@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+ "\\n" +
+ "\\n" +
+@@ -70,7 +70,30 @@
+ " <Limit All>\\n" +
+ " Order deny,allow\\n" +
+ " </Limit>\\n" +
+-"</Policy>\\n";
++"</Policy>\\n" +
++"\\n" +
++"#\\n" +
++"# Printcap: the name of the printcap file. Default is /etc/printcap.\\n" +
++"# Leave blank to disable printcap file generation.\\n" +
++"#\\n" +
++"\\n" +
++"Printcap /var/run/cups/printcap\\n" +
++"\\n" +
++"#\\n" +
++"#PrintcapFormat BSD\\n" +
++"#PrintcapFormat Solaris\\n" +
++"\\n" +
++"#\\n" +
++"# PrintcapGUI: the name of the GUI options panel program to associate\\n" +
++"# with print queues under IRIX. The default is \\"/usr/bin/glpoptions\\"\\n" +
++"# from ESP Print Pro.\\n" +
++"#\\n" +
++"# This option is only used under IRIX; the options panel program\\n" +
++"# must accept the \\"-d printer\\" and \\"-o options\\" options and write\\n" +
++"# the selected printer options back to stdout on completion.\\n" +
++"#\\n" +
++"\\n" +
++"#PrintcapGUI /usr/bin/glpoptions\\n";
+ }
+ </SCRIPT>
+
+diff -urNad cupsys-1.2.7~/templates/ja/edit-config.tmpl.in cupsys-1.2.7/templates/ja/edit-config.tmpl.in
+--- cupsys-1.2.7~/templates/ja/edit-config.tmpl.in 2006-04-30 15:29:40.000000000 +0000
++++ cupsys-1.2.7/templates/ja/edit-config.tmpl.in 2006-12-28 14:33:04.000000000 +0000
+@@ -4,7 +4,7 @@
+ document.cups.CUPSDCONF.value =
+ "# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
+ "# troubleshooting...\\n" +
+-"LogLevel info\\n" +
++"LogLevel warning\\n" +
+ "\\n" +
+ "\\n" +
+ "# Administrator user group...\\n" +
+@@ -12,7 +12,7 @@
+ "\\n" +
+ "\\n" +
+ "# Only listen for connections from the local machine.\\n" +
+-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
++"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+ "@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+ "\\n" +
+ "\\n" +
+@@ -70,7 +70,30 @@
+ " <Limit All>\\n" +
+ " Order deny,allow\\n" +
+ " </Limit>\\n" +
+-"</Policy>\\n";
++"</Policy>\\n" +
++"\\n" +
++"#\\n" +
++"# Printcap: the name of the printcap file. Default is /etc/printcap.\\n" +
++"# Leave blank to disable printcap file generation.\\n" +
++"#\\n" +
++"\\n" +
++"Printcap /var/run/cups/printcap\\n" +
++"\\n" +
++"#\\n" +
++"#PrintcapFormat BSD\\n" +
++"#PrintcapFormat Solaris\\n" +
++"\\n" +
++"#\\n" +
++"# PrintcapGUI: the name of the GUI options panel program to associate\\n" +
++"# with print queues under IRIX. The default is \\"/usr/bin/glpoptions\\"\\n" +
++"# from ESP Print Pro.\\n" +
++"#\\n" +
++"# This option is only used under IRIX; the options panel program\\n" +
++"# must accept the \\"-d printer\\" and \\"-o options\\" options and write\\n" +
++"# the selected printer options back to stdout on completion.\\n" +
++"#\\n" +
++"\\n" +
++"#PrintcapGUI /usr/bin/glpoptions\\n";
+ }
+ </SCRIPT>
+
+diff -urNad cupsys-1.2.7~/templates/pl/edit-config.tmpl.in cupsys-1.2.7/templates/pl/edit-config.tmpl.in
+--- cupsys-1.2.7~/templates/pl/edit-config.tmpl.in 2006-04-30 15:29:40.000000000 +0000
++++ cupsys-1.2.7/templates/pl/edit-config.tmpl.in 2006-12-28 14:33:29.000000000 +0000
+@@ -4,7 +4,7 @@
+ document.cups.CUPSDCONF.value =
+ "# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
+ "# troubleshooting...\\n" +
+-"LogLevel info\\n" +
++"LogLevel warning\\n" +
+ "\\n" +
+ "\\n" +
+ "# Administrator user group...\\n" +
+@@ -12,7 +12,7 @@
+ "\\n" +
+ "\\n" +
+ "# Only listen for connections from the local machine.\\n" +
+-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
++"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+ "@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+ "\\n" +
+ "\\n" +
+@@ -70,7 +70,30 @@
+ " <Limit All>\\n" +
+ " Order deny,allow\\n" +
+ " </Limit>\\n" +
+-"</Policy>\\n";
++"</Policy>\\n" +
++"\\n" +
++"#\\n" +
++"# Printcap: the name of the printcap file. Default is /etc/printcap.\\n" +
++"# Leave blank to disable printcap file generation.\\n" +
++"#\\n" +
++"\\n" +
++"Printcap /var/run/cups/printcap\\n" +
++"\\n" +
++"#\\n" +
++"#PrintcapFormat BSD\\n" +
++"#PrintcapFormat Solaris\\n" +
++"\\n" +
++"#\\n" +
++"# PrintcapGUI: the name of the GUI options panel program to associate\\n" +
++"# with print queues under IRIX. The default is \\"/usr/bin/glpoptions\\"\\n" +
++"# from ESP Print Pro.\\n" +
++"#\\n" +
++"# This option is only used under IRIX; the options panel program\\n" +
++"# must accept the \\"-d printer\\" and \\"-o options\\" options and write\\n" +
++"# the selected printer options back to stdout on completion.\\n" +
++"#\\n" +
++"\\n" +
++"#PrintcapGUI /usr/bin/glpoptions\\n";
+ }
+ </SCRIPT>
+
+diff -urNad cupsys-1.2.7~/templates/sv/edit-config.tmpl.in cupsys-1.2.7/templates/sv/edit-config.tmpl.in
+--- cupsys-1.2.7~/templates/sv/edit-config.tmpl.in 2006-04-30 15:29:40.000000000 +0000
++++ cupsys-1.2.7/templates/sv/edit-config.tmpl.in 2006-12-28 14:33:32.000000000 +0000
+@@ -4,7 +4,7 @@
+ document.cups.CUPSDCONF.value =
+ "# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
+ "# troubleshooting...\\n" +
+-"LogLevel info\\n" +
++"LogLevel warning\\n" +
+ "\\n" +
+ "\\n" +
+ "# Administrator user group...\\n" +
+@@ -12,7 +12,7 @@
+ "\\n" +
+ "\\n" +
+ "# Only listen for connections from the local machine.\\n" +
+-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
++"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+ "@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+ "\\n" +
+ "\\n" +
+@@ -70,7 +70,30 @@
+ " <Limit All>\\n" +
+ " Order deny,allow\\n" +
+ " </Limit>\\n" +
+-"</Policy>\\n";
++"</Policy>\\n" +
++"\\n" +
++"#\\n" +
++"# Printcap: the name of the printcap file. Default is /etc/printcap.\\n" +
++"# Leave blank to disable printcap file generation.\\n" +
++"#\\n" +
++"\\n" +
++"Printcap /var/run/cups/printcap\\n" +
++"\\n" +
++"#\\n" +
++"#PrintcapFormat BSD\\n" +
++"#PrintcapFormat Solaris\\n" +
++"\\n" +
++"#\\n" +
++"# PrintcapGUI: the name of the GUI options panel program to associate\\n" +
++"# with print queues under IRIX. The default is \\"/usr/bin/glpoptions\\"\\n" +
++"# from ESP Print Pro.\\n" +
++"#\\n" +
++"# This option is only used under IRIX; the options panel program\\n" +
++"# must accept the \\"-d printer\\" and \\"-o options\\" options and write\\n" +
++"# the selected printer options back to stdout on completion.\\n" +
++"#\\n" +
++"\\n" +
++"#PrintcapGUI /usr/bin/glpoptions\\n";
+ }
+ </SCRIPT>
+
More information about the Pkg-cups-devel
mailing list